|
From: Nicholas N. <nj...@ca...> - 2004-10-26 09:59:53
|
CVS commit by nethercote:
Arch-abstraction:
- removed some x86-specific var/function names
M +9 -9 core.h 1.44
M +19 -19 vg_main.c 1.221
M +1 -1 vg_memory.c 1.72
M +2 -2 vg_translate.c 1.92
--- valgrind/coregrind/core.h #1.43:1.44
@@ -1098,5 +1098,5 @@ extern Addr VG_(get_jmp_dest)
Bool VG_(cpu_has_feature)(UInt feat);
-extern Int VG_(disBB) ( UCodeBlock* cb, Addr eip0 );
+extern Int VG_(disBB) ( UCodeBlock* cb, Addr ip0 );
/* ---------------------------------------------------------------------
@@ -1123,5 +1123,5 @@ extern void VG_(print_reg_alloc_stats) (
------------------------------------------------------------------ */
-/* Records the PC and a bit of the call chain. The first 4 %eip
+/* Records the PC and a bit of the call chain. The first 4 IP
values are used in comparisons do remove duplicate errors, and for
comparing against suppression specifications. The rest are purely
@@ -1184,5 +1184,5 @@ typedef struct _Segment Segment;
extern Bool VG_(is_object_file) ( const void *hdr );
-extern void VG_(mini_stack_dump) ( Addr eips[], UInt n_eips );
+extern void VG_(mini_stack_dump) ( Addr ips[], UInt n_ips );
extern SegInfo * VG_(read_seg_symbols) ( Segment *seg );
extern void VG_(symtab_incref) ( SegInfo * );
@@ -1239,6 +1239,6 @@ Char* VG_(build_child_VALGRINDCLO) ( Cha
Char* VG_(build_child_exename) ( void );
-/* Determine if %esp adjustment must be noted */
-extern Bool VG_(need_to_handle_esp_assignment) ( void );
+/* Determine if SP adjustment must be noted */
+extern Bool VG_(need_to_handle_SP_assignment) ( void );
/* Called when some unhandleable client behaviour is detected.
@@ -1334,5 +1334,5 @@ extern void VG_(unpad_address_space)(voi
extern REGPARM(1)
- void VG_(unknown_esp_update) ( Addr new_ESP );
+ void VG_(unknown_SP_update) ( Addr new_SP );
/* ---------------------------------------------------------------------
@@ -1488,6 +1488,6 @@ extern UInt VG_(baseBlock)[VG_BASEBLOCK_
// For setting up the baseBlock
-extern void VGA_(init_low_baseBlock) ( Addr client_eip, Addr esp_at_startup );
-extern void VGA_(init_high_baseBlock) ( Addr client_eip, Addr esp_at_startup );
+extern void VGA_(init_low_baseBlock) ( Addr client_ip, Addr sp_at_startup );
+extern void VGA_(init_high_baseBlock) ( Addr client_ip, Addr sp_at_startup );
// Register state moving
@@ -1527,5 +1527,5 @@ extern void VGA_(fill_elffpxregs_from_ts
// Signal stuff
-extern void VGA_(push_signal_frame) ( ThreadId tid, Addr esp_top_of_frame,
+extern void VGA_(push_signal_frame) ( ThreadId tid, Addr sp_top_of_frame,
const vki_ksiginfo_t *siginfo,
void *handler, UInt flags,
--- valgrind/coregrind/vg_main.c #1.220:1.221
@@ -137,5 +137,5 @@ Int VG_(fd_soft_limit) = -1;
Int VG_(fd_hard_limit) = -1;
-/* As deduced from esp_at_startup, the client's argc, argv[] and
+/* As deduced from sp_at_startup, the client's argc, argv[] and
envp[] as extracted from the client's stack at startup-time. */
Int VG_(client_argc);
@@ -914,5 +914,5 @@ static char *copy_str(char **tab, const
+-----------------+
| argc |
- lower address +-----------------+ <- esp
+ lower address +-----------------+ <- sp
| undefined |
: :
@@ -2243,5 +2243,5 @@ void assign_helpers_in_baseBlock(UInt n,
}
-Bool VG_(need_to_handle_esp_assignment)(void)
+Bool VG_(need_to_handle_SP_assignment)(void)
{
return ( VG_(defined_new_mem_stack_4)() ||
@@ -2263,7 +2263,7 @@ Bool VG_(need_to_handle_esp_assignment)(
// in the first 128 bytes of the start, which allows the use of a more
// compact addressing mode.
-static void init_baseBlock ( Addr client_eip, Addr esp_at_startup )
+static void init_baseBlock ( Addr client_eip, Addr sp_at_startup )
{
- VGA_(init_low_baseBlock)(client_eip, esp_at_startup);
+ VGA_(init_low_baseBlock)(client_eip, sp_at_startup);
/* Allocate slots for compact helpers */
@@ -2272,5 +2272,5 @@ static void init_baseBlock ( Addr client
VG_(compact_helper_addrs));
- VGA_(init_high_baseBlock)(client_eip, esp_at_startup);
+ VGA_(init_high_baseBlock)(client_eip, sp_at_startup);
#define REG(kind, size) \
@@ -2290,6 +2290,6 @@ static void init_baseBlock ( Addr client
#undef REG
- if (VG_(need_to_handle_esp_assignment)())
- VG_(register_noncompact_helper)((Addr) VG_(unknown_esp_update));
+ if (VG_(need_to_handle_SP_assignment)())
+ VG_(register_noncompact_helper)((Addr) VG_(unknown_SP_update));
VGOFF_(helper_undefined_instruction)
@@ -2362,5 +2362,5 @@ static void build_valgrind_map_callback
// Global var used to pass local data to callback
-Addr esp_at_startup___global_arg = 0;
+Addr sp_at_startup___global_arg = 0;
static void build_segment_map_callback
@@ -2397,5 +2397,5 @@ static void build_segment_map_callback
/* If this is the stack segment mark all below %esp as noaccess. */
- r_esp = esp_at_startup___global_arg;
+ r_esp = sp_at_startup___global_arg;
vg_assert(0 != r_esp);
if (is_stack_segment) {
@@ -2547,5 +2547,5 @@ int main(int argc, char **argv)
void *tool_dlhandle;
Addr client_eip;
- Addr esp_at_startup; /* client's %esp at the point we gained control. */
+ Addr sp_at_startup; /* client's SP at the point we gained control. */
UInt * client_auxv;
VgSchedReturnCode src;
@@ -2666,5 +2666,5 @@ int main(int argc, char **argv)
{
void* init_sp = argv - 1;
- esp_at_startup = setup_client_stack(init_sp, cl_argv, env, &info,
+ sp_at_startup = setup_client_stack(init_sp, cl_argv, env, &info,
&client_auxv);
}
@@ -2672,5 +2672,5 @@ int main(int argc, char **argv)
if (0)
printf("entry=%p client esp=%p vg_argc=%d brkbase=%p\n",
- (void*)client_eip, (void*)esp_at_startup, vg_argc,
+ (void*)client_eip, (void*)sp_at_startup, vg_argc,
(void*)VG_(brk_base));
@@ -2733,10 +2733,10 @@ int main(int argc, char **argv)
//--------------------------------------------------------------
// Build segment map (all segments)
- // p: setup_client_stack() [for 'esp_at_startup']
+ // p: setup_client_stack() [for 'sp_at_startup']
// p: init tool [for 'new_mem_startup']
//--------------------------------------------------------------
- esp_at_startup___global_arg = esp_at_startup;
+ sp_at_startup___global_arg = sp_at_startup;
VG_(parse_procselfmaps) ( build_segment_map_callback ); /* everything */
- esp_at_startup___global_arg = 0;
+ sp_at_startup___global_arg = 0;
//--------------------------------------------------------------
@@ -2767,7 +2767,7 @@ int main(int argc, char **argv)
// p: {pre,post}_clo_init() [for tool helper registration]
// load_client() [for 'client_eip']
- // setup_client_stack() [for 'esp_at_startup']
+ // setup_client_stack() [for 'sp_at_startup']
//--------------------------------------------------------------
- init_baseBlock(client_eip, esp_at_startup);
+ init_baseBlock(client_eip, sp_at_startup);
//--------------------------------------------------------------
--- valgrind/coregrind/vg_memory.c #1.71:1.72
@@ -677,5 +677,5 @@ Segment *VG_(next_segment)(Segment *s)
isn't used in preference */
REGPARM(1)
-void VG_(unknown_esp_update)(Addr new_SP)
+void VG_(unknown_SP_update)(Addr new_SP)
{
Addr old_SP = VG_(get_archreg)(R_STACK_PTR);
--- valgrind/coregrind/vg_translate.c #1.91:1.92
@@ -1931,5 +1931,5 @@ UCodeBlock* vg_ESP_update_pass(UCodeBloc
VG_(defined_die_mem_stack)()) { \
uInstr1(cb, CCALL, 0, TempReg, u->val1); \
- uCCall(cb, (Addr) VG_(unknown_esp_update), \
+ uCCall(cb, (Addr) VG_(unknown_SP_update), \
1, 1, False); \
}
@@ -2537,5 +2537,5 @@ Bool VG_(translate) ( ThreadId tid, Addr
/* Add %ESP-update hooks if the tool requires them */
/* Nb: We don't print out this phase, because it doesn't do much */
- if (VG_(need_to_handle_esp_assignment)()) {
+ if (VG_(need_to_handle_SP_assignment)()) {
VGP_PUSHCC(VgpESPUpdate);
cb = vg_ESP_update_pass ( cb );
|