am c85663a4: Merge "Fix a couple of typos in JIT function names."

Merge commit 'c85663a4856c476c4ead93bdf19e8a91b2d15e22' into dalvik-dev

* commit 'c85663a4856c476c4ead93bdf19e8a91b2d15e22':
  Fix a couple of typos in JIT function names.

8 files changed, 33 insertions, 33 deletions

diff --git a/vm/compiler/codegen/arm/CodegenDriver.c b/vm/compiler/codegen/arm/CodegenDriver.c
index f117de8f1..d3b10a45e 100644
--- a/vm/compiler/codegen/arm/CodegenDriver.c
+++ b/vm/compiler/codegen/arm/CodegenDriver.c
@@ -43,7 +43,7 @@ static bool genConversionCall(CompilationUnit *cUnit, MIR *mir, void *funct,
     }
     loadConstant(cUnit, r2, (int)funct);
     opReg(cUnit, kOpBlx, r2);
-    dvmCompilerColbberCallRegs(cUnit);
+    dvmCompilerClobberCallRegs(cUnit);
     if (tgtSize == 1) {
         RegLocation rlResult;
         rlDest = dvmCompilerGetDest(cUnit, mir, 0);
@@ -106,7 +106,7 @@ static bool genArithOpFloatPortable(CompilationUnit *cUnit, MIR *mir,
     loadValueDirectFixed(cUnit, rlSrc2, r1);
     loadConstant(cUnit, r2, (int)funct);
     opReg(cUnit, kOpBlx, r2);
-    dvmCompilerColbberCallRegs(cUnit);
+    dvmCompilerClobberCallRegs(cUnit);
     rlResult = dvmCompilerGetReturn(cUnit);
     storeValue(cUnit, rlDest, rlResult);
     return false;
@@ -159,7 +159,7 @@ static bool genArithOpDoublePortable(CompilationUnit *cUnit, MIR *mir,
     loadValueDirectWideFixed(cUnit, rlSrc1, r0, r1);
     loadValueDirectWideFixed(cUnit, rlSrc2, r2, r3);
     opReg(cUnit, kOpBlx, rlr);
-    dvmCompilerColbberCallRegs(cUnit);
+    dvmCompilerClobberCallRegs(cUnit);
     rlResult = dvmCompilerGetReturnWide(cUnit);
     storeValueWide(cUnit, rlDest, rlResult);
     return false;
@@ -623,7 +623,7 @@ static bool genArithOpLong(CompilationUnit *cUnit, MIR *mir,
         loadConstant(cUnit, rlr, (int) callTgt);
         loadValueDirectWideFixed(cUnit, rlSrc2, r2, r3);
         opReg(cUnit, kOpBlx, rlr);
-        dvmCompilerColbberCallRegs(cUnit);
+        dvmCompilerClobberCallRegs(cUnit);
         if (retReg == r0)
             rlResult = dvmCompilerGetReturnWide(cUnit);
         else
@@ -750,7 +750,7 @@ static bool genArithOpInt(CompilationUnit *cUnit, MIR *mir,
             genNullCheck(cUnit, rlSrc2.sRegLow, r1, mir->offset, NULL);
         }
         opReg(cUnit, kOpBlx, r2);
-        dvmCompilerColbberCallRegs(cUnit);
+        dvmCompilerClobberCallRegs(cUnit);
         if (retReg == r0)
             rlResult = dvmCompilerGetReturn(cUnit);
         else
@@ -1285,7 +1285,7 @@ static void genMonitorPortable(CompilationUnit *cUnit, MIR *mir)
         ArmLIR *target = newLIR0(cUnit, kArmPseudoTargetLabel);
         target->defMask = ENCODE_ALL;
         branchOver->generic.target = (LIR *) target;
-        dvmCompilerColbberCallRegs(cUnit);
+        dvmCompilerClobberCallRegs(cUnit);
     }
 }
 
@@ -1532,7 +1532,7 @@ static bool handleFmt21c_Fmt31c(CompilationUnit *cUnit, MIR *mir)
             loadConstant(cUnit, r0, (int) classPtr);
             loadConstant(cUnit, r1, ALLOC_DONT_TRACK);
             opReg(cUnit, kOpBlx, r2);
-            dvmCompilerColbberCallRegs(cUnit);
+            dvmCompilerClobberCallRegs(cUnit);
             /* generate a branch over if allocation is successful */
             opRegImm(cUnit, kOpCmp, r0, 0); /* NULL? */
             ArmLIR *branchOver = opCondBranch(cUnit, kArmCondNe);
@@ -1590,7 +1590,7 @@ static bool handleFmt21c_Fmt31c(CompilationUnit *cUnit, MIR *mir)
             opRegReg(cUnit, kOpCmp, r0, r1);
             ArmLIR *branch2 = opCondBranch(cUnit, kArmCondEq);
             opReg(cUnit, kOpBlx, r2);
-            dvmCompilerColbberCallRegs(cUnit);
+            dvmCompilerClobberCallRegs(cUnit);
             /*
              * If null, check cast failed - punt to the interpreter.  Because
              * interpreter will be the one throwing, we don't need to
@@ -2007,7 +2007,7 @@ static bool handleFmt22b_Fmt22s(CompilationUnit *cUnit, MIR *mir)
             }
             loadConstant(cUnit, r1, lit);
             opReg(cUnit, kOpBlx, r2);
-            dvmCompilerColbberCallRegs(cUnit);
+            dvmCompilerClobberCallRegs(cUnit);
             if (isDiv)
                 rlResult = dvmCompilerGetReturn(cUnit);
             else
@@ -2067,7 +2067,7 @@ static bool handleFmt22c(CompilationUnit *cUnit, MIR *mir)
                 genRegImmCheck(cUnit, kArmCondMi, r1, 0, mir->offset, NULL);
             loadConstant(cUnit, r2, ALLOC_DONT_TRACK);
             opReg(cUnit, kOpBlx, r3);
-            dvmCompilerColbberCallRegs(cUnit);
+            dvmCompilerClobberCallRegs(cUnit);
             /* generate a branch over if allocation is successful */
             opRegImm(cUnit, kOpCmp, r0, 0); /* NULL? */
             ArmLIR *branchOver = opCondBranch(cUnit, kArmCondNe);
@@ -2123,7 +2123,7 @@ static bool handleFmt22c(CompilationUnit *cUnit, MIR *mir)
             genRegCopy(cUnit, r0, r1);
             genRegCopy(cUnit, r1, r2);
             opReg(cUnit, kOpBlx, r3);
-            dvmCompilerColbberCallRegs(cUnit);
+            dvmCompilerClobberCallRegs(cUnit);
             /* branch target here */
             ArmLIR *target = newLIR0(cUnit, kArmPseudoTargetLabel);
             target->defMask = ENCODE_ALL;
@@ -2501,7 +2501,7 @@ static bool handleFmt31t(CompilationUnit *cUnit, MIR *mir)
             loadConstant(cUnit, r1,
                (int) (cUnit->method->insns + mir->offset + mir->dalvikInsn.vB));
             opReg(cUnit, kOpBlx, r2);
-            dvmCompilerColbberCallRegs(cUnit);
+            dvmCompilerClobberCallRegs(cUnit);
             /* generate a branch over if successful */
             opRegImm(cUnit, kOpCmp, r0, 0); /* NULL? */
             ArmLIR *branchOver = opCondBranch(cUnit, kArmCondNe);
@@ -2539,7 +2539,7 @@ static bool handleFmt31t(CompilationUnit *cUnit, MIR *mir)
             /* r2 <- pc of the instruction following the blx */
             opRegReg(cUnit, kOpMov, r2, rpc);
             opReg(cUnit, kOpBlx, r4PC);
-            dvmCompilerColbberCallRegs(cUnit);
+            dvmCompilerClobberCallRegs(cUnit);
             /* pc <- computed goto target */
             opRegReg(cUnit, kOpMov, rpc, r0);
             break;
@@ -3029,7 +3029,7 @@ static bool handleExecuteInline(CompilationUnit *cUnit, MIR *mir)
                     dvmAbort();
             }
             dvmCompilerFlushAllRegs(cUnit);   /* Everything to home location */
-            dvmCompilerColbberCallRegs(cUnit);
+            dvmCompilerClobberCallRegs(cUnit);
             dvmCompilerClobber(cUnit, r4PC);
             dvmCompilerClobber(cUnit, r7);
             opRegRegImm(cUnit, kOpAdd, r4PC, rGLUE, offset);
diff --git a/vm/compiler/codegen/arm/CodegenFactory.c b/vm/compiler/codegen/arm/CodegenFactory.c
index 594cfd559..824e1a05d 100644
--- a/vm/compiler/codegen/arm/CodegenFactory.c
+++ b/vm/compiler/codegen/arm/CodegenFactory.c
@@ -68,7 +68,7 @@ static void loadValueDirectFixed(CompilationUnit *cUnit, RegLocation rlSrc,
                                  int reg1)
 {
     dvmCompilerClobber(cUnit, reg1);
-    dvmcompilerMarkInUse(cUnit, reg1);
+    dvmCompilerMarkInUse(cUnit, reg1);
     loadValueDirect(cUnit, rlSrc, reg1);
 }
 
@@ -104,8 +104,8 @@ static void loadValueDirectWideFixed(CompilationUnit *cUnit, RegLocation rlSrc,
 {
     dvmCompilerClobber(cUnit, regLo);
     dvmCompilerClobber(cUnit, regHi);
-    dvmcompilerMarkInUse(cUnit, regLo);
-    dvmcompilerMarkInUse(cUnit, regHi);
+    dvmCompilerMarkInUse(cUnit, regLo);
+    dvmCompilerMarkInUse(cUnit, regHi);
     loadValueDirectWide(cUnit, rlSrc, regLo, regHi);
 }
 
diff --git a/vm/compiler/codegen/arm/FP/Thumb2VFP.c b/vm/compiler/codegen/arm/FP/Thumb2VFP.c
index 6c70862a2..42d0657f0 100644
--- a/vm/compiler/codegen/arm/FP/Thumb2VFP.c
+++ b/vm/compiler/codegen/arm/FP/Thumb2VFP.c
@@ -196,7 +196,7 @@ static bool genInlineSqrt(CompilationUnit *cUnit, MIR *mir)
             S2D(rlResult.lowReg, rlResult.highReg));
     newLIR0(cUnit, kThumb2Fmstat);
     branch = newLIR2(cUnit, kThumbBCond, 0, kArmCondEq);
-    dvmCompilerColbberCallRegs(cUnit);
+    dvmCompilerClobberCallRegs(cUnit);
     loadConstant(cUnit, r2, (int)sqrt);
     newLIR3(cUnit, kThumb2Fmrrd, r0, r1, S2D(rlSrc.lowReg, rlSrc.highReg));
     newLIR1(cUnit, kThumbBlxR, r2);
diff --git a/vm/compiler/codegen/arm/Ralloc.h b/vm/compiler/codegen/arm/Ralloc.h
index 987638abf..6c7dfaaae 100644
--- a/vm/compiler/codegen/arm/Ralloc.h
+++ b/vm/compiler/codegen/arm/Ralloc.h
@@ -127,11 +127,11 @@ extern RegLocation dvmCompilerGetDest(CompilationUnit *cUnit, MIR *mir,
 extern RegLocation dvmCompilerGetReturnWide(CompilationUnit *cUnit);
 
 /* Clobber all regs that might be used by an external C call */
-extern void dvmCompilerColbberCallRegs(CompilationUnit *cUnit);
+extern void dvmCompilerClobberCallRegs(CompilationUnit *cUnit);
 
 extern RegisterInfo *dvmCompilerIsTemp(CompilationUnit *cUnit, int reg);
 
-extern void dvmcompilerMarkInUse(CompilationUnit *cUnit, int reg);
+extern void dvmCompilerMarkInUse(CompilationUnit *cUnit, int reg);
 
 extern int dvmCompilerAllocTemp(CompilationUnit *cUnit);
 
diff --git a/vm/compiler/codegen/arm/RallocUtil.c b/vm/compiler/codegen/arm/RallocUtil.c
index 6c2fef172..9035f93c7 100644
--- a/vm/compiler/codegen/arm/RallocUtil.c
+++ b/vm/compiler/codegen/arm/RallocUtil.c
@@ -446,13 +446,13 @@ static void lockArgRegs(CompilationUnit *cUnit)
 }
 
 /* Clobber all regs that might be used by an external C call */
-extern void dvmCompilerColbberCallRegs(CompilationUnit *cUnit)
+extern void dvmCompilerClobberCallRegs(CompilationUnit *cUnit)
 {
     dvmCompilerClobber(cUnit, r0);
     dvmCompilerClobber(cUnit, r1);
     dvmCompilerClobber(cUnit, r2);
     dvmCompilerClobber(cUnit, r3);
-    dvmCompilerClobber(cUnit, r9); // Need to do this?, be convervative
+    dvmCompilerClobber(cUnit, r9); // Need to do this?, be conservative
     dvmCompilerClobber(cUnit, r11);
     dvmCompilerClobber(cUnit, r12);
     dvmCompilerClobber(cUnit, rlr);
@@ -462,7 +462,7 @@ extern void dvmCompilerColbberCallRegs(CompilationUnit *cUnit)
 extern void dvmCompilerClobberHandlerRegs(CompilationUnit *cUnit)
 {
     //TUNING: reduce the set of regs used by handlers.  Only a few need lots.
-    dvmCompilerColbberCallRegs(cUnit);
+    dvmCompilerClobberCallRegs(cUnit);
     dvmCompilerClobber(cUnit, r4PC);
     dvmCompilerClobber(cUnit, r9);
     dvmCompilerClobber(cUnit, r10);
@@ -690,7 +690,7 @@ extern void dvmCompilerMarkDirty(CompilationUnit *cUnit, int reg)
     info->dirty = true;
 }
 
-extern void dvmcompilerMarkInUse(CompilationUnit *cUnit, int reg)
+extern void dvmCompilerMarkInUse(CompilationUnit *cUnit, int reg)
 {
       RegisterInfo *info = getRegInfo(cUnit, reg);
           info->inUse = true;
@@ -931,8 +931,8 @@ extern RegLocation dvmCompilerGetReturnWide(CompilationUnit *cUnit)
     RegLocation res = LOC_C_RETURN_WIDE;
     dvmCompilerClobber(cUnit, r0);
     dvmCompilerClobber(cUnit, r1);
-    dvmcompilerMarkInUse(cUnit, r0);
-    dvmcompilerMarkInUse(cUnit, r1);
+    dvmCompilerMarkInUse(cUnit, r0);
+    dvmCompilerMarkInUse(cUnit, r1);
     dvmCompilerMarkPair(cUnit, res.lowReg, res.highReg);
     return res;
 }
@@ -944,8 +944,8 @@ extern RegLocation dvmCompilerGetReturnWideAlt(CompilationUnit *cUnit)
     res.highReg = r3;
     dvmCompilerClobber(cUnit, r2);
     dvmCompilerClobber(cUnit, r3);
-    dvmcompilerMarkInUse(cUnit, r2);
-    dvmcompilerMarkInUse(cUnit, r3);
+    dvmCompilerMarkInUse(cUnit, r2);
+    dvmCompilerMarkInUse(cUnit, r3);
     dvmCompilerMarkPair(cUnit, res.lowReg, res.highReg);
     return res;
 }
@@ -954,7 +954,7 @@ extern RegLocation dvmCompilerGetReturn(CompilationUnit *cUnit)
 {
     RegLocation res = LOC_C_RETURN;
     dvmCompilerClobber(cUnit, r0);
-    dvmcompilerMarkInUse(cUnit, r0);
+    dvmCompilerMarkInUse(cUnit, r0);
     return res;
 }
 
@@ -963,7 +963,7 @@ extern RegLocation dvmCompilerGetReturnAlt(CompilationUnit *cUnit)
     RegLocation res = LOC_C_RETURN;
     res.lowReg = r1;
     dvmCompilerClobber(cUnit, r1);
-    dvmcompilerMarkInUse(cUnit, r1);
+    dvmCompilerMarkInUse(cUnit, r1);
     return res;
 }
 
diff --git a/vm/compiler/codegen/arm/Thumb/Factory.c b/vm/compiler/codegen/arm/Thumb/Factory.c
index 5bf4048ff..59818a295 100644
--- a/vm/compiler/codegen/arm/Thumb/Factory.c
+++ b/vm/compiler/codegen/arm/Thumb/Factory.c
@@ -100,7 +100,7 @@ static ArmLIR *loadConstant(CompilationUnit *cUnit, int rDest, int value)
 {
     if (dvmCompilerIsTemp(cUnit, rDest)) {
         dvmCompilerClobber(cUnit, rDest);
-        dvmcompilerMarkInUse(cUnit, rDest);
+        dvmCompilerMarkInUse(cUnit, rDest);
     }
     return loadConstantValue(cUnit, rDest, value);
 }
diff --git a/vm/compiler/codegen/arm/Thumb2/Factory.c b/vm/compiler/codegen/arm/Thumb2/Factory.c
index 0db2045d4..242e665ab 100644
--- a/vm/compiler/codegen/arm/Thumb2/Factory.c
+++ b/vm/compiler/codegen/arm/Thumb2/Factory.c
@@ -189,7 +189,7 @@ static ArmLIR *loadConstant(CompilationUnit *cUnit, int rDest, int value)
 {
     if (dvmCompilerIsTemp(cUnit, rDest)) {
         dvmCompilerClobber(cUnit, rDest);
-        dvmcompilerMarkInUse(cUnit, rDest);
+        dvmCompilerMarkInUse(cUnit, rDest);
     }
     return loadConstantValue(cUnit, rDest, value);
 }
diff --git a/vm/compiler/codegen/arm/Thumb2/Gen.c b/vm/compiler/codegen/arm/Thumb2/Gen.c
index dbce45284..8b2b69653 100644
--- a/vm/compiler/codegen/arm/Thumb2/Gen.c
+++ b/vm/compiler/codegen/arm/Thumb2/Gen.c
@@ -262,7 +262,7 @@ static void genMonitor(CompilationUnit *cUnit, MIR *mir)
         ArmLIR *target = newLIR0(cUnit, kArmPseudoTargetLabel);
         target->defMask = ENCODE_ALL;
         branchOver->generic.target = (LIR *) target;
-        dvmCompilerColbberCallRegs(cUnit);
+        dvmCompilerClobberCallRegs(cUnit);
     }
 
     // Resume here