[Valgrind-developers] valgrind: r6777 - in trunk/coregrind: . m_dispatch m_syswrap

[<sv...@va...>]

Author: sewardj
Date: 2007-08-24 21:37:09 +0100 (Fri, 24 Aug 2007)
New Revision: 6777

Log:
gcc-4.3 compile fixes.

Modified:
   trunk/coregrind/m_dispatch/dispatch-x86-linux.S
   trunk/coregrind/m_syswrap/syscall-x86-linux.S
   trunk/coregrind/m_trampoline.S


Modified: trunk/coregrind/m_dispatch/dispatch-x86-linux.S
===================================================================
--- trunk/coregrind/m_dispatch/dispatch-x86-linux.S	2007-08-23 10:24:30 UTC (rev 6776)
+++ trunk/coregrind/m_dispatch/dispatch-x86-linux.S	2007-08-24 20:37:09 UTC (rev 6777)
@@ -121,7 +121,7 @@
 
 	/* try a fast lookup in the translation cache */
 	movl	%eax, %ebx			/* next guest addr */
-	andl	$VG_TT_FAST_MASK, %ebx		/* entry# */
+	andl	$ VG_TT_FAST_MASK, %ebx		/* entry# */
 	movl	0+VG_(tt_fast)(,%ebx,8), %esi	/* .guest */
 	movl	4+VG_(tt_fast)(,%ebx,8), %edi	/* .host */
 	cmpl	%eax, %esi
@@ -157,7 +157,7 @@
 
 	/* try a fast lookup in the translation cache */
 	movl	%eax, %ebx			/* next guest addr */
-	andl	$VG_TT_FAST_MASK, %ebx		/* entry# */
+	andl	$ VG_TT_FAST_MASK, %ebx		/* entry# */
 	movl	0+VG_(tt_fast)(,%ebx,8), %esi	/* .guest */
 	movl	4+VG_(tt_fast)(,%ebx,8), %edi	/* .host */
 	cmpl	%eax, %esi
@@ -199,7 +199,7 @@
 	/* %EIP is up to date here */
 	/* back out decrement of the dispatch counter */
 	addl	$1, VG_(dispatch_ctr)
-	movl	$VG_TRC_INNER_COUNTERZERO, %eax
+	movl	$ VG_TRC_INNER_COUNTERZERO, %eax
 	jmp	run_innerloop_exit
 	/*NOTREACHED*/
 
@@ -207,7 +207,7 @@
 	/* %EIP is up to date here */
 	/* back out decrement of the dispatch counter */
 	addl	$1, VG_(dispatch_ctr)
-	movl	$VG_TRC_INNER_FASTMISS, %eax
+	movl	$ VG_TRC_INNER_FASTMISS, %eax
 	jmp	run_innerloop_exit
 	/*NOTREACHED*/
 
@@ -240,7 +240,7 @@
 	jmp	run_innerloop_exit_REALLY
 
 invariant_violation:
-	movl	$VG_TRC_INVARIANT_FAILED, %eax
+	movl	$ VG_TRC_INVARIANT_FAILED, %eax
 	jmp	run_innerloop_exit_REALLY
 
 run_innerloop_exit_REALLY:

Modified: trunk/coregrind/m_syswrap/syscall-x86-linux.S
===================================================================
--- trunk/coregrind/m_syswrap/syscall-x86-linux.S	2007-08-23 10:24:30 UTC (rev 6776)
+++ trunk/coregrind/m_syswrap/syscall-x86-linux.S	2007-08-24 20:37:09 UTC (rev 6777)
@@ -88,8 +88,8 @@
 	   If eip is in the range [1,2), the syscall hasn't been started yet */
 
 	/* Set the signal mask which should be current during the syscall. */
-	movl	$__NR_rt_sigprocmask, %eax
-	movl	$VKI_SIG_SETMASK, %ebx
+	movl	$ __NR_rt_sigprocmask, %eax
+	movl	$ VKI_SIG_SETMASK, %ebx
 	movl	8+FSZ(%esp), %ecx
 	movl	12+FSZ(%esp), %edx
 	movl	16+FSZ(%esp), %esi
@@ -117,8 +117,8 @@
 
 4:	/* Re-block signals.  If eip is in [4,5), then the syscall is complete and 
 	   we needn't worry about it. */
-	movl	$__NR_rt_sigprocmask, %eax
-	movl	$VKI_SIG_SETMASK, %ebx
+	movl	$ __NR_rt_sigprocmask, %eax
+	movl	$ VKI_SIG_SETMASK, %ebx
 	movl	12+FSZ(%esp), %ecx
 	xorl	%edx, %edx
 	movl	16+FSZ(%esp), %esi

Modified: trunk/coregrind/m_trampoline.S
===================================================================
--- trunk/coregrind/m_trampoline.S	2007-08-23 10:24:30 UTC (rev 6776)
+++ trunk/coregrind/m_trampoline.S	2007-08-24 20:37:09 UTC (rev 6777)
@@ -67,14 +67,14 @@
            x86_fallback_frame_state() in
            gcc-4.1.0/gcc/config/i386/linux-unwind.h */
         popl    %eax
-        movl    $__NR_sigreturn, %eax
+        movl    $ __NR_sigreturn, %eax
         int     $0x80
         ud2
 
 .global VG_(x86_linux_SUBST_FOR_rt_sigreturn)
 VG_(x86_linux_SUBST_FOR_rt_sigreturn):
         /* Likewise for rt signal frames */
-        movl    $__NR_rt_sigreturn, %eax
+        movl    $ __NR_rt_sigreturn, %eax
         int     $0x80
         ud2