aboutsummaryrefslogtreecommitdiff
path: root/vm/compiler/codegen/arm/CodegenCommon.c
diff options
context:
space:
mode:
authorBill Buzbee <buzbee@google.com>2010-02-09 11:16:15 -0800
committerBill Buzbee <buzbee@google.com>2010-02-09 12:05:59 -0800
commitc6f1066fd2dd761349128a9f422bc1ce3c3de595 (patch)
tree0ef1dff9ddb25a3b986c2f529b1ee8a88d097e27 /vm/compiler/codegen/arm/CodegenCommon.c
parent96cfe6c39b91dabc78182e2f7676b27b4012886a (diff)
Jit: Phase 1 of register utility cleanup/rewrite - the great renaming
Renaming of all of those register utilities which used to be local because of our include mechanism to the standard dvmCompiler prefix scheme.
Diffstat (limited to 'vm/compiler/codegen/arm/CodegenCommon.c')
-rw-r--r--vm/compiler/codegen/arm/CodegenCommon.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/vm/compiler/codegen/arm/CodegenCommon.c b/vm/compiler/codegen/arm/CodegenCommon.c
index c3fa8c38b..ee4c87784 100644
--- a/vm/compiler/codegen/arm/CodegenCommon.c
+++ b/vm/compiler/codegen/arm/CodegenCommon.c
@@ -250,7 +250,7 @@ static RegLocation inlinedTarget(CompilationUnit *cUnit, MIR *mir,
((mir->next->dalvikInsn.opCode == OP_MOVE_RESULT) ||
(mir->next->dalvikInsn.opCode == OP_MOVE_RESULT_OBJECT))) {
mir->next->dalvikInsn.opCode = OP_NOP;
- return getDestLoc(cUnit, mir->next, 0);
+ return dvmCompilerGetDest(cUnit, mir->next, 0);
} else {
RegLocation res = LOC_DALVIK_RETURN_VAL;
res.fp = fpHint;
@@ -304,7 +304,7 @@ static RegLocation inlinedTargetWide(CompilationUnit *cUnit, MIR *mir,
if (mir->next &&
(mir->next->dalvikInsn.opCode == OP_MOVE_RESULT_WIDE)) {
mir->next->dalvikInsn.opCode = OP_NOP;
- return getDestLocWide(cUnit, mir->next, 0, 1);
+ return dvmCompilerGetDestWide(cUnit, mir->next, 0, 1);
} else {
RegLocation res = LOC_DALVIK_RETURN_VAL_WIDE;
res.fp = fpHint;
@@ -330,7 +330,7 @@ extern ArmLIR *genCheckCommon(CompilationUnit *cUnit, int dOffset,
ArmLIR *pcrLabel)
{
/* Forget all def info (because we might rollback here. Bug #2367397 */
- resetDefTracking(cUnit);
+ dvmCompilerResetDefTracking(cUnit);
/* Set up the place holder to reconstruct this Dalvik PC */
if (pcrLabel == NULL) {