|
From: <sv...@va...> - 2005-05-12 13:15:43
|
Author: njn
Date: 2005-05-12 14:15:38 +0100 (Thu, 12 May 2005)
New Revision: 3677
Added:
trunk/coregrind/pub_core_dispatch_asm.h
Modified:
trunk/coregrind/Makefile.am
trunk/coregrind/m_dispatch/dispatch-amd64.S
trunk/coregrind/m_dispatch/dispatch-arm.S
trunk/coregrind/m_dispatch/dispatch-x86.S
trunk/coregrind/pub_core_dispatch.h
Log:
Unbreak build by moving creating pub_core_dispatch_asm.h for holding
asm-only constants.
Modified: trunk/coregrind/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/Makefile.am 2005-05-12 09:04:06 UTC (rev 3676)
+++ trunk/coregrind/Makefile.am 2005-05-12 13:15:38 UTC (rev 3677)
@@ -42,6 +42,7 @@
pub_core_debuglog.h \
pub_core_demangle.h \
pub_core_dispatch.h \
+ pub_core_dispatch_asm.h \
pub_core_errormgr.h \
pub_core_execontext.h \
pub_core_mallocfree.h \
Modified: trunk/coregrind/m_dispatch/dispatch-amd64.S
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_dispatch/dispatch-amd64.S 2005-05-12 09:04:06 UTC (=
rev 3676)
+++ trunk/coregrind/m_dispatch/dispatch-amd64.S 2005-05-12 13:15:38 UTC (=
rev 3677)
@@ -30,6 +30,7 @@
*/
=20
#include "core_asm.h"
+#include "pub_core_dispatch_asm.h"
#include "libvex_guest_offsets.h" /* for OFFSET_amd64_RIP */
=20
=20
Modified: trunk/coregrind/m_dispatch/dispatch-arm.S
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_dispatch/dispatch-arm.S 2005-05-12 09:04:06 UTC (re=
v 3676)
+++ trunk/coregrind/m_dispatch/dispatch-arm.S 2005-05-12 13:15:38 UTC (re=
v 3677)
@@ -30,6 +30,7 @@
*/
=20
#include "core_asm.h"
+#include "pub_core_dispatch_asm.h"
=20
.globl VG_(run_innerloop)
VG_(run_innerloop):
Modified: trunk/coregrind/m_dispatch/dispatch-x86.S
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_dispatch/dispatch-x86.S 2005-05-12 09:04:06 UTC (re=
v 3676)
+++ trunk/coregrind/m_dispatch/dispatch-x86.S 2005-05-12 13:15:38 UTC (re=
v 3677)
@@ -30,6 +30,7 @@
*/
=20
#include "core_asm.h"
+#include "pub_core_dispatch_asm.h"
#include "libvex_guest_offsets.h" /* for OFFSET_x86_EIP */
=20
=20
Modified: trunk/coregrind/pub_core_dispatch.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.h 2005-05-12 09:04:06 UTC (rev 3676=
)
+++ trunk/coregrind/pub_core_dispatch.h 2005-05-12 13:15:38 UTC (rev 3677=
)
@@ -39,6 +39,8 @@
// if the current thread has used up its scheduling quantum.
//--------------------------------------------------------------------
=20
+#include "pub_core_dispatch_asm.h"
+
/* This subroutine is called from the C world. It is passed
a pointer to the VEX guest state (arch.vex). It must run code
from the instruction pointer in the guest state, and exit when
@@ -54,22 +56,6 @@
*/
extern UWord VG_(run_innerloop) ( void* guest_state );
=20
-/* Magic values that the guest state might be set to when returning to t=
he
- dispatcher. The only other legitimate value is to point to the
- start of the thread's VEX guest state. These also are return values =
from
- from VG_(run_innerloop) to the scheduler.
-*/
-/* Defines values for JMP_EMWARN, JMP_SYSCALL, JMP_CLIENTREQ and
- JMP_YIELD */
-#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. */
-#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 */
-#define VG_TRC_INVARIANT_FAILED 47 /* TRC only; invariant violation */
-
#endif // __PUB_CORE_DISPATCH_H
=20
/*--------------------------------------------------------------------*/
Added: 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-05-12 09:04:06 UTC (rev =
3676)
+++ trunk/coregrind/pub_core_dispatch_asm.h 2005-05-12 13:15:38 UTC (rev =
3677)
@@ -0,0 +1,54 @@
+
+/*--------------------------------------------------------------------*/
+/*--- Asm-only dispatcher stuff. pub_core_dispatch_asm.h ---*/
+/*--------------------------------------------------------------------*/
+
+/*
+ This file is part of Valgrind, a dynamic binary instrumentation
+ framework.
+
+ Copyright (C) 2000-2005 Julian Seward
+ js...@ac...
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307, USA.
+
+ The GNU General Public License is contained in the file COPYING.
+*/
+
+#ifndef __PUB_CORE_DISPATCH_ASM_H
+#define __PUB_CORE_DISPATCH_ASM_H
+
+/* Magic values that the guest state might be set to when returning to t=
he
+ dispatcher. The only other legitimate value is to point to the
+ start of the thread's VEX guest state. These also are return values =
from
+ from VG_(run_innerloop) to the scheduler.
+*/
+/* Defines values for JMP_EMWARN, JMP_SYSCALL, JMP_CLIENTREQ and
+ JMP_YIELD */
+#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. */
+#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 */
+#define VG_TRC_INVARIANT_FAILED 47 /* TRC only; invariant violation */
+
+#endif // __PUB_CORE_DISPATCH_ASM_H
+
+/*--------------------------------------------------------------------*/
+/*--- end ---*/
+/*--------------------------------------------------------------------*/
|