commit e80cd94d5cee0878174ce6ff7d5cb33b3d935ba4
author Ben Cheng <bccheng@android.com> Fri Jul 17 15:54:23 2009 -0700
committer Ben Cheng <bccheng@android.com> Mon Jul 20 09:40:06 2009 -0700
tree 9925c0940dee18ee14ef4e5acc946b2e8d99a448
parent 660972b1f6de45b488c5226dac415b27515aa8e1

Polish JIT trace profiling and fix a unchaining bug when profiling is enabled.

vm/compiler/codegen/armv5te/Assemble.c

diff --git a/vm/compiler/codegen/armv5te/Assemble.c b/vm/compiler/codegen/armv5te/Assemble.c
index 9642c7d..3b3c161 100644
--- a/vm/compiler/codegen/armv5te/Assemble.c
+++ b/vm/compiler/codegen/armv5te/Assemble.c
@@ -292,7 +292,7 @@
 /* Write the numbers in the literal pool to the codegen stream */
 static void installDataContent(CompilationUnit *cUnit)
 {
-    int *dataPtr = (int *) (cUnit->baseAddr + cUnit->dataOffset);
+    int *dataPtr = (int *) ((char *) cUnit->baseAddr + cUnit->dataOffset);
     Armv5teLIR *dataLIR = (Armv5teLIR *) cUnit->wordList;
     while (dataLIR) {
         *dataPtr++ = dataLIR->operands[0];
@@ -479,8 +479,14 @@
     assert(chainCellOffsetLIR->opCode == ARMV5TE_16BIT_DATA &&
            chainCellOffsetLIR->operands[0] == CHAIN_CELL_OFFSET_TAG);
 
-    /* Replace the CHAIN_CELL_OFFSET_TAG with the real value */
-    chainCellOffsetLIR->operands[0] = chainCellOffset;
+    /*
+     * Replace the CHAIN_CELL_OFFSET_TAG with the real value. If trace
+     * profiling is enabled, subtract 4 (occupied by the counter word) from
+     * the absolute offset as the value stored in chainCellOffsetLIR is the
+     * delta from &chainCellOffsetLIR to &ChainCellCounts.
+     */
+    chainCellOffsetLIR->operands[0] =
+        gDvmJit.profile ? (chainCellOffset - 4) : chainCellOffset;
 
     offset += sizeof(chainCellCounts) + descSize;
 
@@ -546,7 +552,7 @@
 
     /* Flush dcache and invalidate the icache to maintain coherence */
     cacheflush((long)cUnit->baseAddr,
-               (long)(cUnit->baseAddr + offset), 0);
+               (long)((char *) cUnit->baseAddr + offset), 0);
 }
 
 static u4 assembleBXPair(int branchOffset)
@@ -689,7 +695,7 @@
     u2* pChainCellOffset = (u2*)((char*)codeAddr - 3);
     u2 chainCellOffset = *pChainCellOffset;
     ChainCellCounts *pChainCellCounts =
-          (ChainCellCounts*)((char*)codeAddr + chainCellOffset -3);
+          (ChainCellCounts*)((char*)codeAddr + chainCellOffset - 3);
     int cellSize;
     u4* pChainCells;
     u4* pStart;