|
From: <sv...@va...> - 2005-05-13 22:07:16
|
Author: njn
Date: 2005-05-13 23:07:12 +0100 (Fri, 13 May 2005)
New Revision: 3697
Modified:
trunk/coregrind/m_syscalls/priv_syscalls.h
trunk/coregrind/m_syscalls/syscalls-amd64-linux.c
trunk/coregrind/m_syscalls/syscalls-arm-linux.c
trunk/coregrind/m_syscalls/syscalls-x86-linux.c
Log:
VGA_(restart_syscall)() doesn't need to be exported.
Modified: trunk/coregrind/m_syscalls/priv_syscalls.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_syscalls/priv_syscalls.h 2005-05-13 21:49:30 UTC (r=
ev 3696)
+++ trunk/coregrind/m_syscalls/priv_syscalls.h 2005-05-13 22:07:12 UTC (r=
ev 3697)
@@ -73,8 +73,6 @@
=20
extern const UInt VGA_(syscall_table_size);
=20
-extern void VGA_(restart_syscall)(ThreadArchState* arch);
-
extern Int VG_(clone) ( Int (*fn)(void *), void *stack, Int flags, void =
*arg,=20
Int *child_tid, Int *parent_tid, vki_modify_ldt_t * );
=20
Modified: trunk/coregrind/m_syscalls/syscalls-amd64-linux.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_syscalls/syscalls-amd64-linux.c 2005-05-13 21:49:30=
UTC (rev 3696)
+++ trunk/coregrind/m_syscalls/syscalls-amd64-linux.c 2005-05-13 22:07:12=
UTC (rev 3697)
@@ -57,7 +57,7 @@
extern const Addr VGA_(blksys_finished);
=20
// Back up to restart a system call.
-void VGA_(restart_syscall)(ThreadArchState *arch)
+static void restart_syscall(ThreadArchState *arch)
{
arch->vex.guest_RIP -=3D 2; // sizeof(syscall)
=20
@@ -133,13 +133,13 @@
/* syscall hasn't even started; go around again */
if (debug)
VG_(printf)(" not started: restart\n");
- VGA_(restart_syscall)(th_regs);
+ restart_syscall(th_regs);
} else if (ip =3D=3D VGA_(blksys_restart)) {
/* We're either about to run the syscall, or it was interrupted
and the kernel restarted it. Restart if asked, otherwise
EINTR it. */
if (restart)
- VGA_(restart_syscall)(th_regs);
+ restart_syscall(th_regs);
else {
th_regs->vex.VGP_SYSCALL_RET =3D -VKI_EINTR;
VG_(post_syscall)(tid);
@@ -548,7 +548,7 @@
=20
/* This is only so that the RIP is (might be) useful to report if
something goes wrong in the sigreturn */
- VGA_(restart_syscall)(&tst->arch);
+ restart_syscall(&tst->arch);
=20
VG_(sigframe_destroy)(tid, True);
=20
Modified: trunk/coregrind/m_syscalls/syscalls-arm-linux.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_syscalls/syscalls-arm-linux.c 2005-05-13 21:49:30 U=
TC (rev 3696)
+++ trunk/coregrind/m_syscalls/syscalls-arm-linux.c 2005-05-13 22:07:12 U=
TC (rev 3697)
@@ -49,7 +49,7 @@
=20
=20
// Back up to restart a system call.
-void VGA_(restart_syscall)(ThreadArchState *arch)
+static void restart_syscall(ThreadArchState *arch)
{
I_die_here;
#if 0
Modified: trunk/coregrind/m_syscalls/syscalls-x86-linux.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_syscalls/syscalls-x86-linux.c 2005-05-13 21:49:30 U=
TC (rev 3696)
+++ trunk/coregrind/m_syscalls/syscalls-x86-linux.c 2005-05-13 22:07:12 U=
TC (rev 3697)
@@ -55,7 +55,7 @@
extern const Addr VGA_(blksys_finished);
=20
// Back up to restart a system call.
-void VGA_(restart_syscall)(ThreadArchState *arch)
+static void restart_syscall(ThreadArchState *arch)
{
arch->vex.guest_EIP -=3D 2; // sizeof(int $0x80)
=20
@@ -131,13 +131,13 @@
/* syscall hasn't even started; go around again */
if (debug)
VG_(printf)(" not started: restart\n");
- VGA_(restart_syscall)(th_regs);
+ restart_syscall(th_regs);
} else if (eip =3D=3D VGA_(blksys_restart)) {
/* We're either about to run the syscall, or it was interrupted
and the kernel restarted it. Restart if asked, otherwise
EINTR it. */
if (restart)
- VGA_(restart_syscall)(th_regs);
+ restart_syscall(th_regs);
else {
th_regs->vex.VGP_SYSCALL_RET =3D -VKI_EINTR;
VG_(post_syscall)(tid);
@@ -593,7 +593,7 @@
=20
/* This is only so that the EIP is (might be) useful to report if
something goes wrong in the sigreturn */
- VGA_(restart_syscall)(&tst->arch);
+ restart_syscall(&tst->arch);
=20
VG_(sigframe_destroy)(tid, False);
=20
@@ -614,7 +614,7 @@
=20
/* This is only so that the EIP is (might be) useful to report if
something goes wrong in the sigreturn */
- VGA_(restart_syscall)(&tst->arch);
+ restart_syscall(&tst->arch);
=20
VG_(sigframe_destroy)(tid, True);
=20
|