commit 4ea08862f6b84e4855e14a3569f12de7d2a8a695
author Zonr Chang <zonr.net@gmail.com> Tue Jan 17 17:26:49 2012 +0800
committer Shih-wei Liao <sliao@google.com> Tue Jan 17 02:20:57 2012 -0800
tree f7ecb73b88aca184923d97a69fe25e9b6541d99b
parent df3fee4cc5190480970200f0162b00b841f22011

Refactoring.

Change-Id: I283837f0adc00ba328e981f419483a0defb22f65

lib/ExecutionEngine/Script.cpp

diff --git a/lib/ExecutionEngine/Script.cpp b/lib/ExecutionEngine/Script.cpp
index 9e59495..bfa914b 100644
--- a/lib/ExecutionEngine/Script.cpp
+++ b/lib/ExecutionEngine/Script.cpp
@@ -183,6 +183,7 @@
                           char const *cacheName,
                           llvm::Reloc::Model RelocModel,
                           unsigned long flags) {
+  mObjectType = ScriptObject::Relocatable;
 #if USE_CACHE
   if (cacheDir && cacheName) {
     // Set Cache Directory and File Name
@@ -220,6 +221,7 @@
     return 1;
   }
 
+  mObjectType = ScriptObject::Executable;
 #if USE_CACHE
   if (cacheDir && cacheName) {
     // Set Cache Directory and File Name
@@ -261,13 +263,8 @@
     return 1;
   }
 
-#if USE_OLD_JIT
-  std::string objPath(mCacheDir + mCacheName + ".jit-image");
-  std::string infoPath(mCacheDir + mCacheName + ".oBCC"); // TODO: .info instead
-#elif USE_MCJIT
-  std::string objPath(mCacheDir + mCacheName + ".o");
-  std::string infoPath(mCacheDir + mCacheName + ".info");
-#endif
+  std::string objPath = getCachedObjectPath();
+  std::string infoPath = getCacheInfoPath();
 
   FileHandle objFile;
   if (objFile.open(objPath.c_str(), OpenMode::Read) < 0) {
@@ -390,14 +387,8 @@
 #endif
       !getBooleanProp("debug.bcc.nocache")) {
 
-#if USE_OLD_JIT
-    std::string objPath(mCacheDir + mCacheName + ".jit-image");
-    std::string infoPath(mCacheDir + mCacheName + ".oBCC");
-#elif USE_MCJIT
-    std::string objPath(mCacheDir + mCacheName + ".o");
-    std::string infoPath(mCacheDir + mCacheName + ".info");
-#endif
-
+    std::string objPath = getCachedObjectPath();
+    std::string infoPath = getCacheInfoPath();
 
     // Remove the file if it already exists before writing the new file.
     // The old file may still be mapped elsewhere in memory and we do not want