Prefer printf format "%#x" over "0x%x".
I exist to serve.
Change-Id: I8e2880b20eefd466da8515d5b6b0c5cb75d56169
diff --git a/dexopt/OptMain.cpp b/dexopt/OptMain.cpp
index 630ca38..4460252 100644
--- a/dexopt/OptMain.cpp
+++ b/dexopt/OptMain.cpp
@@ -455,7 +455,7 @@
GET_ARG(crc, strtoul, "bad crc");
GET_ARG(flags, strtol, "bad flags");
- LOGV("Args: fd=%d off=%ld len=%ld name='%s' mod=0x%x crc=0x%x flg=%d (argc=%d)",
+ LOGV("Args: fd=%d off=%ld len=%ld name='%s' mod=%#x crc=%#x flg=%d (argc=%d)",
fd, offset, length, debugFileName, modWhen, crc, flags, argc);
assert(argc > 0);
diff --git a/libdex/DexDataMap.cpp b/libdex/DexDataMap.cpp
index d2f675f..3553c36 100644
--- a/libdex/DexDataMap.cpp
+++ b/libdex/DexDataMap.cpp
@@ -77,7 +77,7 @@
if ((map->count != 0) &&
(map->offsets[map->count - 1] >= offset)) {
- LOGE("Out-of-order data map offset: 0x%x then 0x%x",
+ LOGE("Out-of-order data map offset: %#x then %#x",
map->offsets[map->count - 1], offset);
return;
}
@@ -130,10 +130,10 @@
}
if (found < 0) {
- LOGE("No data map entry found @ 0x%x; expected %x",
+ LOGE("No data map entry found @ %#x; expected %x",
offset, type);
} else {
- LOGE("Unexpected data map entry @ 0x%x: expected %x, found %x",
+ LOGE("Unexpected data map entry @ %#x: expected %x, found %x",
offset, type, found);
}
diff --git a/libdex/DexSwapVerify.cpp b/libdex/DexSwapVerify.cpp
index 64f2313..d693791 100644
--- a/libdex/DexSwapVerify.cpp
+++ b/libdex/DexSwapVerify.cpp
@@ -114,7 +114,7 @@
const void* fileEnd = state->fileEnd;
if ((start < fileStart) || (start > fileEnd)
|| (end < start) || (end > fileEnd)) {
- LOGW("Bad offset range for %s: 0x%x..0x%x", label,
+ LOGW("Bad offset range for %s: %#x..%#x", label,
fileOffset(state, start), fileOffset(state, end));
return false;
}
@@ -299,7 +299,7 @@
SWAP_OFFSET4(pHeader->dataOff);
if (pHeader->endianTag != kDexEndianConstant) {
- LOGE("Unexpected endian_tag: 0x%x", pHeader->endianTag);
+ LOGE("Unexpected endian_tag: %#x", pHeader->endianTag);
return false;
}
@@ -328,7 +328,7 @@
}
if (sectionOffset != 0) {
- LOGE("Header at 0x%x; not at start of file", sectionOffset);
+ LOGE("Header at %#x; not at start of file", sectionOffset);
return false;
}
@@ -416,13 +416,13 @@
if (first) {
first = false;
} else if (lastOffset >= item->offset) {
- LOGE("Out-of-order map item: 0x%x then 0x%x",
+ LOGE("Out-of-order map item: %#x then %#x",
lastOffset, item->offset);
return false;
}
if (item->offset >= state->pHeader->fileSize) {
- LOGE("Map item after end of file: %x, size 0x%x",
+ LOGE("Map item after end of file: %x, size %#x",
item->offset, state->pHeader->fileSize);
return false;
}
@@ -452,7 +452,7 @@
}
if ((usedBits & bit) != 0) {
- LOGE("Duplicate map section of type 0x%x", item->type);
+ LOGE("Duplicate map section of type %#x", item->type);
return false;
}
@@ -515,7 +515,7 @@
state->pDataMap = dexDataMapAlloc(dataItemCount);
if (state->pDataMap == NULL) {
- LOGE("Unable to allocate data map (size 0x%x)", dataItemCount);
+ LOGE("Unable to allocate data map (size %#x)", dataItemCount);
return false;
}
@@ -531,7 +531,7 @@
}
if (sectionOffset != state->pHeader->mapOff) {
- LOGE("Map not at header-defined offset: 0x%x, expected 0x%x",
+ LOGE("Map not at header-defined offset: %#x, expected %#x",
sectionOffset, state->pHeader->mapOff);
return false;
}
@@ -601,7 +601,7 @@
if (item0 != NULL) {
// Check ordering. This relies on string_ids being in order.
if (item0->descriptorIdx >= item->descriptorIdx) {
- LOGE("Out-of-order type_ids: 0x%x then 0x%x",
+ LOGE("Out-of-order type_ids: %#x then %#x",
item0->descriptorIdx, item->descriptorIdx);
return NULL;
}
@@ -1073,7 +1073,7 @@
if (first) {
first = false;
} else if (lastIdx >= item->fieldIdx) {
- LOGE("Out-of-order field_idx: 0x%x then 0x%x", lastIdx,
+ LOGE("Out-of-order field_idx: %#x then %#x", lastIdx,
item->fieldIdx);
return NULL;
}
@@ -1102,7 +1102,7 @@
if (first) {
first = false;
} else if (lastIdx >= item->methodIdx) {
- LOGE("Out-of-order method_idx: 0x%x then 0x%x", lastIdx,
+ LOGE("Out-of-order method_idx: %#x then %#x", lastIdx,
item->methodIdx);
return NULL;
}
@@ -1132,7 +1132,7 @@
if (first) {
first = false;
} else if (lastIdx >= item->methodIdx) {
- LOGE("Out-of-order method_idx: 0x%x then 0x%x", lastIdx,
+ LOGE("Out-of-order method_idx: %#x then %#x", lastIdx,
item->methodIdx);
return NULL;
}
@@ -1423,7 +1423,7 @@
if (first) {
first = false;
} else if (lastIdx >= idx) {
- LOGE("Out-of-order entry types: 0x%x then 0x%x",
+ LOGE("Out-of-order entry types: %#x then %#x",
lastIdx, idx);
return NULL;
}
@@ -1495,7 +1495,7 @@
return false;
}
} else if (method->codeOff != 0) {
- LOGE("Unexpected non-zero code_off 0x%x for access_flags %x",
+ LOGE("Unexpected non-zero code_off %#x for access_flags %x",
method->codeOff, accessFlags);
return false;
}
@@ -1696,7 +1696,7 @@
}
if (addr >= code->insnsSize) {
- LOGE("Invalid addr: 0x%x", addr);
+ LOGE("Invalid addr: %#x", addr);
return 0;
}
}
@@ -1710,7 +1710,7 @@
}
if (addr >= code->insnsSize) {
- LOGE("Invalid catch_all_addr: 0x%x", addr);
+ LOGE("Invalid catch_all_addr: %#x", addr);
return 0;
}
}
@@ -1768,7 +1768,7 @@
}
if (tries->startAddr >= code->insnsSize) {
- LOGE("Invalid start_addr: 0x%x", tries->startAddr);
+ LOGE("Invalid start_addr: %#x", tries->startAddr);
return NULL;
}
@@ -1779,14 +1779,14 @@
}
if (i == handlersSize) {
- LOGE("Bogus handler offset: 0x%x", tries->handlerOff);
+ LOGE("Bogus handler offset: %#x", tries->handlerOff);
return NULL;
}
lastEnd = tries->startAddr + tries->insnCount;
if (lastEnd > code->insnsSize) {
- LOGE("Invalid insn_count: 0x%x (end addr 0x%x)",
+ LOGE("Invalid insn_count: %#x (end addr %#x)",
tries->insnCount, lastEnd);
return NULL;
}
@@ -1845,7 +1845,7 @@
if ((((u4) insns) & 3) != 0) {
// Four-byte alignment for the tries. Verify the spacer is a 0.
if (*insns != 0) {
- LOGE("Non-zero padding: 0x%x", (u4) *insns);
+ LOGE("Non-zero padding: %#x", (u4) *insns);
return NULL;
}
}
@@ -1882,7 +1882,7 @@
case 0x00: {
// Special case of bit pattern 0xxx.
if (byte1 == 0) {
- LOGE("String shorter than indicated utf16_size 0x%x",
+ LOGE("String shorter than indicated utf16_size %#x",
utf16Size);
return NULL;
}
@@ -1908,19 +1908,19 @@
* Note: 1111 is valid for normal UTF-8, but not the
* modified UTF-8 used here.
*/
- LOGE("Illegal start byte 0x%x", byte1);
+ LOGE("Illegal start byte %#x", byte1);
return NULL;
}
case 0x0e: {
// Bit pattern 1110, so there are two additional bytes.
u1 byte2 = *(data++);
if ((byte2 & 0xc0) != 0x80) {
- LOGE("Illegal continuation byte 0x%x", byte2);
+ LOGE("Illegal continuation byte %#x", byte2);
return NULL;
}
u1 byte3 = *(data++);
if ((byte3 & 0xc0) != 0x80) {
- LOGE("Illegal continuation byte 0x%x", byte3);
+ LOGE("Illegal continuation byte %#x", byte3);
return NULL;
}
u2 value = ((byte1 & 0x0f) << 12) | ((byte2 & 0x3f) << 6)
@@ -1936,7 +1936,7 @@
// Bit pattern 110x, so there is one additional byte.
u1 byte2 = *(data++);
if ((byte2 & 0xc0) != 0x80) {
- LOGE("Illegal continuation byte 0x%x", byte2);
+ LOGE("Illegal continuation byte %#x", byte2);
return NULL;
}
u2 value = ((byte1 & 0x1f) << 6) | (byte2 & 0x3f);
@@ -1950,7 +1950,7 @@
}
if (*(data++) != '\0') {
- LOGE("String longer than indicated utf16_size 0x%x", utf16Size);
+ LOGE("String longer than indicated utf16_size %#x", utf16Size);
return NULL;
}
@@ -1980,7 +1980,7 @@
}
if (parametersSize > 65536) {
- LOGE("Invalid parameters_size: 0x%x", parametersSize);
+ LOGE("Invalid parameters_size: %#x", parametersSize);
return NULL;
}
@@ -2159,7 +2159,7 @@
switch (valueType) {
case kDexAnnotationByte: {
if (valueArg != 0) {
- LOGE("Bogus byte size 0x%x", valueArg);
+ LOGE("Bogus byte size %#x", valueArg);
return NULL;
}
data++;
@@ -2168,7 +2168,7 @@
case kDexAnnotationShort:
case kDexAnnotationChar: {
if (valueArg > 1) {
- LOGE("Bogus char/short size 0x%x", valueArg);
+ LOGE("Bogus char/short size %#x", valueArg);
return NULL;
}
data += valueArg + 1;
@@ -2177,7 +2177,7 @@
case kDexAnnotationInt:
case kDexAnnotationFloat: {
if (valueArg > 3) {
- LOGE("Bogus int/float size 0x%x", valueArg);
+ LOGE("Bogus int/float size %#x", valueArg);
return NULL;
}
data += valueArg + 1;
@@ -2190,7 +2190,7 @@
}
case kDexAnnotationString: {
if (valueArg > 3) {
- LOGE("Bogus string size 0x%x", valueArg);
+ LOGE("Bogus string size %#x", valueArg);
return NULL;
}
u4 idx = readUnsignedLittleEndian(state, &data, valueArg + 1);
@@ -2199,7 +2199,7 @@
}
case kDexAnnotationType: {
if (valueArg > 3) {
- LOGE("Bogus type size 0x%x", valueArg);
+ LOGE("Bogus type size %#x", valueArg);
return NULL;
}
u4 idx = readUnsignedLittleEndian(state, &data, valueArg + 1);
@@ -2209,7 +2209,7 @@
case kDexAnnotationField:
case kDexAnnotationEnum: {
if (valueArg > 3) {
- LOGE("Bogus field/enum size 0x%x", valueArg);
+ LOGE("Bogus field/enum size %#x", valueArg);
return NULL;
}
u4 idx = readUnsignedLittleEndian(state, &data, valueArg + 1);
@@ -2218,7 +2218,7 @@
}
case kDexAnnotationMethod: {
if (valueArg > 3) {
- LOGE("Bogus method size 0x%x", valueArg);
+ LOGE("Bogus method size %#x", valueArg);
return NULL;
}
u4 idx = readUnsignedLittleEndian(state, &data, valueArg + 1);
@@ -2227,7 +2227,7 @@
}
case kDexAnnotationArray: {
if (valueArg != 0) {
- LOGE("Bogus array value_arg 0x%x", valueArg);
+ LOGE("Bogus array value_arg %#x", valueArg);
return NULL;
}
data = verifyEncodedArray(state, data, crossVerify);
@@ -2235,7 +2235,7 @@
}
case kDexAnnotationAnnotation: {
if (valueArg != 0) {
- LOGE("Bogus annotation value_arg 0x%x", valueArg);
+ LOGE("Bogus annotation value_arg %#x", valueArg);
return NULL;
}
data = verifyEncodedAnnotation(state, data, crossVerify);
@@ -2243,7 +2243,7 @@
}
case kDexAnnotationNull: {
if (valueArg != 0) {
- LOGE("Bogus null value_arg 0x%x", valueArg);
+ LOGE("Bogus null value_arg %#x", valueArg);
return NULL;
}
// Nothing else to do for this type.
@@ -2251,14 +2251,14 @@
}
case kDexAnnotationBoolean: {
if (valueArg > 1) {
- LOGE("Bogus boolean value_arg 0x%x", valueArg);
+ LOGE("Bogus boolean value_arg %#x", valueArg);
return NULL;
}
// Nothing else to do for this type.
break;
}
default: {
- LOGE("Bogus value_type 0x%x", valueType);
+ LOGE("Bogus value_type %#x", valueType);
return NULL;
}
}
@@ -2319,7 +2319,7 @@
if (first) {
first = false;
} else if (lastIdx >= idx) {
- LOGE("Out-of-order encoded_annotation name_idx: 0x%x then 0x%x",
+ LOGE("Out-of-order encoded_annotation name_idx: %#x then %#x",
lastIdx, idx);
return NULL;
}
@@ -2353,7 +2353,7 @@
break;
}
default: {
- LOGE("Bogus annotation visibility: 0x%x", *data);
+ LOGE("Bogus annotation visibility: %#x", *data);
return NULL;
}
}
@@ -2415,12 +2415,12 @@
newOffset = fileOffset(state, newPtr);
if (newPtr == NULL) {
- LOGE("Trouble with item %d @ offset 0x%x", i, offset);
+ LOGE("Trouble with item %d @ offset %#x", i, offset);
return false;
}
if (newOffset > state->fileLen) {
- LOGE("Item %d @ offset 0x%x ends out of bounds", i, offset);
+ LOGE("Item %d @ offset %#x ends out of bounds", i, offset);
return false;
}
@@ -2458,13 +2458,13 @@
u4 offset, u4 count, u4 expectedOffset, u4 expectedCount,
ItemVisitorFunction* func, u4 alignment, u4* nextOffset) {
if (offset != expectedOffset) {
- LOGE("Bogus offset for section: got 0x%x; expected 0x%x",
+ LOGE("Bogus offset for section: got %#x; expected %#x",
offset, expectedOffset);
return false;
}
if (count != expectedCount) {
- LOGE("Bogus size for section: got 0x%x; expected 0x%x",
+ LOGE("Bogus size for section: got %#x; expected %#x",
count, expectedCount);
return false;
}
@@ -2484,7 +2484,7 @@
assert(nextOffset != NULL);
if ((offset < dataStart) || (offset >= dataEnd)) {
- LOGE("Bogus offset for data subsection: 0x%x", offset);
+ LOGE("Bogus offset for data subsection: %#x", offset);
return false;
}
@@ -2494,7 +2494,7 @@
}
if (*nextOffset > dataEnd) {
- LOGE("Out-of-bounds end of data subsection: 0x%x", *nextOffset);
+ LOGE("Out-of-bounds end of data subsection: %#x", *nextOffset);
return false;
}
diff --git a/tools/dmtracedump/CreateTestTrace.c b/tools/dmtracedump/CreateTestTrace.c
index 0b85d51..a4ae02e 100644
--- a/tools/dmtracedump/CreateTestTrace.c
+++ b/tools/dmtracedump/CreateTestTrace.c
@@ -399,14 +399,14 @@
pNext->methodId = id;
}
if (pRecord->className == NULL || pRecord->methodName == NULL) {
- fprintf(keyFp, "0x%x %s m ()\n",
+ fprintf(keyFp, "%#x %s m ()\n",
pRecord->methodId, pRecord->fullName);
} else if (pRecord->signature == NULL) {
- fprintf(keyFp, "0x%x %s %s ()\n",
+ fprintf(keyFp, "%#x %s %s ()\n",
pRecord->methodId, pRecord->className,
pRecord->methodName);
} else {
- fprintf(keyFp, "0x%x %s %s %s\n",
+ fprintf(keyFp, "%#x %s %s %s\n",
pRecord->methodId, pRecord->className,
pRecord->methodName, pRecord->signature);
}
diff --git a/tools/dmtracedump/TraceDump.c b/tools/dmtracedump/TraceDump.c
index 4127530..b60bbf5 100644
--- a/tools/dmtracedump/TraceDump.c
+++ b/tools/dmtracedump/TraceDump.c
@@ -1220,7 +1220,7 @@
method = lookupMethod(pKeys, methodId);
if (method == NULL) {
method = &bogusMethod;
- sprintf(bogusBuf, "methodId: 0x%x", methodId);
+ sprintf(bogusBuf, "methodId: %#x", methodId);
method->signature = bogusBuf;
}
diff --git a/vm/CheckJni.cpp b/vm/CheckJni.cpp
index 0830be5..7339d9b 100644
--- a/vm/CheckJni.cpp
+++ b/vm/CheckJni.cpp
@@ -589,7 +589,7 @@
const char* errorKind = NULL;
u1 utf8 = checkUtfBytes(bytes, &errorKind);
if (errorKind != NULL) {
- LOGW("JNI WARNING: input is not valid UTF-8: illegal %s byte 0x%x", errorKind, utf8);
+ LOGW("JNI WARNING: input is not valid UTF-8: illegal %s byte %#x", errorKind, utf8);
LOGW(" string: '%s'", bytes);
showLocation();
abortMaybe();
diff --git a/vm/Native.cpp b/vm/Native.cpp
index dfbde90..bd1261a 100644
--- a/vm/Native.cpp
+++ b/vm/Native.cpp
@@ -773,7 +773,7 @@
if (value.b >= 0 && value.b < 10) {
sprintf(p, "%d", value.b);
} else {
- sprintf(p, "0x%x (%d)", value.b, value.b);
+ sprintf(p, "%#x (%d)", value.b, value.b);
}
break;
case 'C':
@@ -793,7 +793,7 @@
sprintf(p, "%d", value.i);
break;
case 'L':
- sprintf(p, "0x%x", value.i);
+ sprintf(p, "%#x", value.i);
break;
case 'J':
sprintf(p, "%lld", value.j);
diff --git a/vm/analysis/CodeVerify.cpp b/vm/analysis/CodeVerify.cpp
index 0c30dac..3a0f0e6 100644
--- a/vm/analysis/CodeVerify.cpp
+++ b/vm/analysis/CodeVerify.cpp
@@ -1673,7 +1673,7 @@
clazz = getUninitInstance(uninitMap, regTypeToUninitIndex(uninitType));
if (clazz == NULL) {
- LOGE("VFY: unable to find type=0x%x (idx=%d)",
+ LOGE("VFY: unable to find type=%#x (idx=%d)",
uninitType, regTypeToUninitIndex(uninitType));
*pFailure = VERIFY_ERROR_GENERIC;
return;
@@ -2910,7 +2910,7 @@
if (commonSuper == NULL) {
/* no catch blocks, or no catches with classes we can find */
LOG_VFY_METH(meth,
- "VFY: unable to find exception handler at addr 0x%x\n", insnIdx);
+ "VFY: unable to find exception handler at addr %#x\n", insnIdx);
*pFailure = VERIFY_ERROR_GENERIC;
} else {
// TODO: verify the class is an instance of Throwable?
@@ -3403,7 +3403,7 @@
if ((workLine->monitorEntries[regIdx] & (1 << workLine->monitorStackTop))
== 0)
{
- LOG_VFY("VFY: monitor-exit bit %d not set: addr=0x%04x (bits[%d]=0x%x)",
+ LOG_VFY("VFY: monitor-exit bit %d not set: addr=0x%04x (bits[%d]=%#x)",
workLine->monitorStackTop, insnIdx, regIdx,
workLine->monitorEntries[regIdx]);
*pFailure = VERIFY_ERROR_GENERIC;
@@ -6039,7 +6039,7 @@
int insnWidth = dvmInsnGetWidth(insnFlags, insnIdx);
if (insnIdx+insnWidth >= insnsSize) {
LOG_VFY_METH(meth,
- "VFY: execution can walk off end of code area (from 0x%x)\n",
+ "VFY: execution can walk off end of code area (from %#x)\n",
insnIdx);
goto bail;
}
diff --git a/vm/analysis/DexVerify.cpp b/vm/analysis/DexVerify.cpp
index f7217e6..b85eba8 100644
--- a/vm/analysis/DexVerify.cpp
+++ b/vm/analysis/DexVerify.cpp
@@ -692,7 +692,7 @@
if (absOffset < 0 || absOffset >= (s4)insnCount ||
!dvmInsnIsOpcode(insnFlags, absOffset))
{
- LOG_VFY("VFY: invalid switch target %d (-> 0x%x) at 0x%x[%d]",
+ LOG_VFY("VFY: invalid switch target %d (-> %#x) at %#x[%d]",
offset, absOffset, curOffset, targ);
return false;
}
@@ -726,7 +726,7 @@
return false;
if (!selfOkay && offset == 0) {
- LOG_VFY_METH(meth, "VFY: branch offset of zero not allowed at 0x%x",
+ LOG_VFY_METH(meth, "VFY: branch offset of zero not allowed at %#x",
curOffset);
return false;
}
@@ -737,7 +737,7 @@
* it's unwise to depend on that.
*/
if (((s8) curOffset + (s8) offset) != (s8)(curOffset + offset)) {
- LOG_VFY_METH(meth, "VFY: branch target overflow 0x%x +%d",
+ LOG_VFY_METH(meth, "VFY: branch target overflow %#x +%d",
curOffset, offset);
return false;
}
@@ -746,7 +746,7 @@
!dvmInsnIsOpcode(insnFlags, absOffset))
{
LOG_VFY_METH(meth,
- "VFY: invalid branch target %d (-> 0x%x) at 0x%x\n",
+ "VFY: invalid branch target %d (-> %#x) at %#x\n",
offset, absOffset, curOffset);
return false;
}
diff --git a/vm/analysis/RegisterMap.cpp b/vm/analysis/RegisterMap.cpp
index 65fd779..298887d 100644
--- a/vm/analysis/RegisterMap.cpp
+++ b/vm/analysis/RegisterMap.cpp
@@ -874,7 +874,7 @@
const RegisterMap* pMap = (const RegisterMap*) *pPtr;
*pPtr = /*align32*/(((u1*) pMap) + computeRegisterMapSize(pMap));
- LOGVV("getNext: %p -> %p (f=0x%x w=%d e=%d)",
+ LOGVV("getNext: %p -> %p (f=%#x w=%d e=%d)",
pMap, *pPtr, pMap->format, pMap->regWidth,
dvmRegisterMapGetNumEntries(pMap));
return pMap;
diff --git a/vm/compiler/Dataflow.cpp b/vm/compiler/Dataflow.cpp
index 28bed68..7f164cb 100644
--- a/vm/compiler/Dataflow.cpp
+++ b/vm/compiler/Dataflow.cpp
@@ -1601,7 +1601,7 @@
strcpy(buffer, "PHI");
}
else {
- sprintf(buffer, "Opcode 0x%x", opcode);
+ sprintf(buffer, "Opcode %#x", opcode);
}
flags = 0;
} else {
@@ -1712,7 +1712,7 @@
snprintf(buffer + strlen(buffer), 256, ")");
}
else {
- sprintf(buffer, "Opcode 0x%x", opcode);
+ sprintf(buffer, "Opcode %#x", opcode);
}
goto done;
} else {
diff --git a/vm/compiler/Frontend.cpp b/vm/compiler/Frontend.cpp
index 6b1e139..24ec6c7 100644
--- a/vm/compiler/Frontend.cpp
+++ b/vm/compiler/Frontend.cpp
@@ -1745,7 +1745,7 @@
curBB = entryCodeBB;
if (cUnit.printMe) {
- LOGD("--------\nCompiler: Building trace for %s, offset 0x%x",
+ LOGD("--------\nCompiler: Building trace for %s, offset %#x",
desc->method->name, curOffset);
}
@@ -2013,7 +2013,7 @@
if (cUnit.printMe) {
char* signature =
dexProtoCopyMethodDescriptor(&desc->method->prototype);
- LOGD("TRACEINFO (%d): 0x%08x %s%s.%s 0x%x %d of %d, %d blocks",
+ LOGD("TRACEINFO (%d): 0x%08x %s%s.%s %#x %d of %d, %d blocks",
compilationId,
(intptr_t) desc->method->insns,
desc->method->clazz->descriptor,
diff --git a/vm/compiler/codegen/arm/ArchUtility.cpp b/vm/compiler/codegen/arm/ArchUtility.cpp
index ecc67db..0bbb875 100644
--- a/vm/compiler/codegen/arm/ArchUtility.cpp
+++ b/vm/compiler/codegen/arm/ArchUtility.cpp
@@ -138,11 +138,11 @@
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 @@
}
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 47d2a08..312e7c1 100644
--- a/vm/compiler/codegen/arm/Assemble.cpp
+++ b/vm/compiler/codegen/arm/Assemble.cpp
@@ -1604,7 +1604,7 @@
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 @@
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 @@
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 @@
}
}
- //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 @@
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 @@
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 @@
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 @@
}
}
} 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 af2897f..53dd8fe 100644
--- a/vm/compiler/codegen/arm/CodegenDriver.cpp
+++ b/vm/compiler/codegen/arm/CodegenDriver.cpp
@@ -837,7 +837,7 @@
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 @@
{
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 @@
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 @@
}
}
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 7112d10..4ddad69 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 @@
}
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/interp/Interp.cpp b/vm/interp/Interp.cpp
index 32ae3ec..57c900b 100644
--- a/vm/interp/Interp.cpp
+++ b/vm/interp/Interp.cpp
@@ -278,7 +278,7 @@
LOGV("Class %s verified, adding breakpoint at %p",
method->clazz->descriptor, addr);
if (instructionIsMagicNop(addr)) {
- LOGV("Refusing to set breakpoint on %04x at %s.%s + 0x%x",
+ LOGV("Refusing to set breakpoint on %04x at %s.%s + %#x",
*addr, method->clazz->descriptor, method->name,
instrOffset);
} else {
@@ -317,11 +317,11 @@
if (idx < 0) {
/* breakpoint not found in set -- unexpected */
if (*(u1*)addr == OP_BREAKPOINT) {
- LOGE("Unable to restore breakpoint opcode (%s.%s +0x%x)",
+ LOGE("Unable to restore breakpoint opcode (%s.%s +%#x)",
method->clazz->descriptor, method->name, instrOffset);
dvmAbort();
} else {
- LOGW("Breakpoint was already restored? (%s.%s +0x%x)",
+ LOGW("Breakpoint was already restored? (%s.%s +%#x)",
method->clazz->descriptor, method->name, instrOffset);
}
} else {
@@ -375,7 +375,7 @@
LOGV("Flushing breakpoint at %p for %s",
pBreak->addr, clazz->descriptor);
if (instructionIsMagicNop(pBreak->addr)) {
- LOGV("Refusing to flush breakpoint on %04x at %s.%s + 0x%x",
+ LOGV("Refusing to flush breakpoint on %04x at %s.%s + %#x",
*pBreak->addr, pBreak->method->clazz->descriptor,
pBreak->method->name, pBreak->addr - pBreak->method->insns);
} else {
@@ -1592,26 +1592,26 @@
handlerTable = self->interpBreak.ctl.curHandlerTable;
for (thread = gDvm.threadList; thread != NULL; thread = thread->next) {
if (subMode != thread->interpBreak.ctl.subMode) {
- LOGD("Warning: subMode mismatch - 0x%x:0x%x, tid[%d]",
+ LOGD("Warning: subMode mismatch - %#x:%#x, tid[%d]",
subMode,thread->interpBreak.ctl.subMode,thread->threadId);
}
if (breakFlags != thread->interpBreak.ctl.breakFlags) {
- LOGD("Warning: breakFlags mismatch - 0x%x:0x%x, tid[%d]",
+ LOGD("Warning: breakFlags mismatch - %#x:%#x, tid[%d]",
breakFlags,thread->interpBreak.ctl.breakFlags,thread->threadId);
}
if (handlerTable != thread->interpBreak.ctl.curHandlerTable) {
- LOGD("Warning: curHandlerTable mismatch - 0x%x:0x%x, tid[%d]",
+ LOGD("Warning: curHandlerTable mismatch - %#x:%#x, tid[%d]",
(int)handlerTable,(int)thread->interpBreak.ctl.curHandlerTable,
thread->threadId);
}
#if defined(WITH_JIT)
if (thread->pJitProfTable != gDvmJit.pProfTable) {
- LOGD("Warning: pJitProfTable mismatch - 0x%x:0x%x, tid[%d]",
+ LOGD("Warning: pJitProfTable mismatch - %#x:%#x, tid[%d]",
(int)thread->pJitProfTable,(int)gDvmJit.pProfTable,
thread->threadId);
}
if (thread->jitThreshold != gDvmJit.threshold) {
- LOGD("Warning: jitThreshold mismatch - 0x%x:0x%x, tid[%d]",
+ LOGD("Warning: jitThreshold mismatch - %#x:%#x, tid[%d]",
(int)thread->jitThreshold,(int)gDvmJit.threshold,
thread->threadId);
}
@@ -1846,13 +1846,13 @@
if (self->jitResumeDPC != NULL) {
if (self->jitResumeDPC == pc) {
if (self->jitResumeNPC != NULL) {
- LOGD("SS return to trace - pc:0x%x to 0x:%x",
+ LOGD("SS return to trace - pc:%#x to 0x:%x",
(int)pc, (int)self->jitResumeNPC);
} else {
- LOGD("SS return to interp - pc:0x%x",(int)pc);
+ LOGD("SS return to interp - pc:%#x",(int)pc);
}
} else {
- LOGD("SS failed to return. Expected 0x%x, now at 0x%x",
+ LOGD("SS failed to return. Expected %#x, now at %#x",
(int)self->jitResumeDPC, (int)pc);
}
}
diff --git a/vm/interp/Jit.cpp b/vm/interp/Jit.cpp
index 9632e97..758956d 100644
--- a/vm/interp/Jit.cpp
+++ b/vm/interp/Jit.cpp
@@ -74,14 +74,14 @@
sizeof(StackSaveArea);
unsigned postBytes = self->interpSave.method->registersSize*4;
- //LOGD("### selfVerificationSaveState(%d) pc: 0x%x fp: 0x%x",
+ //LOGD("### selfVerificationSaveState(%d) pc: %#x fp: %#x",
// self->threadId, (int)pc, (int)fp);
if (shadowSpace->selfVerificationState != kSVSIdle) {
LOGD("~~~ Save: INCORRECT PREVIOUS STATE(%d): %d",
self->threadId, shadowSpace->selfVerificationState);
LOGD("********** SHADOW STATE DUMP **********");
- LOGD("PC: 0x%x FP: 0x%x", (int)pc, (int)fp);
+ LOGD("PC: %#x FP: %#x", (int)pc, (int)fp);
}
shadowSpace->selfVerificationState = kSVSStart;
@@ -138,7 +138,7 @@
shadowSpace->endShadowFP = fp;
shadowSpace->jitExitState = exitState;
- //LOGD("### selfVerificationRestoreState(%d) pc: 0x%x fp: 0x%x endPC: 0x%x",
+ //LOGD("### selfVerificationRestoreState(%d) pc: %#x fp: %#x endPC: %#x",
// self->threadId, (int)shadowSpace->startPC, (int)shadowSpace->fp,
// (int)pc);
@@ -146,10 +146,10 @@
LOGD("~~~ Restore: INCORRECT PREVIOUS STATE(%d): %d",
self->threadId, shadowSpace->selfVerificationState);
LOGD("********** SHADOW STATE DUMP **********");
- LOGD("Dalvik PC: 0x%x endPC: 0x%x", (int)shadowSpace->startPC,
+ LOGD("Dalvik PC: %#x endPC: %#x", (int)shadowSpace->startPC,
(int)shadowSpace->endPC);
- LOGD("Interp FP: 0x%x", (int)shadowSpace->fp);
- LOGD("Shadow FP: 0x%x endFP: 0x%x", (int)shadowSpace->shadowFP,
+ LOGD("Interp FP: %#x", (int)shadowSpace->fp);
+ LOGD("Shadow FP: %#x endFP: %#x", (int)shadowSpace->shadowFP,
(int)shadowSpace->endShadowFP);
}
@@ -198,15 +198,15 @@
(int)self->interpSave.curFrame - localRegs;
}
LOGD("********** SHADOW STATE DUMP **********");
- LOGD("CurrentPC: 0x%x, Offset: 0x%04x", (int)pc,
+ LOGD("CurrentPC: %#x, Offset: 0x%04x", (int)pc,
(int)(pc - stackSave->method->insns));
LOGD("Class: %s", shadowSpace->method->clazz->descriptor);
LOGD("Method: %s", shadowSpace->method->name);
- LOGD("Dalvik PC: 0x%x endPC: 0x%x", (int)shadowSpace->startPC,
+ LOGD("Dalvik PC: %#x endPC: %#x", (int)shadowSpace->startPC,
(int)shadowSpace->endPC);
- LOGD("Interp FP: 0x%x endFP: 0x%x", (int)shadowSpace->fp,
+ LOGD("Interp FP: %#x endFP: %#x", (int)shadowSpace->fp,
(int)self->interpSave.curFrame);
- LOGD("Shadow FP: 0x%x endFP: 0x%x", (int)shadowSpace->shadowFP,
+ LOGD("Shadow FP: %#x endFP: %#x", (int)shadowSpace->shadowFP,
(int)shadowSpace->endShadowFP);
LOGD("Frame1 Bytes: %d Frame2 Local: %d Bytes: %d", frameBytes,
localRegs, frameBytes2);
@@ -228,7 +228,7 @@
offset = (int)((u2*)addr - stackSave->method->insns);
decInsn = &(shadowSpace->trace[i].decInsn);
/* Not properly decoding instruction, some registers may be garbage */
- LOGD("0x%x: (0x%04x) %s",
+ LOGD("%#x: (0x%04x) %s",
addr, offset, dexGetOpcodeName(decInsn->opcode));
}
}
@@ -269,7 +269,7 @@
DecodedInstruction decInsn;
dexDecodeInstruction(pc, &decInsn);
- //LOGD("### DbgIntp(%d): PC: 0x%x endPC: 0x%x state: %d len: %d %s",
+ //LOGD("### DbgIntp(%d): PC: %#x endPC: %#x state: %d len: %d %s",
// self->threadId, (int)pc, (int)shadowSpace->endPC, state,
// shadowSpace->traceLength, dexGetOpcodeName(decInsn.opcode));
@@ -311,12 +311,12 @@
LOGD("~~~ DbgIntp(%d): REGISTERS DIVERGENCE!", self->threadId);
selfVerificationDumpState(pc, self);
selfVerificationDumpTrace(pc, self);
- LOGD("*** Interp Registers: addr: 0x%x bytes: %d",
+ LOGD("*** Interp Registers: addr: %#x bytes: %d",
(int)shadowSpace->fp, frameBytes);
selfVerificationPrintRegisters((int*)shadowSpace->fp,
(int*)shadowSpace->shadowFP,
frameBytes/4);
- LOGD("*** Shadow Registers: addr: 0x%x bytes: %d",
+ LOGD("*** Shadow Registers: addr: %#x bytes: %d",
(int)shadowSpace->shadowFP, frameBytes);
selfVerificationPrintRegisters((int*)shadowSpace->shadowFP,
(int*)shadowSpace->fp,
@@ -345,12 +345,12 @@
self->threadId);
selfVerificationDumpState(pc, self);
selfVerificationDumpTrace(pc, self);
- LOGD("*** Interp Registers: addr: 0x%x l: %d bytes: %d",
+ LOGD("*** Interp Registers: addr: %#x l: %d bytes: %d",
(int)self->interpSave.curFrame, localRegs, frameBytes2);
selfVerificationPrintRegisters((int*)self->interpSave.curFrame,
(int*)shadowSpace->endShadowFP,
(frameBytes2+localRegs)/4);
- LOGD("*** Shadow Registers: addr: 0x%x l: %d bytes: %d",
+ LOGD("*** Shadow Registers: addr: %#x l: %d bytes: %d",
(int)shadowSpace->endShadowFP, localRegs, frameBytes2);
selfVerificationPrintRegisters((int*)shadowSpace->endShadowFP,
(int*)self->interpSave.curFrame,
@@ -375,7 +375,7 @@
goto log_and_continue;
}
LOGD("~~~ DbgIntp(%d): MEMORY DIVERGENCE!", self->threadId);
- LOGD("Addr: 0x%x Intrp Data: 0x%x Jit Data: 0x%x",
+ LOGD("Addr: %#x Intrp Data: %#x Jit Data: %#x",
heapSpacePtr->addr, memData, heapSpacePtr->data);
selfVerificationDumpState(pc, self);
selfVerificationDumpTrace(pc, self);
@@ -410,7 +410,7 @@
/* If end not been reached, make sure max length not exceeded */
if (shadowSpace->traceLength >= JIT_MAX_TRACE_LEN) {
LOGD("~~~ DbgIntp(%d): CONTROL DIVERGENCE!", self->threadId);
- LOGD("startPC: 0x%x endPC: 0x%x currPC: 0x%x",
+ LOGD("startPC: %#x endPC: %#x currPC: %#x",
(int)shadowSpace->startPC, (int)shadowSpace->endPC, (int)pc);
selfVerificationDumpState(pc, self);
selfVerificationDumpTrace(pc, self);
@@ -664,13 +664,13 @@
const u2* dpcBase;
int curFrag = 0;
LOGD("===========================================");
- LOGD("Trace dump 0x%x, Method %s off 0x%x",(int)trace,
+ LOGD("Trace dump %#x, Method %s off %#x",(int)trace,
trace->method->name,trace->trace[curFrag].info.frag.startOffset);
dpcBase = trace->method->insns;
while (!done) {
DecodedInstruction decInsn;
if (trace->trace[curFrag].isCode) {
- LOGD("Frag[%d]- Insts: %d, start: 0x%x, hint: 0x%x, end: %d",
+ LOGD("Frag[%d]- Insts: %d, start: %#x, hint: %#x, end: %d",
curFrag, trace->trace[curFrag].info.frag.numInsts,
trace->trace[curFrag].info.frag.startOffset,
trace->trace[curFrag].info.frag.hint,
@@ -678,7 +678,7 @@
dpc = dpcBase + trace->trace[curFrag].info.frag.startOffset;
for (i=0; i<trace->trace[curFrag].info.frag.numInsts; i++) {
dexDecodeInstruction(dpc, &decInsn);
- LOGD(" 0x%04x - %s 0x%x",(dpc-dpcBase),
+ LOGD(" 0x%04x - %s %#x",(dpc-dpcBase),
dexGetOpcodeName(decInsn.opcode),(int)dpc);
dpc += dexGetWidthFromOpcode(decInsn.opcode);
}
@@ -810,7 +810,7 @@
}
#if defined(SHOW_TRACE)
- LOGD("TraceGen: adding %s. lpc:0x%x, pc:0x%x",
+ LOGD("TraceGen: adding %s. lpc:%#x, pc:%#x",
dexGetOpcodeName(decInsn.opcode), (int)lastPC, (int)pc);
#endif
flags = dexGetFlagsFromOpcode(decInsn.opcode);
@@ -1274,7 +1274,7 @@
/* Turn on trace selection mode */
dvmEnableSubMode(self, kSubModeJitTraceBuild);
#if defined(SHOW_TRACE)
- LOGD("Starting trace for %s at 0x%x",
+ LOGD("Starting trace for %s at %#x",
self->interpSave.method->name, (int)self->interpSave.pc);
#endif
break;
diff --git a/vm/jdwp/JdwpHandler.cpp b/vm/jdwp/JdwpHandler.cpp
index 4c12e25..02958e9 100644
--- a/vm/jdwp/JdwpHandler.cpp
+++ b/vm/jdwp/JdwpHandler.cpp
@@ -1538,7 +1538,7 @@
pEvent->requestId = requestId;
- LOGV(" --> event requestId=0x%x", requestId);
+ LOGV(" --> event requestId=%#x", requestId);
/* add it to the list */
JdwpError err = dvmJdwpRegisterEvent(state, pEvent);
diff --git a/vm/mterp/armv5te/footer.S b/vm/mterp/armv5te/footer.S
index 5e587b9..4afe471 100644
--- a/vm/mterp/armv5te/footer.S
+++ b/vm/mterp/armv5te/footer.S
@@ -1246,6 +1246,6 @@
.LstrSqueak:
.asciz "<%d>"
.LstrPrintHex:
- .asciz "<0x%x>"
+ .asciz "<%#x>"
.LstrPrintLong:
.asciz "<%lld>"
diff --git a/vm/mterp/c/opcommon.cpp b/vm/mterp/c/opcommon.cpp
index 296776f..104d856 100644
--- a/vm/mterp/c/opcommon.cpp
+++ b/vm/mterp/c/opcommon.cpp
@@ -458,7 +458,7 @@
} \
SET_REGISTER##_regsize(vdst, \
((_type*)(void*)arrayObj->contents)[GET_REGISTER(vsrc2)]); \
- ILOGV("+ AGET[%d]=0x%x", GET_REGISTER(vsrc2), GET_REGISTER(vdst)); \
+ ILOGV("+ AGET[%d]=%#x", GET_REGISTER(vsrc2), GET_REGISTER(vdst)); \
} \
FINISH(2);
diff --git a/vm/mterp/out/InterpAsm-armv5te-vfp.S b/vm/mterp/out/InterpAsm-armv5te-vfp.S
index 2a2b4f8..2a9ca5c 100644
--- a/vm/mterp/out/InterpAsm-armv5te-vfp.S
+++ b/vm/mterp/out/InterpAsm-armv5te-vfp.S
@@ -27442,7 +27442,7 @@
.LstrSqueak:
.asciz "<%d>"
.LstrPrintHex:
- .asciz "<0x%x>"
+ .asciz "<%#x>"
.LstrPrintLong:
.asciz "<%lld>"
diff --git a/vm/mterp/out/InterpAsm-armv5te.S b/vm/mterp/out/InterpAsm-armv5te.S
index 291c4ad..f8ae9ac 100644
--- a/vm/mterp/out/InterpAsm-armv5te.S
+++ b/vm/mterp/out/InterpAsm-armv5te.S
@@ -27900,7 +27900,7 @@
.LstrSqueak:
.asciz "<%d>"
.LstrPrintHex:
- .asciz "<0x%x>"
+ .asciz "<%#x>"
.LstrPrintLong:
.asciz "<%lld>"
diff --git a/vm/mterp/out/InterpAsm-armv7-a-neon.S b/vm/mterp/out/InterpAsm-armv7-a-neon.S
index ec310c6..0037563 100644
--- a/vm/mterp/out/InterpAsm-armv7-a-neon.S
+++ b/vm/mterp/out/InterpAsm-armv7-a-neon.S
@@ -27380,7 +27380,7 @@
.LstrSqueak:
.asciz "<%d>"
.LstrPrintHex:
- .asciz "<0x%x>"
+ .asciz "<%#x>"
.LstrPrintLong:
.asciz "<%lld>"
diff --git a/vm/mterp/out/InterpAsm-armv7-a.S b/vm/mterp/out/InterpAsm-armv7-a.S
index 05cd9ce..b65c659 100644
--- a/vm/mterp/out/InterpAsm-armv7-a.S
+++ b/vm/mterp/out/InterpAsm-armv7-a.S
@@ -27380,7 +27380,7 @@
.LstrSqueak:
.asciz "<%d>"
.LstrPrintHex:
- .asciz "<0x%x>"
+ .asciz "<%#x>"
.LstrPrintLong:
.asciz "<%lld>"
diff --git a/vm/mterp/out/InterpC-allstubs.cpp b/vm/mterp/out/InterpC-allstubs.cpp
index 53a6ec2..ef59ea8 100644
--- a/vm/mterp/out/InterpC-allstubs.cpp
+++ b/vm/mterp/out/InterpC-allstubs.cpp
@@ -964,7 +964,7 @@
} \
SET_REGISTER##_regsize(vdst, \
((_type*)(void*)arrayObj->contents)[GET_REGISTER(vsrc2)]); \
- ILOGV("+ AGET[%d]=0x%x", GET_REGISTER(vsrc2), GET_REGISTER(vdst)); \
+ ILOGV("+ AGET[%d]=%#x", GET_REGISTER(vsrc2), GET_REGISTER(vdst)); \
} \
FINISH(2);
diff --git a/vm/mterp/out/InterpC-armv5te-vfp.cpp b/vm/mterp/out/InterpC-armv5te-vfp.cpp
index 50bde59..2116b4c 100644
--- a/vm/mterp/out/InterpC-armv5te-vfp.cpp
+++ b/vm/mterp/out/InterpC-armv5te-vfp.cpp
@@ -964,7 +964,7 @@
} \
SET_REGISTER##_regsize(vdst, \
((_type*)(void*)arrayObj->contents)[GET_REGISTER(vsrc2)]); \
- ILOGV("+ AGET[%d]=0x%x", GET_REGISTER(vsrc2), GET_REGISTER(vdst)); \
+ ILOGV("+ AGET[%d]=%#x", GET_REGISTER(vsrc2), GET_REGISTER(vdst)); \
} \
FINISH(2);
diff --git a/vm/mterp/out/InterpC-armv5te.cpp b/vm/mterp/out/InterpC-armv5te.cpp
index 778c000..3f966d4 100644
--- a/vm/mterp/out/InterpC-armv5te.cpp
+++ b/vm/mterp/out/InterpC-armv5te.cpp
@@ -964,7 +964,7 @@
} \
SET_REGISTER##_regsize(vdst, \
((_type*)(void*)arrayObj->contents)[GET_REGISTER(vsrc2)]); \
- ILOGV("+ AGET[%d]=0x%x", GET_REGISTER(vsrc2), GET_REGISTER(vdst)); \
+ ILOGV("+ AGET[%d]=%#x", GET_REGISTER(vsrc2), GET_REGISTER(vdst)); \
} \
FINISH(2);
diff --git a/vm/mterp/out/InterpC-armv7-a-neon.cpp b/vm/mterp/out/InterpC-armv7-a-neon.cpp
index d8ee98d..e33d67d 100644
--- a/vm/mterp/out/InterpC-armv7-a-neon.cpp
+++ b/vm/mterp/out/InterpC-armv7-a-neon.cpp
@@ -964,7 +964,7 @@
} \
SET_REGISTER##_regsize(vdst, \
((_type*)(void*)arrayObj->contents)[GET_REGISTER(vsrc2)]); \
- ILOGV("+ AGET[%d]=0x%x", GET_REGISTER(vsrc2), GET_REGISTER(vdst)); \
+ ILOGV("+ AGET[%d]=%#x", GET_REGISTER(vsrc2), GET_REGISTER(vdst)); \
} \
FINISH(2);
diff --git a/vm/mterp/out/InterpC-armv7-a.cpp b/vm/mterp/out/InterpC-armv7-a.cpp
index 5fe2149..6797c4a 100644
--- a/vm/mterp/out/InterpC-armv7-a.cpp
+++ b/vm/mterp/out/InterpC-armv7-a.cpp
@@ -964,7 +964,7 @@
} \
SET_REGISTER##_regsize(vdst, \
((_type*)(void*)arrayObj->contents)[GET_REGISTER(vsrc2)]); \
- ILOGV("+ AGET[%d]=0x%x", GET_REGISTER(vsrc2), GET_REGISTER(vdst)); \
+ ILOGV("+ AGET[%d]=%#x", GET_REGISTER(vsrc2), GET_REGISTER(vdst)); \
} \
FINISH(2);
diff --git a/vm/mterp/out/InterpC-portable.cpp b/vm/mterp/out/InterpC-portable.cpp
index a43fa8a..61cf8be 100644
--- a/vm/mterp/out/InterpC-portable.cpp
+++ b/vm/mterp/out/InterpC-portable.cpp
@@ -916,7 +916,7 @@
} \
SET_REGISTER##_regsize(vdst, \
((_type*)(void*)arrayObj->contents)[GET_REGISTER(vsrc2)]); \
- ILOGV("+ AGET[%d]=0x%x", GET_REGISTER(vsrc2), GET_REGISTER(vdst)); \
+ ILOGV("+ AGET[%d]=%#x", GET_REGISTER(vsrc2), GET_REGISTER(vdst)); \
} \
FINISH(2);
@@ -1243,7 +1243,7 @@
methodClassDex = curMethod->clazz->pDvmDex;
- LOGVV("threadid=%d: %s.%s pc=0x%x fp=%p",
+ LOGVV("threadid=%d: %s.%s pc=%#x fp=%p",
self->threadId, curMethod->clazz->descriptor, curMethod->name,
pc - curMethod->insns, fp);
diff --git a/vm/mterp/out/InterpC-x86-atom.cpp b/vm/mterp/out/InterpC-x86-atom.cpp
index 2ace55f..a6771db 100644
--- a/vm/mterp/out/InterpC-x86-atom.cpp
+++ b/vm/mterp/out/InterpC-x86-atom.cpp
@@ -964,7 +964,7 @@
} \
SET_REGISTER##_regsize(vdst, \
((_type*)(void*)arrayObj->contents)[GET_REGISTER(vsrc2)]); \
- ILOGV("+ AGET[%d]=0x%x", GET_REGISTER(vsrc2), GET_REGISTER(vdst)); \
+ ILOGV("+ AGET[%d]=%#x", GET_REGISTER(vsrc2), GET_REGISTER(vdst)); \
} \
FINISH(2);
diff --git a/vm/mterp/out/InterpC-x86.cpp b/vm/mterp/out/InterpC-x86.cpp
index 80cae6f..287b666 100644
--- a/vm/mterp/out/InterpC-x86.cpp
+++ b/vm/mterp/out/InterpC-x86.cpp
@@ -964,7 +964,7 @@
} \
SET_REGISTER##_regsize(vdst, \
((_type*)(void*)arrayObj->contents)[GET_REGISTER(vsrc2)]); \
- ILOGV("+ AGET[%d]=0x%x", GET_REGISTER(vsrc2), GET_REGISTER(vdst)); \
+ ILOGV("+ AGET[%d]=%#x", GET_REGISTER(vsrc2), GET_REGISTER(vdst)); \
} \
FINISH(2);
diff --git a/vm/mterp/portable/entry.cpp b/vm/mterp/portable/entry.cpp
index 062de1c..39736da 100644
--- a/vm/mterp/portable/entry.cpp
+++ b/vm/mterp/portable/entry.cpp
@@ -36,7 +36,7 @@
methodClassDex = curMethod->clazz->pDvmDex;
- LOGVV("threadid=%d: %s.%s pc=0x%x fp=%p",
+ LOGVV("threadid=%d: %s.%s pc=%#x fp=%p",
self->threadId, curMethod->clazz->descriptor, curMethod->name,
pc - curMethod->insns, fp);
diff --git a/vm/oo/AccessCheck.cpp b/vm/oo/AccessCheck.cpp
index cac56c4..c50bc45 100644
--- a/vm/oo/AccessCheck.cpp
+++ b/vm/oo/AccessCheck.cpp
@@ -143,7 +143,7 @@
*/
bool dvmCheckFieldAccess(const ClassObject* accessFrom, const Field* field)
{
- //LOGI("CHECK ACCESS from '%s' to field '%s' (in %s) flags=0x%x",
+ //LOGI("CHECK ACCESS from '%s' to field '%s' (in %s) flags=%#x",
// accessFrom->descriptor, field->name,
// field->clazz->descriptor, field->accessFlags);
return checkAccess(accessFrom, field->clazz, field->accessFlags);
diff --git a/vm/test/AtomicTest.cpp b/vm/test/AtomicTest.cpp
index 26ac2bc..c66b897 100644
--- a/vm/test/AtomicTest.cpp
+++ b/vm/test/AtomicTest.cpp
@@ -347,8 +347,8 @@
&failingCasTest) == 0)
dvmFprintf(stdout, "failing test did not fail!\n");
- dvmFprintf(stdout, "andTest = 0x%x\n", andTest);
- dvmFprintf(stdout, "orTest = 0x%x\n", orTest);
+ dvmFprintf(stdout, "andTest = %#x\n", andTest);
+ dvmFprintf(stdout, "orTest = %#x\n", orTest);
dvmFprintf(stdout, "failingCasTest = %d\n", failingCasTest);
#ifdef TEST_BIONIC
