Move some macros into a more private place.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3673

diff --git a/coregrind/core_asm.h b/coregrind/core_asm.h
index 21d1f6c17f10262f3df7fb29f32a8db1e469eb91..8b6d3b08d8bebdad1866bcedf862f707c1e6b6b4 100644 (file)
--- a/coregrind/core_asm.h
+++ b/coregrind/core_asm.h
@@ -38,25 +38,6 @@
    assembly ones. */
 
 
-/* Magic values that the guest state might be set to when returning to the
-   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 == 0 */
-#define VG_TRC_FAULT_SIGNAL       43 /* TRC only; got sigsegv/sigbus */
-#define VG_TRC_INVARIANT_FAILED   47 /* TRC only; invariant violation */
-
-
-#define VG_MAX_TRC             128  /* Highest possible TRC value */
-
 /* Constants for the fast translation lookup cache. */
 #define VG_TT_FAST_BITS 16
 #define VG_TT_FAST_SIZE (1 << VG_TT_FAST_BITS)

diff --git a/coregrind/pub_core_dispatch.h b/coregrind/pub_core_dispatch.h
index e337ad606594d252af85da62a951044268ac09ba..8518b03cc5db18e0a7752a1dc104bca0240b424e 100644 (file)
--- a/coregrind/pub_core_dispatch.h
+++ b/coregrind/pub_core_dispatch.h
@@ -54,6 +54,22 @@
 */
 extern UWord VG_(run_innerloop) ( void* guest_state );
 
+/* Magic values that the guest state might be set to when returning to the
+   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 == 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
 
 /*--------------------------------------------------------------------*/