Change signature of thread_syscall a bit.

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

diff --git a/coregrind/core.h b/coregrind/core.h
index 06f44652a93836767a0ea6ec542af0da1e647213..ad0ecc04d359e2778297f858864c8985a5fe78b8 100644 (file)
--- a/coregrind/core.h
+++ b/coregrind/core.h
@@ -1972,11 +1972,14 @@ extern void VGA_(restart_syscall)(ThreadArchState* arch);
 extern const Addr VGA_(sys_before), VGA_(sys_restarted),
                   VGA_(sys_after),  VGA_(sys_done);
 
-extern void VGA_(do_thread_syscall)(UWord sys, 
-                                    UWord arg1, UWord arg2, UWord arg3,
-                                    UWord arg4, UWord arg5, UWord arg6,
-                                    UWord *result, /*enum PXState*/Int *statep,
-                                    /*enum PXState*/Int poststate);
+extern void VGA_(do_thread_syscall)
+               ( UWord sys, 
+                 UWord arg1, UWord arg2, UWord arg3,
+                 UWord arg4, UWord arg5, UWord arg6,
+                 /*OUT*/HWord *resultP, 
+                 /*enum PXState*/Int *stateP,
+                 /*enum PXState*/Int poststate
+               );
 
 /* ---------------------------------------------------------------------
    Finally - autoconf-generated settings

diff --git a/coregrind/vg_proxylwp.c b/coregrind/vg_proxylwp.c
index fd7bbdbd2e3170359cbb9010f8b78a69c8ffdc7c..ac274d9156344766b3a1372707ebc986d3da3f56 100644 (file)
--- a/coregrind/vg_proxylwp.c
+++ b/coregrind/vg_proxylwp.c
@@ -356,7 +356,8 @@ static Bool recv_reply(struct PX_Reply *reply)
    Assumes that the only thread state which matters is the contents of
    %eax-%ebp and the return value in %eax.
  */
-static void thread_syscall(Int syscallno, ThreadArchState *arch, 
+static void thread_syscall(Int syscallno, 
+                           ThreadArchState *arch, 
                            enum PXState *state , enum PXState poststate)
 {
    VGA_(do_thread_syscall)(syscallno,
@@ -366,7 +367,7 @@ static void thread_syscall(Int syscallno, ThreadArchState *arch,
                            arch->vex.PLATFORM_SYSCALL_ARG4,
                            arch->vex.PLATFORM_SYSCALL_ARG5,
                            arch->vex.PLATFORM_SYSCALL_ARG6,
-                           (UWord*)&arch->vex.PLATFORM_SYSCALL_RET, // result
+                           (HWord*)&arch->vex.PLATFORM_SYSCALL_RET, // result
                            state,       // state to update
                            poststate);   // state when syscall has finished
 }