diff options
| author | Elliott Hughes <enh@google.com> | 2011-06-07 10:07:11 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2011-06-07 10:35:59 -0700 |
| commit | 0fbb7030fff58e25718291811394487d95d95a3e (patch) | |
| tree | 650e3392586af843c61e6a04d5b38303ae3ed1f8 /vm/compiler/codegen | |
| parent | 0bb39c2258a1e45bb1142ec89b8ca5d2eaaa6f02 (diff) | |
| download | android_dalvik-0fbb7030fff58e25718291811394487d95d95a3e.tar.gz android_dalvik-0fbb7030fff58e25718291811394487d95d95a3e.tar.bz2 android_dalvik-0fbb7030fff58e25718291811394487d95d95a3e.zip | |
Use std::string rather than malloc/free for saneDirName.
Also use std::vector instead of the cutils/array cruft.
Change-Id: I273147335cafbac5d336955f53b0b29d015f0589
Diffstat (limited to 'vm/compiler/codegen')
| -rw-r--r-- | vm/compiler/codegen/arm/CodegenDriver.cpp | 2 | ||||
| -rw-r--r-- | vm/compiler/codegen/arm/FP/Thumb2VFP.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vm/compiler/codegen/arm/CodegenDriver.cpp b/vm/compiler/codegen/arm/CodegenDriver.cpp index 53dd8feff..75b86a456 100644 --- a/vm/compiler/codegen/arm/CodegenDriver.cpp +++ b/vm/compiler/codegen/arm/CodegenDriver.cpp @@ -150,7 +150,7 @@ static bool genArithOpDoublePortable(CompilationUnit *cUnit, MIR *mir, break; case OP_REM_DOUBLE_2ADDR: case OP_REM_DOUBLE: - funct = (void*) fmod; + funct = (void*) (double (*)(double, double)) fmod; break; case OP_NEG_DOUBLE: { genNegDouble(cUnit, rlDest, rlSrc1); diff --git a/vm/compiler/codegen/arm/FP/Thumb2VFP.cpp b/vm/compiler/codegen/arm/FP/Thumb2VFP.cpp index aed4950a1..abbf2c9b4 100644 --- a/vm/compiler/codegen/arm/FP/Thumb2VFP.cpp +++ b/vm/compiler/codegen/arm/FP/Thumb2VFP.cpp @@ -196,7 +196,7 @@ static bool genInlineSqrt(CompilationUnit *cUnit, MIR *mir) newLIR0(cUnit, kThumb2Fmstat); branch = newLIR2(cUnit, kThumbBCond, 0, kArmCondEq); dvmCompilerClobberCallRegs(cUnit); - LOAD_FUNC_ADDR(cUnit, r2, (int)sqrt); + LOAD_FUNC_ADDR(cUnit, r2, (int) (double (*)(double)) sqrt); newLIR3(cUnit, kThumb2Fmrrd, r0, r1, S2D(rlSrc.lowReg, rlSrc.highReg)); newLIR1(cUnit, kThumbBlxR, r2); newLIR3(cUnit, kThumb2Fmdrr, S2D(rlResult.lowReg, rlResult.highReg), |