commit 4928104ef3aad39e00d22ac81fd2aad6d41a25bf
author Joseph Wen <josephwen@google.com> Tue Jul 26 10:04:09 2011 -0700
committer Joseph Wen <josephwen@google.com> Tue Jul 26 10:04:09 2011 -0700
tree 007c97374a5de80ae996fe6b533dcf13f811f993
parent 34c600a77b0dd2f27fabbc4b6b3b94ed12af2a57

Fixbug remove symbol lookup at MCCacheWriter

Change-Id: I4755bc99a414653c897f26609ad1bdc640f571ea

include/bcc/bcc.h

diff --git a/include/bcc/bcc.h b/include/bcc/bcc.h
index 3e3a59e..cf67ab3 100644
--- a/include/bcc/bcc.h
+++ b/include/bcc/bcc.h
@@ -95,6 +95,11 @@
                 char const *path,
                 unsigned long flags);
 
+int bccPrepareSharedObject(BCCScriptRef script,
+                         char const *cacheDir,
+                         char const *cacheName,
+                         unsigned long flags);
+
 int bccPrepareExecutable(BCCScriptRef script,
                          char const *cacheDir,
                          char const *cacheName,

include/bcc/bcc_mccache.h

diff --git a/include/bcc/bcc_mccache.h b/include/bcc/bcc_mccache.h
index 0979367..2988afc 100644
--- a/include/bcc/bcc_mccache.h
+++ b/include/bcc/bcc_mccache.h
@@ -40,8 +40,6 @@
   uint8_t sizeof_size_t;
   uint8_t sizeof_ptr_t;
 
-  void *root_base_addr;
-
   /* string pool section */
   off_t str_pool_offset;
   size_t str_pool_size;

lib/ExecutionEngine/MCCacheWriter.cpp

diff --git a/lib/ExecutionEngine/MCCacheWriter.cpp b/lib/ExecutionEngine/MCCacheWriter.cpp
index ea45551..6fbf4ba 100644
--- a/lib/ExecutionEngine/MCCacheWriter.cpp
+++ b/lib/ExecutionEngine/MCCacheWriter.cpp
@@ -97,10 +97,6 @@
   header->sizeof_size_t = sizeof(size_t);
   header->sizeof_ptr_t = sizeof(void *);
 
-  header->root_base_addr = mpOwner->lookup("root");
-
-  LOGD("Lookup root() address [%p]", header->root_base_addr);
-
   // libRS is threadable dirty hack
   // TODO: This should be removed in the future
   header->libRS_threadable = libRS_threadable;

lib/ExecutionEngine/Script.cpp

diff --git a/lib/ExecutionEngine/Script.cpp b/lib/ExecutionEngine/Script.cpp
index e67fd61..29e3898 100644
--- a/lib/ExecutionEngine/Script.cpp
+++ b/lib/ExecutionEngine/Script.cpp
@@ -297,7 +297,7 @@
   }
 
   if (checkOnly)
-    return reader.checkCacheFile(&objFile, &infoFile, this);
+    return !reader.checkCacheFile(&objFile, &infoFile, this);
 
   // Read cache file
   ScriptCached *cached = reader.readCacheFile(&objFile, &infoFile, this);