summaryrefslogtreecommitdiffstats
path: root/vm/compiler/codegen/arm/ArchUtility.c
diff options
context:
space:
mode:
authorBen Cheng <bccheng@android.com>2010-03-31 11:59:18 -0700
committerBen Cheng <bccheng@android.com>2010-03-31 12:17:29 -0700
commita497359afa1abe4c5780c8799c6fe0edab551c2d (patch)
treeec01e200a99247509f298221d03459324710bf0d /vm/compiler/codegen/arm/ArchUtility.c
parentd4b078315ae7335c385f70b32810959bd228d976 (diff)
downloadandroid_dalvik-a497359afa1abe4c5780c8799c6fe0edab551c2d.tar.gz
android_dalvik-a497359afa1abe4c5780c8799c6fe0edab551c2d.tar.bz2
android_dalvik-a497359afa1abe4c5780c8799c6fe0edab551c2d.zip
Fix a race condition in JIT state refresh under debugging / misc code cleanup.
Bug: 2561283 Change-Id: I9fd94928f3e661de97098808340ea92b28cafa07
Diffstat (limited to 'vm/compiler/codegen/arm/ArchUtility.c')
-rw-r--r--vm/compiler/codegen/arm/ArchUtility.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/vm/compiler/codegen/arm/ArchUtility.c b/vm/compiler/codegen/arm/ArchUtility.c
index 20b3f85a7..b0478f49c 100644
--- a/vm/compiler/codegen/arm/ArchUtility.c
+++ b/vm/compiler/codegen/arm/ArchUtility.c
@@ -257,41 +257,41 @@ void dvmDumpLIRInsn(LIR *arg, unsigned char *baseAddr)
break;
case kArmPseudoTargetLabel:
break;
- case ARM_PSEUDO_kChainingCellBackwardBranch:
+ case kArmPseudoChainingCellBackwardBranch:
LOGD("-------- chaining cell (backward branch): 0x%04x\n", dest);
break;
- case ARM_PSEUDO_kChainingCellNormal:
+ case kArmPseudoChainingCellNormal:
LOGD("-------- chaining cell (normal): 0x%04x\n", dest);
break;
- case ARM_PSEUDO_kChainingCellHot:
+ case kArmPseudoChainingCellHot:
LOGD("-------- chaining cell (hot): 0x%04x\n", dest);
break;
- case ARM_PSEUDO_kChainingCellInvokePredicted:
+ case kArmPseudoChainingCellInvokePredicted:
LOGD("-------- chaining cell (predicted)\n");
break;
- case ARM_PSEUDO_kChainingCellInvokeSingleton:
+ case kArmPseudoChainingCellInvokeSingleton:
LOGD("-------- chaining cell (invoke singleton): %s/%p\n",
((Method *)dest)->name,
((Method *)dest)->insns);
break;
- case ARM_PSEUDO_kEntryBlock:
+ case kArmPseudoEntryBlock:
LOGD("-------- entry offset: 0x%04x\n", dest);
break;
- case ARM_PSEUDO_kDalvikByteCode_BOUNDARY:
+ case kArmPseudoDalvikByteCodeBoundary:
LOGD("-------- dalvik offset: 0x%04x @ %s\n", dest,
(char *) lir->operands[1]);
break;
- case ARM_PSEUDO_kExitBlock:
+ case kArmPseudoExitBlock:
LOGD("-------- exit offset: 0x%04x\n", dest);
break;
case kArmPseudoPseudoAlign4:
LOGD("%p (%04x): .align4\n", baseAddr + offset, offset);
break;
- case ARM_PSEUDO_kPCReconstruction_CELL:
+ case kArmPseudoPCReconstructionCell:
LOGD("-------- reconstruct dalvik PC : 0x%04x @ +0x%04x\n", dest,
lir->operands[1]);
break;
- case ARM_PSEUDO_kPCReconstruction_BLOCK_LABEL:
+ case kArmPseudoPCReconstructionBlockLabel:
/* Do nothing */
break;
case kArmPseudoEHBlockLabel: