|
From: <sv...@va...> - 2005-11-03 13:46:32
|
Author: sewardj
Date: 2005-11-03 13:46:30 +0000 (Thu, 03 Nov 2005)
New Revision: 4994
Log:
Track API change in vex r1429.
Modified:
trunk/coregrind/m_scheduler/scheduler.c
trunk/coregrind/pub_core_dispatch_asm.h
Modified: trunk/coregrind/m_scheduler/scheduler.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_scheduler/scheduler.c 2005-11-02 19:41:21 UTC (rev =
4993)
+++ trunk/coregrind/m_scheduler/scheduler.c 2005-11-03 13:46:30 UTC (rev =
4994)
@@ -150,7 +150,10 @@
HChar* name_of_sched_event ( UInt event )
{
switch (event) {
- case VEX_TRC_JMP_SYSCALL: return "SYSCALL";
+ case VEX_TRC_JMP_SYS_SYSCALL: return "SYSCALL";
+ case VEX_TRC_JMP_SYS_INT32: return "INT32";
+ case VEX_TRC_JMP_SYS_INT128: return "INT128";
+ case VEX_TRC_JMP_SYS_SYSENTER: return "SYSENTER";
case VEX_TRC_JMP_CLIENTREQ: return "CLIENTREQ";
case VEX_TRC_JMP_YIELD: return "YIELD";
case VEX_TRC_JMP_NODECODE: return "NODECODE";
@@ -715,8 +718,9 @@
case VEX_TRC_JMP_CLIENTREQ:
do_client_request(tid);
break;
- =20
- case VEX_TRC_JMP_SYSCALL:
+
+ case VEX_TRC_JMP_SYS_INT128: /* x86-linux */
+ case VEX_TRC_JMP_SYS_SYSCALL: /* amd64-linux, ppc32-linux */
handle_syscall(tid);
if (VG_(clo_sanity_level) > 2)
VG_(sanity_check_general)(True); /* sanity-check every syscall */
@@ -817,7 +821,7 @@
"run_innerloop detected host "
"state invariant failure", trc);
=20
- case VEX_TRC_JMP_SYSENTER_X86:
+ case VEX_TRC_JMP_SYS_SYSENTER:
/* Do whatever simulation is appropriate for an x86 sysenter
instruction. Note that it is critical to set this thread's
guest_EIP to point at the code to execute after the
Modified: trunk/coregrind/pub_core_dispatch_asm.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/pub_core_dispatch_asm.h 2005-11-02 19:41:21 UTC (rev =
4993)
+++ trunk/coregrind/pub_core_dispatch_asm.h 2005-11-03 13:46:30 UTC (rev =
4994)
@@ -41,7 +41,7 @@
#include "libvex_trc_values.h"
=20
/* And some more of our own. These must not have the same values as
- those from libvex_trc_values.h. */
+ those from libvex_trc_values.h. (viz, 60 or below is safe). */
#define VG_TRC_INNER_FASTMISS 37 /* TRC only; means fast-cache miss.=
*/
#define VG_TRC_INNER_COUNTERZERO 41 /* TRC only; means bb ctr =3D=3D 0 =
*/
#define VG_TRC_FAULT_SIGNAL 43 /* TRC only; got sigsegv/sigbus */
|