commit f6267d1f0c65b10fa1d9b8aae08ad2c31df4a2e8
author Shih-wei Liao <sliao@google.com> Fri Jan 07 19:23:58 2011 -0800
committer Shih-wei Liao <sliao@google.com> Fri Jan 07 19:23:58 2011 -0800
tree d0f0798fe02ec2f144cff66afe49c5165028f434
parent f7cfc026ec9e3a307d1252c46be9a089d74d3ef3

Rename bccCompileBC as bccPrepareExecutable. Reason: caching case doesn't perform
CompileBC.

Change-Id: I940c7402126d5f7a513f504fb8c92698dc53a9dd

README

diff --git a/README b/README
index bddaf39..838a404 100644
--- a/README
+++ b/README
@@ -30,7 +30,7 @@
 * bccReadExe(): Read cached binary. No need to compiling the bitcode later.
 
 * bccLinkBC(): On-device linking of bitcodes.
-* bccCompileBC(): Compiling bitcode.
+* bccPrepareExecutable(): Either compile bitcode or load from cache (cache-hit)
 
 * bccRegisterSymbolCallback(): Tell libbcc the function address of "dlsym"
 * bccGetError(): Get compilation... error

include/bcc/bcc.h

diff --git a/include/bcc/bcc.h b/include/bcc/bcc.h
index 9c9828b..ff89e12 100644
--- a/include/bcc/bcc.h
+++ b/include/bcc/bcc.h
@@ -88,7 +88,7 @@
                const BCCchar *bitcode,
                BCCint size);
 
-int bccCompileBC(BCCscript *script);
+int bccPrepareExecutable(BCCscript *script);
 
 void bccGetScriptInfoLog(BCCscript *script,
                          BCCsizei maxLength,

lib/bcc/Compiler.cpp

diff --git a/lib/bcc/Compiler.cpp b/lib/bcc/Compiler.cpp
index e72950f..d3f67b6 100644
--- a/lib/bcc/Compiler.cpp
+++ b/lib/bcc/Compiler.cpp
@@ -347,7 +347,7 @@
 }
 
 
-// interace for bccCompileBC()
+// Deprecated: interface for bccCompileBC()
 int Compiler::compile() {
   llvm::TargetData *TD = NULL;
 

lib/bcc/Compiler.h

diff --git a/lib/bcc/Compiler.h b/lib/bcc/Compiler.h
index 1f536b8..ac20a30 100644
--- a/lib/bcc/Compiler.h
+++ b/lib/bcc/Compiler.h
@@ -128,7 +128,7 @@
 
     int linkBC(const char *bitcode, size_t bitcodeSize);
 
-    // interace for bccCompileBC()
+    // Deprecated: interface for bccCompileBC()
     int compile();
 
     // interface for bccGetScriptInfoLog()

lib/bcc/bcc.cpp

diff --git a/lib/bcc/bcc.cpp b/lib/bcc/bcc.cpp
index 04201cd..e5941ad 100644
--- a/lib/bcc/bcc.cpp
+++ b/lib/bcc/bcc.cpp
@@ -101,10 +101,10 @@
   return 1;
 }
 
-extern "C" int bccCompileBC(BCCscript *script) {
+extern "C" int bccPrepareExecutable(BCCscript *script) {
   BCC_FUNC_LOGGER();
 #if defined(__arm__)
-  android::StopWatch compileTimer("RenderScript compile time");
+  android::StopWatch compileTimer("bcc: PrepareExecutable time");
 #endif
 
   int result = script->compile();

tests/main.cpp

diff --git a/tests/main.cpp b/tests/main.cpp
index 6f6350c..c8a56fd 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -206,7 +206,7 @@
 static int compile(BCCscript* script) {
   bccRegisterSymbolCallback(script, symbolLookup, NULL);
 
-  if (bccCompileBC(script) != 0) {
+  if (bccPrepareExecutable(script) != 0) {
     fprintf(stderr, "Something wrong\n");
   }