From cbbd0bedb75b75b99c1112e1f433386a14661b0b Mon Sep 17 00:00:00 2001 From: Ben Cheng Date: Mon, 10 May 2010 23:24:02 -0700 Subject: [PATCH] Add the dummy CHECK_JIT and ABORT_JIT_TSELECT macros even when JIT is off. Change-Id: I5d9886dcb8359dd4336d83b2a2bddad383f5cc36 --- vm/mterp/cstubs/stubdefs.c | 2 -- vm/mterp/out/InterpC-allstubs.c | 2 -- vm/mterp/out/InterpC-armv4t.c | 2 -- vm/mterp/out/InterpC-armv5te-vfp.c | 2 -- vm/mterp/out/InterpC-armv5te.c | 2 -- vm/mterp/out/InterpC-armv7-a-neon.c | 2 -- vm/mterp/out/InterpC-armv7-a.c | 2 -- vm/mterp/out/InterpC-x86-atom.c | 2 -- vm/mterp/out/InterpC-x86.c | 2 -- 9 files changed, 18 deletions(-) diff --git a/vm/mterp/cstubs/stubdefs.c b/vm/mterp/cstubs/stubdefs.c index ba10853a9..5a8d58541 100644 --- a/vm/mterp/cstubs/stubdefs.c +++ b/vm/mterp/cstubs/stubdefs.c @@ -2,10 +2,8 @@ #define INTERP_TYPE INTERP_STD #define CHECK_DEBUG_AND_PROF() ((void)0) # define CHECK_TRACKED_REFS() ((void)0) -#if defined(WITH_JIT) #define CHECK_JIT() (0) #define ABORT_JIT_TSELECT() ((void)0) -#endif /* * In the C mterp stubs, "goto" is a function call followed immediately diff --git a/vm/mterp/out/InterpC-allstubs.c b/vm/mterp/out/InterpC-allstubs.c index dcb1a34f3..ea1de0720 100644 --- a/vm/mterp/out/InterpC-allstubs.c +++ b/vm/mterp/out/InterpC-allstubs.c @@ -422,10 +422,8 @@ static inline bool checkForNullExportPC(Object* obj, u4* fp, const u2* pc) #define INTERP_TYPE INTERP_STD #define CHECK_DEBUG_AND_PROF() ((void)0) # define CHECK_TRACKED_REFS() ((void)0) -#if defined(WITH_JIT) #define CHECK_JIT() (0) #define ABORT_JIT_TSELECT() ((void)0) -#endif /* * In the C mterp stubs, "goto" is a function call followed immediately diff --git a/vm/mterp/out/InterpC-armv4t.c b/vm/mterp/out/InterpC-armv4t.c index 728d1adec..53255a9da 100644 --- a/vm/mterp/out/InterpC-armv4t.c +++ b/vm/mterp/out/InterpC-armv4t.c @@ -422,10 +422,8 @@ static inline bool checkForNullExportPC(Object* obj, u4* fp, const u2* pc) #define INTERP_TYPE INTERP_STD #define CHECK_DEBUG_AND_PROF() ((void)0) # define CHECK_TRACKED_REFS() ((void)0) -#if defined(WITH_JIT) #define CHECK_JIT() (0) #define ABORT_JIT_TSELECT() ((void)0) -#endif /* * In the C mterp stubs, "goto" is a function call followed immediately diff --git a/vm/mterp/out/InterpC-armv5te-vfp.c b/vm/mterp/out/InterpC-armv5te-vfp.c index 4251b1cbe..bf9ba3bf2 100644 --- a/vm/mterp/out/InterpC-armv5te-vfp.c +++ b/vm/mterp/out/InterpC-armv5te-vfp.c @@ -422,10 +422,8 @@ static inline bool checkForNullExportPC(Object* obj, u4* fp, const u2* pc) #define INTERP_TYPE INTERP_STD #define CHECK_DEBUG_AND_PROF() ((void)0) # define CHECK_TRACKED_REFS() ((void)0) -#if defined(WITH_JIT) #define CHECK_JIT() (0) #define ABORT_JIT_TSELECT() ((void)0) -#endif /* * In the C mterp stubs, "goto" is a function call followed immediately diff --git a/vm/mterp/out/InterpC-armv5te.c b/vm/mterp/out/InterpC-armv5te.c index 1ed734e87..7f297a7e7 100644 --- a/vm/mterp/out/InterpC-armv5te.c +++ b/vm/mterp/out/InterpC-armv5te.c @@ -422,10 +422,8 @@ static inline bool checkForNullExportPC(Object* obj, u4* fp, const u2* pc) #define INTERP_TYPE INTERP_STD #define CHECK_DEBUG_AND_PROF() ((void)0) # define CHECK_TRACKED_REFS() ((void)0) -#if defined(WITH_JIT) #define CHECK_JIT() (0) #define ABORT_JIT_TSELECT() ((void)0) -#endif /* * In the C mterp stubs, "goto" is a function call followed immediately diff --git a/vm/mterp/out/InterpC-armv7-a-neon.c b/vm/mterp/out/InterpC-armv7-a-neon.c index a5d71c3b3..98fccd929 100644 --- a/vm/mterp/out/InterpC-armv7-a-neon.c +++ b/vm/mterp/out/InterpC-armv7-a-neon.c @@ -422,10 +422,8 @@ static inline bool checkForNullExportPC(Object* obj, u4* fp, const u2* pc) #define INTERP_TYPE INTERP_STD #define CHECK_DEBUG_AND_PROF() ((void)0) # define CHECK_TRACKED_REFS() ((void)0) -#if defined(WITH_JIT) #define CHECK_JIT() (0) #define ABORT_JIT_TSELECT() ((void)0) -#endif /* * In the C mterp stubs, "goto" is a function call followed immediately diff --git a/vm/mterp/out/InterpC-armv7-a.c b/vm/mterp/out/InterpC-armv7-a.c index da6bcdd88..ab22ab6d6 100644 --- a/vm/mterp/out/InterpC-armv7-a.c +++ b/vm/mterp/out/InterpC-armv7-a.c @@ -422,10 +422,8 @@ static inline bool checkForNullExportPC(Object* obj, u4* fp, const u2* pc) #define INTERP_TYPE INTERP_STD #define CHECK_DEBUG_AND_PROF() ((void)0) # define CHECK_TRACKED_REFS() ((void)0) -#if defined(WITH_JIT) #define CHECK_JIT() (0) #define ABORT_JIT_TSELECT() ((void)0) -#endif /* * In the C mterp stubs, "goto" is a function call followed immediately diff --git a/vm/mterp/out/InterpC-x86-atom.c b/vm/mterp/out/InterpC-x86-atom.c index 8ffd52635..4ee71812e 100644 --- a/vm/mterp/out/InterpC-x86-atom.c +++ b/vm/mterp/out/InterpC-x86-atom.c @@ -422,10 +422,8 @@ static inline bool checkForNullExportPC(Object* obj, u4* fp, const u2* pc) #define INTERP_TYPE INTERP_STD #define CHECK_DEBUG_AND_PROF() ((void)0) # define CHECK_TRACKED_REFS() ((void)0) -#if defined(WITH_JIT) #define CHECK_JIT() (0) #define ABORT_JIT_TSELECT() ((void)0) -#endif /* * In the C mterp stubs, "goto" is a function call followed immediately diff --git a/vm/mterp/out/InterpC-x86.c b/vm/mterp/out/InterpC-x86.c index 68605817a..ecbb6147d 100644 --- a/vm/mterp/out/InterpC-x86.c +++ b/vm/mterp/out/InterpC-x86.c @@ -422,10 +422,8 @@ static inline bool checkForNullExportPC(Object* obj, u4* fp, const u2* pc) #define INTERP_TYPE INTERP_STD #define CHECK_DEBUG_AND_PROF() ((void)0) # define CHECK_TRACKED_REFS() ((void)0) -#if defined(WITH_JIT) #define CHECK_JIT() (0) #define ABORT_JIT_TSELECT() ((void)0) -#endif /* * In the C mterp stubs, "goto" is a function call followed immediately -- 2.11.0