Remove historical artefact.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@357 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/arch/x86-linux/vg_syscall.S b/coregrind/arch/x86-linux/vg_syscall.S
index 681d8af..adabbed 100644
--- a/coregrind/arch/x86-linux/vg_syscall.S
+++ b/coregrind/arch/x86-linux/vg_syscall.S
@@ -46,11 +46,11 @@
 
 	# 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 @@
 	# 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 @@
 	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 986ddf3..64b0aa0 100644
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -318,10 +318,8 @@
 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 681d8af..adabbed 100644
--- a/coregrind/vg_syscall.S
+++ b/coregrind/vg_syscall.S
@@ -46,11 +46,11 @@
 
 	# 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 @@
 	# 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 @@
 	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 986ddf3..64b0aa0 100644
--- a/vg_main.c
+++ b/vg_main.c
@@ -318,10 +318,8 @@
 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 681d8af..adabbed 100644
--- a/vg_syscall.S
+++ b/vg_syscall.S
@@ -46,11 +46,11 @@
 
 	# 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 @@
 	# 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 @@
 	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