commit 716f120d7f33ca18a5dcbef811399df0cbefe5d0
author Bill Buzbee <buzbee@google.com> Thu Jul 23 13:22:09 2009 -0700
committer Bill Buzbee <buzbee@google.com> Mon Jul 27 16:02:08 2009 -0700
tree a52972ebbedf379c144531655a7edc8c3cc0527d
parent 7605a84a9a0a1764c1fb290d9c93e8114eaf620a

First phase of restructuring to support THUMB2 & ARM traces
Store some useful info about traces in JitTable entry; some general cleanup

vm/compiler/Compiler.c

diff --git a/vm/compiler/Compiler.c b/vm/compiler/Compiler.c
index f70b978..203a080 100644
--- a/vm/compiler/Compiler.c
+++ b/vm/compiler/Compiler.c
@@ -118,7 +118,6 @@
             continue;
         } else {
             do {
-                void *compiledCodePtr;
                 CompilerWorkOrder work = workDequeue();
                 dvmUnlockMutex(&gDvmJit.compilerLock);
                 /* Check whether there is a suspend request on me */
@@ -131,10 +130,10 @@
                 if (gDvmJit.haltCompilerThread) {
                     LOGD("Compiler shutdown in progress - discarding request");
                 } else {
-                    compiledCodePtr = dvmCompilerDoWork(&work);
                     /* Compilation is successful */
-                    if (compiledCodePtr) {
-                        dvmJitSetCodeAddr(work.pc, compiledCodePtr);
+                    if (dvmCompilerDoWork(&work)) {
+                        dvmJitSetCodeAddr(work.pc, work.result.codeAddress,
+                                          work.result.instructionSet);
                     }
                 }
                 free(work.info);