summaryrefslogtreecommitdiffstats
path: root/vm/compiler/codegen
diff options
context:
space:
mode:
Diffstat (limited to 'vm/compiler/codegen')
-rw-r--r--vm/compiler/codegen/arm/ArchUtility.cpp6
-rw-r--r--vm/compiler/codegen/arm/Assemble.cpp16
-rw-r--r--vm/compiler/codegen/arm/CodegenDriver.cpp8
-rw-r--r--vm/compiler/codegen/arm/armv7-a-neon/MethodCodegenDriver.cpp2
4 files changed, 16 insertions, 16 deletions
diff --git a/vm/compiler/codegen/arm/ArchUtility.cpp b/vm/compiler/codegen/arm/ArchUtility.cpp
index ecc67db08..0bbb87588 100644
--- a/vm/compiler/codegen/arm/ArchUtility.cpp
+++ b/vm/compiler/codegen/arm/ArchUtility.cpp
@@ -138,11 +138,11 @@ static void buildInsnString(const char *fmt, ArmLIR *lir, char* buf,
break;
case 'n':
operand = ~expandImmediate(operand);
- sprintf(tbuf,"%d [0x%x]", operand, operand);
+ sprintf(tbuf,"%d [%#x]", operand, operand);
break;
case 'm':
operand = expandImmediate(operand);
- sprintf(tbuf,"%d [0x%x]", operand, operand);
+ sprintf(tbuf,"%d [%#x]", operand, operand);
break;
case 's':
sprintf(tbuf,"s%d",operand & FP_REG_MASK);
@@ -413,7 +413,7 @@ void dvmCompilerCodegenDump(CompilationUnit *cUnit)
}
for (lirInsn = cUnit->literalList; lirInsn; lirInsn = lirInsn->next) {
armLIR = (ArmLIR *) lirInsn;
- LOGD("%p (%04x): .word (0x%x)",
+ LOGD("%p (%04x): .word (%#x)",
(char*)cUnit->baseAddr + armLIR->generic.offset,
armLIR->generic.offset,
armLIR->operands[0]);
diff --git a/vm/compiler/codegen/arm/Assemble.cpp b/vm/compiler/codegen/arm/Assemble.cpp
index 47d2a0828..312e7c1c0 100644
--- a/vm/compiler/codegen/arm/Assemble.cpp
+++ b/vm/compiler/codegen/arm/Assemble.cpp
@@ -1604,7 +1604,7 @@ void* dvmJitChain(void* tgtAddr, u4* branchAddr)
gDvmJit.translationChains++;
COMPILER_TRACE_CHAINING(
- LOGD("Jit Runtime: chaining 0x%x to 0x%x",
+ LOGD("Jit Runtime: chaining %#x to %#x",
(int) branchAddr, (int) tgtAddr & -2));
/*
@@ -1943,7 +1943,7 @@ static u4* unchainSingle(JitEntry *trace)
dvmAbort(); // dvmAbort OK here - can't safely recover
}
COMPILER_TRACE_CHAINING(
- LOGD("Jit Runtime: unchaining 0x%x", (int)pChainCells));
+ LOGD("Jit Runtime: unchaining %#x", (int)pChainCells));
pChainCells += elemSize; /* Advance by a fixed number of words */
}
}
@@ -2423,7 +2423,7 @@ static int selfVerificationLoad(int addr, int size)
dvmAbort();
}
- //LOGD("*** HEAP LOAD: Addr: 0x%x Data: 0x%x Size: %d", addr, data, size);
+ //LOGD("*** HEAP LOAD: Addr: %#x Data: %#x Size: %d", addr, data, size);
return data;
}
@@ -2447,7 +2447,7 @@ static s8 selfVerificationLoadDoubleword(int addr)
}
}
- //LOGD("*** HEAP LOAD DOUBLEWORD: Addr: 0x%x Data: 0x%x Data2: 0x%x",
+ //LOGD("*** HEAP LOAD DOUBLEWORD: Addr: %#x Data: %#x Data2: %#x",
// addr, data, data2);
return (((s8) data2) << 32) | data;
}
@@ -2467,7 +2467,7 @@ static void selfVerificationStore(int addr, int data, int size)
int maskedAddr = addr & 0xFFFFFFFC;
int alignment = addr & 0x3;
- //LOGD("*** HEAP STORE: Addr: 0x%x Data: 0x%x Size: %d", addr, data, size);
+ //LOGD("*** HEAP STORE: Addr: %#x Data: %#x Size: %d", addr, data, size);
for (heapSpacePtr = shadowSpace->heapSpace;
heapSpacePtr != shadowSpace->heapSpaceTail; heapSpacePtr++) {
@@ -2515,7 +2515,7 @@ static void selfVerificationStoreDoubleword(int addr, s8 double_data)
int data2 = double_data >> 32;
bool store1 = false, store2 = false;
- //LOGD("*** HEAP STORE DOUBLEWORD: Addr: 0x%x Data: 0x%x, Data2: 0x%x",
+ //LOGD("*** HEAP STORE DOUBLEWORD: Addr: %#x Data: %#x, Data2: %#x",
// addr, data, data2);
for (heapSpacePtr = shadowSpace->heapSpace;
@@ -2628,7 +2628,7 @@ void dvmSelfVerificationMemOpDecode(int lr, int* sp)
if ((insn & kMemOp2) == kMemOp2) {
insn = (insn << 16) | (insn >> 16);
- //LOGD("*** THUMB2 - Addr: 0x%x Insn: 0x%x", lr, insn);
+ //LOGD("*** THUMB2 - Addr: %#x Insn: %#x", lr, insn);
int opcode12 = (insn >> 20) & 0xFFF;
int opcode4 = (insn >> 8) & 0xF;
@@ -2795,7 +2795,7 @@ void dvmSelfVerificationMemOpDecode(int lr, int* sp)
}
}
} else {
- //LOGD("*** THUMB - Addr: 0x%x Insn: 0x%x", lr, insn);
+ //LOGD("*** THUMB - Addr: %#x Insn: %#x", lr, insn);
// Update the link register
selfVerificationMemRegStore(sp, old_lr+2, 13);
diff --git a/vm/compiler/codegen/arm/CodegenDriver.cpp b/vm/compiler/codegen/arm/CodegenDriver.cpp
index af2897f06..53dd8feff 100644
--- a/vm/compiler/codegen/arm/CodegenDriver.cpp
+++ b/vm/compiler/codegen/arm/CodegenDriver.cpp
@@ -837,7 +837,7 @@ static bool genArithOpInt(CompilationUnit *cUnit, MIR *mir,
op = kOpLsr;
break;
default:
- LOGE("Invalid word arith op: 0x%x(%d)",
+ LOGE("Invalid word arith op: %#x(%d)",
mir->dalvikInsn.opcode, mir->dalvikInsn.opcode);
dvmCompilerAbort(cUnit);
}
@@ -1477,7 +1477,7 @@ static bool handleFmt10x(CompilationUnit *cUnit, MIR *mir)
{
Opcode dalvikOpcode = mir->dalvikInsn.opcode;
if ((dalvikOpcode >= OP_UNUSED_3E) && (dalvikOpcode <= OP_UNUSED_43)) {
- LOGE("Codegen: got unused opcode 0x%x",dalvikOpcode);
+ LOGE("Codegen: got unused opcode %#x",dalvikOpcode);
return true;
}
switch (dalvikOpcode) {
@@ -1491,7 +1491,7 @@ static bool handleFmt10x(CompilationUnit *cUnit, MIR *mir)
case OP_UNUSED_79:
case OP_UNUSED_7A:
case OP_DISPATCH_FF:
- LOGE("Codegen: got unused opcode 0x%x",dalvikOpcode);
+ LOGE("Codegen: got unused opcode %#x",dalvikOpcode);
return true;
case OP_NOP:
break;
@@ -4547,7 +4547,7 @@ void dvmCompilerMIR2LIR(CompilationUnit *cUnit)
}
}
if (notHandled) {
- LOGE("%#06x: Opcode 0x%x (%s) / Fmt %d not handled",
+ LOGE("%#06x: Opcode %#x (%s) / Fmt %d not handled",
mir->offset,
dalvikOpcode, dexGetOpcodeName(dalvikOpcode),
dalvikFormat);
diff --git a/vm/compiler/codegen/arm/armv7-a-neon/MethodCodegenDriver.cpp b/vm/compiler/codegen/arm/armv7-a-neon/MethodCodegenDriver.cpp
index 7112d10dc..4ddad6903 100644
--- a/vm/compiler/codegen/arm/armv7-a-neon/MethodCodegenDriver.cpp
+++ b/vm/compiler/codegen/arm/armv7-a-neon/MethodCodegenDriver.cpp
@@ -400,7 +400,7 @@ static bool methodBlockCodeGen(CompilationUnit *cUnit, BasicBlock *bb)
}
if (notHandled) {
- LOGE("%#06x: Opcode 0x%x (%s) / Fmt %d not handled",
+ LOGE("%#06x: Opcode %#x (%s) / Fmt %d not handled",
mir->offset,
dalvikOpcode, dexGetOpcodeName(dalvikOpcode),
dalvikFormat);
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-25 22:08:08 +0000