commit 2717622484eb0f7ad537275f7260b2f93324eda2
author Bill Buzbee <buzbee@google.com> Tue Jun 09 09:20:16 2009 -0700
committer Bill Buzbee <buzbee@google.com> Tue Jun 09 12:09:37 2009 -0700
tree 13f0be3672f4193d3fd1db74cc6046cc7641e178
parent 0d0a787fa928bcd8e6f057d92d6e867bc5af1b5c

Makes the primary Jit table growable.  Also includes a change suggested earlier by Dan to use a pre-defined mask in the hash function.  Reduce the default JitTable size from 2048 entries to 512 entries.
Update per Ben's comments.

vm/compiler/Compiler.c

diff --git a/vm/compiler/Compiler.c b/vm/compiler/Compiler.c
index 98a4e1d..0b5c211 100644
--- a/vm/compiler/Compiler.c
+++ b/vm/compiler/Compiler.c
@@ -123,6 +123,11 @@
                 dvmUnlockMutex(&gDvmJit.compilerLock);
                 /* Check whether there is a suspend request on me */
                 dvmCheckSuspendPending(NULL);
+                /* Is JitTable filling up? */
+                if (gDvmJit.jitTableEntriesUsed >
+                    (gDvmJit.jitTableSize - gDvmJit.jitTableSize/4)) {
+                    dvmJitResizeJitTable(gDvmJit.jitTableSize * 2);
+                }
                 if (gDvmJit.haltCompilerThread) {
                     LOGD("Compiler shutdown in progress - discarding request");
                 } else {

vm/compiler/codegen/armv5te/Assemble.c

diff --git a/vm/compiler/codegen/armv5te/Assemble.c b/vm/compiler/codegen/armv5te/Assemble.c
index 12cb158..f874f48 100644
--- a/vm/compiler/codegen/armv5te/Assemble.c
+++ b/vm/compiler/codegen/armv5te/Assemble.c
@@ -583,7 +583,7 @@
     if (gDvmJit.pJitEntryTable != NULL) {
         COMPILER_TRACE_CHAINING(LOGD("Jit Runtime: unchaining all"));
         dvmLockMutex(&gDvmJit.tableLock);
-        for (i = 0; i < gDvmJit.maxTableEntries; i++) {
+        for (i = 0; i < gDvmJit.jitTableSize; i++) {
             if (gDvmJit.pJitEntryTable[i].dPC &&
                    gDvmJit.pJitEntryTable[i].codeAddress) {
                 u4* lastAddress;