From e00aa31d8553a06abc1d582bda1cf838ccb5b4d9 Mon Sep 17 00:00:00 2001 From: Julian Seward Date: Thu, 3 Nov 2005 13:46:30 +0000 Subject: [PATCH] Track API change in vex r1429. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4994 --- coregrind/m_scheduler/scheduler.c | 12 ++++++++---- coregrind/pub_core_dispatch_asm.h | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/coregrind/m_scheduler/scheduler.c b/coregrind/m_scheduler/scheduler.c index 88e0cba5f..a056e56ac 100644 --- a/coregrind/m_scheduler/scheduler.c +++ b/coregrind/m_scheduler/scheduler.c @@ -150,7 +150,10 @@ static 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 @@ VgSchedReturnCode VG_(scheduler) ( ThreadId tid ) case VEX_TRC_JMP_CLIENTREQ: do_client_request(tid); break; - - 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 @@ VgSchedReturnCode VG_(scheduler) ( ThreadId tid ) "run_innerloop detected host " "state invariant failure", trc); - 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 diff --git a/coregrind/pub_core_dispatch_asm.h b/coregrind/pub_core_dispatch_asm.h index 4677d57ed..59720363c 100644 --- a/coregrind/pub_core_dispatch_asm.h +++ b/coregrind/pub_core_dispatch_asm.h @@ -41,7 +41,7 @@ #include "libvex_trc_values.h" /* 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 == 0 */ #define VG_TRC_FAULT_SIGNAL 43 /* TRC only; got sigsegv/sigbus */