|
From: <sv...@va...> - 2005-05-29 17:27:22
|
Author: njn
Date: 2005-05-29 18:27:18 +0100 (Sun, 29 May 2005)
New Revision: 3811
Modified:
trunk/coregrind/amd64-linux/core_platform.h
trunk/coregrind/arm-linux/core_platform.h
trunk/coregrind/m_syscalls/syscalls.c
trunk/coregrind/x86-linux/core_platform.h
Log:
Eliminate VGP_GET_MMAP_ARGS.
Modified: trunk/coregrind/amd64-linux/core_platform.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/amd64-linux/core_platform.h 2005-05-29 17:05:49 UTC (=
rev 3810)
+++ trunk/coregrind/amd64-linux/core_platform.h 2005-05-29 17:27:18 UTC (=
rev 3811)
@@ -54,11 +54,6 @@
(prot), (flags), (fd), (offset)); =
\
} while (0)
=20
-#define VGP_GET_MMAP_ARGS(tst, a1, a2, a3, a4, a5, a6) do {\
- I_die_here; \
-} while (0)
-
-
#endif // __AMD64_LINUX_CORE_PLATFORM_H
=20
/*--------------------------------------------------------------------*/
Modified: trunk/coregrind/arm-linux/core_platform.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/arm-linux/core_platform.h 2005-05-29 17:05:49 UTC (re=
v 3810)
+++ trunk/coregrind/arm-linux/core_platform.h 2005-05-29 17:27:18 UTC (re=
v 3811)
@@ -52,10 +52,6 @@
I_die_here; \
} while (0)
=20
-#define VGP_GET_MMAP_ARGS(tst, a1, a2, a3, a4, a5, a6) do { \
- I_die_here; \
-} while (0)
-
#endif // __ARM_LINUX_CORE_PLATFORM_H
=20
/*--------------------------------------------------------------------*/
Modified: trunk/coregrind/m_syscalls/syscalls.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.c 2005-05-29 17:05:49 UTC (rev 38=
10)
+++ trunk/coregrind/m_syscalls/syscalls.c 2005-05-29 17:27:18 UTC (rev 38=
11)
@@ -4467,6 +4467,9 @@
PRE_MEM_RASCIIZ( "mkdir(pathname)", ARG1 );
}
=20
+// Nb: this should probably be in m_syscalls/syscalls-x86-linux.c, but i=
t
+// might be required for ARM, and I was too lazy to move it (which would
+// have required making mmap_segment() public).
PRE(old_mmap, Special)
{
/* struct mmap_arg_struct { =20
@@ -4477,10 +4480,24 @@
unsigned long fd;
unsigned long offset;
}; */
- UInt a1, a2, a3, a4, a5, a6;
+#if defined(VGP_x86_linux)
+ // do nothing
+#else
+ vg_assert(0, "old_mmap should only be called on x86/Linux");
+#endif
+ =20
+ UWord a1, a2, a3, a4, a5, a6;
+ UWord *arg_block =3D (UWord*)(tst->arch.vex.VGP_SYSCALL_ARG1);
=20
PRE_REG_READ1(long, "old_mmap", struct mmap_arg_struct *, args);
- VGP_GET_MMAP_ARGS(tst, a1, a2, a3, a4, a5, a6);
+ arg_block =3D (UWord*)(tst->arch.vex.VGP_SYSCALL_ARG1);
+ PRE_MEM_READ( "old_mmap(args)", (Addr)arg_block, 6*sizeof(UWord) );\
+ a1 =3D arg_block[0];
+ a2 =3D arg_block[1];
+ a3 =3D arg_block[2];
+ a4 =3D arg_block[3];
+ a5 =3D arg_block[4];
+ a6 =3D arg_block[5];
=20
PRINT("old_mmap ( %p, %llu, %d, %d, %d, %d )",
a1, (ULong)a2, a3, a4, a5, a6 );
Modified: trunk/coregrind/x86-linux/core_platform.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/x86-linux/core_platform.h 2005-05-29 17:05:49 UTC (re=
v 3810)
+++ trunk/coregrind/x86-linux/core_platform.h 2005-05-29 17:27:18 UTC (re=
v 3811)
@@ -62,17 +62,6 @@
ret =3D VG_(do_syscall1)(__NR_mmap, (UWord)(&(__args[0])) ); =
\
} while (0)
=20
-#define VGP_GET_MMAP_ARGS(tst, a1, a2, a3, a4, a5, a6) do { \
- UInt *arg_block =3D (UInt*)(tst->arch.vex.VGP_SYSCALL_ARG1); \
- PRE_MEM_READ( "old_mmap(args)", (Addr)arg_block, 6*sizeof(UWord) );\
- a1 =3D arg_block[0]; \
- a2 =3D arg_block[1]; \
- a3 =3D arg_block[2]; \
- a4 =3D arg_block[3]; \
- a5 =3D arg_block[4]; \
- a6 =3D arg_block[5]; \
-} while (0)
-
#endif // __X86_LINUX_CORE_PLATFORM_H
=20
/*--------------------------------------------------------------------*/
|