commit 320b5499c78f8b94bc61f609a5fc9053a91d3c18
author Shih-wei Liao <sliao@google.com> Mon Jun 20 22:53:33 2011 -0700
committer Shih-wei Liao <sliao@google.com> Mon Jun 20 22:53:33 2011 -0700
tree 484f117e4540b095dbd6c695cb15a485900bb52a
parent 34499f455006ca068bc3d2aa495c648613672434

Add missing #if USE_MCJIT header guard. Clean up debugging message.

Change-Id: I110b9d57985e817b3d29bc905dc834a142ee069b

lib/ExecutionEngine/Compiler.cpp

diff --git a/lib/ExecutionEngine/Compiler.cpp b/lib/ExecutionEngine/Compiler.cpp
index c079bc5..6f54dbc 100644
--- a/lib/ExecutionEngine/Compiler.cpp
+++ b/lib/ExecutionEngine/Compiler.cpp
@@ -25,7 +25,9 @@
 #include "ScriptCompiled.h"
 #include "Sha1Helper.h"
 
+#if USE_MCJIT
 #include "librsloader.h"
+#endif
 
 #include "llvm/ADT/StringRef.h"
 
@@ -108,7 +110,7 @@
 }; // namespace anonymous
 
 #define DEBUG_MCJIT REFLECT 0
-#define DEBUG_MCJIT_DISASSEMBLE 1
+#define DEBUG_MCJIT_DISASSEMBLE 0
 
 namespace bcc {
 
@@ -414,9 +416,10 @@
   }
 #if USE_DISASSEMBLER && DEBUG_MCJIT_DISASSEMBLE
   {
-    llvm::LLVMContext Ctx;
-    LOGD("@ long long alignment: %d\n", TD->getABITypeAlignment((llvm::Type const *)llvm::Type::getInt64Ty(Ctx)));
-    char const *func_list[] = { "root", "lookAt" };
+    // llvm::LLVMContext Ctx;
+    // LOGD("@ long long alignment: %d\n", TD->getABITypeAlignment((llvm::Type const *)llvm::Type::getInt64Ty(Ctx)));
+    char const *func_list[] = { "root" };
+
     size_t func_list_size = sizeof(func_list) / sizeof(char const *);
 
     for (size_t i = 0; i < func_list_size; ++i) {

lib/ExecutionEngine/Compiler.h

diff --git a/lib/ExecutionEngine/Compiler.h b/lib/ExecutionEngine/Compiler.h
index ecd7235..5018db3 100644
--- a/lib/ExecutionEngine/Compiler.h
+++ b/lib/ExecutionEngine/Compiler.h
@@ -22,7 +22,9 @@
 #include "CodeEmitter.h"
 #include "CodeMemoryManager.h"
 
+#if USE_MCJIT
 #include "librsloader.h"
+#endif
 
 #include "llvm/ADT/OwningPtr.h"
 #include "llvm/ADT/StringRef.h"

lib/ExecutionEngine/ScriptCached.h

diff --git a/lib/ExecutionEngine/ScriptCached.h b/lib/ExecutionEngine/ScriptCached.h
index 53cb967..147c935 100644
--- a/lib/ExecutionEngine/ScriptCached.h
+++ b/lib/ExecutionEngine/ScriptCached.h
@@ -22,7 +22,9 @@
 #include <bcc/bcc_mccache.h>
 #include "bcc_internal.h"
 
+#if USE_MCJIT
 #include "librsloader.h"
+#endif
 
 #include <llvm/ADT/SmallVector.h>
 
@@ -64,7 +66,9 @@
 
     char *mContext;
 
+#if USE_MCJIT
     RSExecRef mRSExecutable;
+#endif
 
     OBCC_StringPool *mpStringPoolRaw;
     std::vector<char const *> mStringPool;