Remove historical artefact.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@357

diff --git a/coregrind/arch/x86-linux/vg_syscall.S b/coregrind/arch/x86-linux/vg_syscall.S
index 681d8afbe3ff36a776a01b56a13ddad4f5d0d342..adabbedbbeb0dfcda31d1fec6a1845817c271b60 100644 (file)
--- a/coregrind/arch/x86-linux/vg_syscall.S
+++ b/coregrind/arch/x86-linux/vg_syscall.S
@@ -46,11 +46,11 @@ VG_(do_syscall):
 
        # and save the real FPU state too
        fwait
-       fnsave  VG_(real_fpu_state_saved_over_syscall_d1)
-       frstor  VG_(real_fpu_state_saved_over_syscall_d1)
+       fnsave  VG_(real_fpu_state_saved_over_syscall)
+       frstor  VG_(real_fpu_state_saved_over_syscall)
 
        # remember what the simulators stack pointer is
-       movl    %esp, VG_(esp_saved_over_syscall_d1)
+       movl    %esp, VG_(esp_saved_over_syscall)
        
        # Now copy the simulated machines state into the real one
        # esp still refers to the simulators stack
@@ -74,7 +74,7 @@ VG_(do_syscall):
        # restore stack as soon as possible
        # esp refers to simulatees stack
        movl    %esp, VG_(m_state_static)+16
-       movl    VG_(esp_saved_over_syscall_d1), %esp
+       movl    VG_(esp_saved_over_syscall), %esp
        # esp refers to simulators stack
 
        # ... and undo everything else.  
@@ -94,7 +94,7 @@ VG_(do_syscall):
        frstor  VG_(m_state_static)+40
 
        # Restore the state of the simulator
-       frstor  VG_(real_fpu_state_saved_over_syscall_d1)
+       frstor  VG_(real_fpu_state_saved_over_syscall)
        popal
 
        ret

diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index 986ddf32a6309dbf8132eea964051e7a95a2b44b..64b0aa0502cce45abe143b4536cf2a2c6ea60482 100644 (file)
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -318,10 +318,8 @@ UInt VG_(stack)[10000];
 UInt VG_(sigstack)[10000];
 
 /* Saving stuff across system calls. */
-UInt VG_(real_fpu_state_saved_over_syscall_d1)[VG_SIZE_OF_FPUSTATE_W];
-UInt VG_(real_fpu_state_saved_over_syscall_d2)[VG_SIZE_OF_FPUSTATE_W];
-Addr VG_(esp_saved_over_syscall_d1);
-Addr VG_(esp_saved_over_syscall_d2);
+UInt VG_(real_fpu_state_saved_over_syscall)[VG_SIZE_OF_FPUSTATE_W];
+Addr VG_(esp_saved_over_syscall);
 
 /* Counts downwards in vg_run_innerloop. */
 UInt VG_(dispatch_ctr);

diff --git a/coregrind/vg_syscall.S b/coregrind/vg_syscall.S
index 681d8afbe3ff36a776a01b56a13ddad4f5d0d342..adabbedbbeb0dfcda31d1fec6a1845817c271b60 100644 (file)
--- a/coregrind/vg_syscall.S
+++ b/coregrind/vg_syscall.S
@@ -46,11 +46,11 @@ VG_(do_syscall):
 
        # and save the real FPU state too
        fwait
-       fnsave  VG_(real_fpu_state_saved_over_syscall_d1)
-       frstor  VG_(real_fpu_state_saved_over_syscall_d1)
+       fnsave  VG_(real_fpu_state_saved_over_syscall)
+       frstor  VG_(real_fpu_state_saved_over_syscall)
 
        # remember what the simulators stack pointer is
-       movl    %esp, VG_(esp_saved_over_syscall_d1)
+       movl    %esp, VG_(esp_saved_over_syscall)
        
        # Now copy the simulated machines state into the real one
        # esp still refers to the simulators stack
@@ -74,7 +74,7 @@ VG_(do_syscall):
        # restore stack as soon as possible
        # esp refers to simulatees stack
        movl    %esp, VG_(m_state_static)+16
-       movl    VG_(esp_saved_over_syscall_d1), %esp
+       movl    VG_(esp_saved_over_syscall), %esp
        # esp refers to simulators stack
 
        # ... and undo everything else.  
@@ -94,7 +94,7 @@ VG_(do_syscall):
        frstor  VG_(m_state_static)+40
 
        # Restore the state of the simulator
-       frstor  VG_(real_fpu_state_saved_over_syscall_d1)
+       frstor  VG_(real_fpu_state_saved_over_syscall)
        popal
 
        ret

diff --git a/vg_main.c b/vg_main.c
index 986ddf32a6309dbf8132eea964051e7a95a2b44b..64b0aa0502cce45abe143b4536cf2a2c6ea60482 100644 (file)
--- a/vg_main.c
+++ b/vg_main.c
@@ -318,10 +318,8 @@ UInt VG_(stack)[10000];
 UInt VG_(sigstack)[10000];
 
 /* Saving stuff across system calls. */
-UInt VG_(real_fpu_state_saved_over_syscall_d1)[VG_SIZE_OF_FPUSTATE_W];
-UInt VG_(real_fpu_state_saved_over_syscall_d2)[VG_SIZE_OF_FPUSTATE_W];
-Addr VG_(esp_saved_over_syscall_d1);
-Addr VG_(esp_saved_over_syscall_d2);
+UInt VG_(real_fpu_state_saved_over_syscall)[VG_SIZE_OF_FPUSTATE_W];
+Addr VG_(esp_saved_over_syscall);
 
 /* Counts downwards in vg_run_innerloop. */
 UInt VG_(dispatch_ctr);

diff --git a/vg_syscall.S b/vg_syscall.S
index 681d8afbe3ff36a776a01b56a13ddad4f5d0d342..adabbedbbeb0dfcda31d1fec6a1845817c271b60 100644 (file)
--- a/vg_syscall.S
+++ b/vg_syscall.S
@@ -46,11 +46,11 @@ VG_(do_syscall):
 
        # and save the real FPU state too
        fwait
-       fnsave  VG_(real_fpu_state_saved_over_syscall_d1)
-       frstor  VG_(real_fpu_state_saved_over_syscall_d1)
+       fnsave  VG_(real_fpu_state_saved_over_syscall)
+       frstor  VG_(real_fpu_state_saved_over_syscall)
 
        # remember what the simulators stack pointer is
-       movl    %esp, VG_(esp_saved_over_syscall_d1)
+       movl    %esp, VG_(esp_saved_over_syscall)
        
        # Now copy the simulated machines state into the real one
        # esp still refers to the simulators stack
@@ -74,7 +74,7 @@ VG_(do_syscall):
        # restore stack as soon as possible
        # esp refers to simulatees stack
        movl    %esp, VG_(m_state_static)+16
-       movl    VG_(esp_saved_over_syscall_d1), %esp
+       movl    VG_(esp_saved_over_syscall), %esp
        # esp refers to simulators stack
 
        # ... and undo everything else.  
@@ -94,7 +94,7 @@ VG_(do_syscall):
        frstor  VG_(m_state_static)+40
 
        # Restore the state of the simulator
-       frstor  VG_(real_fpu_state_saved_over_syscall_d1)
+       frstor  VG_(real_fpu_state_saved_over_syscall)
        popal
 
        ret