Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3ba2bf42: Merge "1. LOG 4 fatal error paths (TODO: These 4 places should signal Java exceptions.) 2. Prepare on-device linking. 3. Clean up code." into honeycomb

Browse Source 
* commit '3ba2bf42c50dfa05bf672124eb3d2ef8c02f183e':
  1. LOG 4 fatal error paths (TODO: These 4 places should signal Java exceptions.) 2. Prepare on-device linking. 3. Clean up code.
This commit is contained in:
Shih-wei Liao
2011-01-08 04:40:36 -08:00
committed by Android Git Automerger
parent 37c45fa415 3ba2bf42c5
commit a0c0ca981d
2 changed files with 27 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
libs/rs/rsScriptC.cpp
View File

@@ -410,40 +410,38 @@ extern unsigned rs_runtime_lib_bc_size;
void ScriptCState::runCompiler(Context *rsc,
ScriptC *s,
long modWhen,
long crc32,
const char *resName,
const char *cacheDir) {
{
s->mBccScript = bccCreateScript();
s->mEnviroment.mIsThreadable = true;
bccRegisterSymbolCallback(s->mBccScript, symbolLookup, s);
// bccReadBC() reads in the BitCode, if no cache file corresponding to
// the resName is found. Otherwise, bccReadBC() returns a negative value
// and the "else" branch will be taken.
if (bccReadBC(s->mBccScript,
s->mEnviroment.mScriptText,
s->mEnviroment.mScriptTextLength,
modWhen,
crc32,
resName,
cacheDir) >= 0) {
//bccLinkBC(s->mBccScript, rs_runtime_lib_bc, rs_runtime_lib_bc_size);
bccCompileBC(s->mBccScript);
} else {
// bccReadBC returns a neagative value: Didn't read any script,
// So, use cached binary instead
if (bccLoadBinary(s->mBccScript)) { // LoadBinary fails ==> Recompile
bccReadBC(s->mBccScript,
s->mEnviroment.mScriptText,
s->mEnviroment.mScriptTextLength,
modWhen,
crc32,
resName,
cacheDir);
bccCompileBC(s->mBccScript);
}
/*deprecated*/ 0, /*deprecated*/ 0,
resName, cacheDir) != 0) {
LOGE("bcc: FAILS to read bitcode");
// Handle Fatal Error
}
#if 0
if (bccLinkBC(s->mBccScript,
rs_runtime_lib_bc,
rs_runtime_lib_bc_size) != 0) {
LOGE("bcc: FAILS to link bitcode");
// Handle Fatal Error
}
#endif
if (bccCompileBC(s->mBccScript) != 0) {
LOGE("bcc: FAILS to prepare executable");
// Handle Fatal Error
}
bccGetScriptLabel(s->mBccScript, "root", (BCCvoid**) &s->mProgram.mRoot);
bccGetScriptLabel(s->mBccScript, "init", (BCCvoid**) &s->mProgram.mInit);
}
@@ -535,7 +533,8 @@ void ScriptCState::runCompiler(Context *rsc,
} else {
// Deal with an error.
LOGE("bcc: FAILS to prepare executable");
// Handle Fatal Error
}
}
@@ -559,7 +558,7 @@ void rsi_ScriptCSetText(Context *rsc, const char *text, uint32_t len) {
RsScript rsi_ScriptCCreate(Context *rsc,
const char *packageName,
const char *packageName /* deprecated */,
const char *resName,
const char *cacheDir)
{
@@ -569,34 +568,7 @@ RsScript rsi_ScriptCCreate(Context *rsc,
ss->mScript.clear();
s->incUserRef();
// Open the apk and return the ZipArchive:
// int dexZipOpenArchive(const char* fileName, ZipArchive* pArchive)
ZipArchive archive;
long modWhen;
long crc32;
if (!dexZipOpenArchive(packageName, &archive)) { // Success
ZipEntry entry = dexZipFindEntry(&archive, resName);
int method;
size_t uncompLen;
size_t compLen;
off_t offset;
if (!dexZipGetEntryInfo(&archive,
entry,
&method,
&uncompLen,
&compLen,
&offset,
&modWhen,
&crc32)) {
} else {
LOGI("Coudn't get entry info for the bitcode in an apk");
}
} else {
LOGI("Couldn't open the archive and read the bitcode");
}
ss->runCompiler(rsc, s.get(), modWhen, crc32, resName, cacheDir);
ss->runCompiler(rsc, s.get(), resName, cacheDir);
ss->clear(rsc);
return s.get();
}

2
libs/rs/rsScriptC.h
View File

@@ -83,7 +83,7 @@ public:
void init(Context *rsc);
void clear(Context *rsc);
void runCompiler(Context *rsc, ScriptC *s, long modWhen, long crc32, const char *resName, const char *cacheDir);
void runCompiler(Context *rsc, ScriptC *s, const char *resName, const char *cacheDir);
struct SymbolTable_t {
const char * mName;