PERFORCE change 152611 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=152611

Change 152611 by peter at peter_hammer on 2008/11/07 04:10:50

	Make this compile on 32 bit again

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#29 edit
.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-main.c#13 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#29 (text+ko) ====

@@ -172,7 +172,7 @@
       asm volatile (
          "movl	%1, %0\n"	/* set tst->status = VgTs_Empty */
          "movl	%2, %%eax\n"    /* set %eax = __NR_thr_exit */
-         "leaq	%3, %%ebx\n"    /* set %ebx = tst->os_state.exitcode */
+         "leal	%3, %%ebx\n"    /* set %ebx = tst->os_state.exitcode */
 	 "pushl	%%ebx\n"	/* arg on stack */
 	 "pushl	%%ebx\n"	/* fake return address */
          "int	$0x80\n"	/* thr_exit(&tst->os_state.exitcode) */

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-main.c#13 (text+ko) ====

@@ -267,10 +267,10 @@
 #if defined(VGP_x86_freebsd)
    /* On FreeBSD, the success/fail status is returned */
    if (err == 1) {
-      LibVEX_Guestx86_put_eflag_c(1, &tst->arch.vex);
+      LibVEX_GuestX86_put_eflag_c(1, &tst->arch.vex);
       err = 0;
    } else {
-      LibVEX_Guestx86_put_eflag_c(0, &tst->arch.vex);
+      LibVEX_GuestX86_put_eflag_c(0, &tst->arch.vex);
    }
 #elif defined(VGP_amd64_freebsd)
    if (err == 1) {
@@ -1635,9 +1635,9 @@
 	 and still has to be fixed up here. */
       if (!(sci->flags & SfNoWriteResult)) {
         if (sres.isError)
-           LibVEX_Guestx86_put_eflag_c(1, &th_regs->vex);
+           LibVEX_GuestX86_put_eflag_c(1, &th_regs->vex);
         else
-           LibVEX_Guestx86_put_eflag_c(0, &th_regs->vex);
+           LibVEX_GuestX86_put_eflag_c(0, &th_regs->vex);
       }
 #elif defined(VGP_amd64_freebsd)
       if (!(sci->flags & SfNoWriteResult)) {