diff --git a/src/coreclr/jit/codegencommon.cpp b/src/coreclr/jit/codegencommon.cpp index 84760ee846a25..07e03d3e0c233 100644 --- a/src/coreclr/jit/codegencommon.cpp +++ b/src/coreclr/jit/codegencommon.cpp @@ -4806,7 +4806,7 @@ void CodeGen::genEnregisterOSRArgsAndLocals() offset += genSPtoFPdelta(); } - JITDUMP("---OSR--- V%02u (reg) old rbp offset %d old frame %d this frame sp-fp %d new offset %d (%02xH)\n", + JITDUMP("---OSR--- V%02u (reg) old rbp offset %d old frame %d this frame sp-fp %d new offset %d (0x%02x)\n", varNum, stkOffs, originalFrameSize, genSPtoFPdelta(), offset, offset); GetEmitter()->emitIns_R_AR(ins_Load(lclTyp), size, varDsc->GetRegNum(), genFramePointerReg(), offset); diff --git a/src/coreclr/jit/emit.cpp b/src/coreclr/jit/emit.cpp index 4a4de32684fe3..2d55d71a70a78 100644 --- a/src/coreclr/jit/emit.cpp +++ b/src/coreclr/jit/emit.cpp @@ -3532,11 +3532,11 @@ void emitter::emitDispVarSet() if (of < 0) { - printf("-%02XH", -of); + printf("-0x%02X", -of); } else if (of > 0) { - printf("+%02XH", +of); + printf("+0x%02X", +of); } printf("]"); @@ -4113,7 +4113,7 @@ void emitter::emitDispIG(insGroup* ig, bool displayFunc, bool displayInstruction if (jitdump) { - printf("%soffs=%06XH, size=%04XH", separator, ig->igOffs, ig->igSize); + printf("%soffs=0x%06X, size=0x%04X", separator, ig->igOffs, ig->igSize); separator = ", "; } @@ -7121,12 +7121,12 @@ unsigned emitter::emitEndCodeGen(Compiler* comp, #ifdef DEBUG if (emitComp->opts.disAddr) { - printf(" ;; offset=%04XH", emitCurCodeOffs(cp)); + printf(" ;; offset=0x%04X", emitCurCodeOffs(cp)); } else #endif // DEBUG { - printf(" ;; offset=%04XH", emitCurCodeOffs(cp)); + printf(" ;; offset=0x%04X", emitCurCodeOffs(cp)); } } printf("\n"); @@ -7138,7 +7138,7 @@ unsigned emitter::emitEndCodeGen(Compiler* comp, printf("\n%s:", emitLabelString(ig)); if (!emitComp->opts.disDiffable) { - printf(" ;; offset=%04XH", emitCurCodeOffs(cp)); + printf(" ;; offset=0x%04X", emitCurCodeOffs(cp)); } printf("\n"); } diff --git a/src/coreclr/jit/emitarm.cpp b/src/coreclr/jit/emitarm.cpp index 3099b4d869f28..b2ec710777ac3 100644 --- a/src/coreclr/jit/emitarm.cpp +++ b/src/coreclr/jit/emitarm.cpp @@ -5415,7 +5415,7 @@ BYTE* emitter::emitOutputLJ(insGroup* ig, BYTE* dst, instrDesc* i) { size_t sz = 4; // Thumb-2 pretends all instructions are 4-bytes long for computing jump offsets? int distValSize = id->idjShort ? 4 : 8; - printf("; %s jump [%08X/%03u] from %0*X to %0*X: dist = %08XH\n", (dstOffs <= srcOffs) ? "Fwd" : "Bwd", + printf("; %s jump [%08X/%03u] from %0*X to %0*X: dist = 0x%08X\n", (dstOffs <= srcOffs) ? "Fwd" : "Bwd", dspPtr(id), id->idDebugOnlyInfo()->idNum, distValSize, srcOffs + sz, distValSize, dstOffs, distVal); } #endif diff --git a/src/coreclr/jit/emitarm64.cpp b/src/coreclr/jit/emitarm64.cpp index 0c14913364dcc..1c38058d2ec39 100644 --- a/src/coreclr/jit/emitarm64.cpp +++ b/src/coreclr/jit/emitarm64.cpp @@ -10141,7 +10141,7 @@ BYTE* emitter::emitOutputLJ(insGroup* ig, BYTE* dst, instrDesc* i) { size_t sz = 4; int distValSize = id->idjShort ? 4 : 8; - printf("; %s jump [%08X/%03u] from %0*X to %0*X: dist = %08XH\n", (dstOffs <= srcOffs) ? "Fwd" : "Bwd", + printf("; %s jump [%08X/%03u] from %0*X to %0*X: dist = 0x%08X\n", (dstOffs <= srcOffs) ? "Fwd" : "Bwd", dspPtr(id), id->idDebugOnlyInfo()->idNum, distValSize, srcOffs + sz, distValSize, dstOffs, distVal); } #endif diff --git a/src/coreclr/jit/emitxarch.cpp b/src/coreclr/jit/emitxarch.cpp index fcbce344e7a7e..5ef0e20eb9de2 100644 --- a/src/coreclr/jit/emitxarch.cpp +++ b/src/coreclr/jit/emitxarch.cpp @@ -10360,11 +10360,11 @@ void emitter::emitDispFrameRef(int varx, int disp, int offs, bool asmfm) if (addr < 0) { - printf("-%02XH", -addr); + printf("-0x%02X", -addr); } else if (addr > 0) { - printf("+%02XH", addr); + printf("+0x%02X", addr); } } else @@ -10375,17 +10375,17 @@ void emitter::emitDispFrameRef(int varx, int disp, int offs, bool asmfm) if (addr < 0) { - printf("-%02XH", -addr); + printf("-0x%02X", -addr); } else if (addr > 0) { - printf("+%02XH", addr); + printf("+0x%02X", addr); } #if !FEATURE_FIXED_OUT_ARGS if (emitCurStackLvl) - printf("+%02XH", emitCurStackLvl); + printf("+0x%02X", emitCurStackLvl); #endif // !FEATURE_FIXED_OUT_ARGS } @@ -10566,34 +10566,34 @@ void emitter::emitDispAddrMode(instrDesc* id, bool noDetail) } if (frameRef) { - printf("%02XH", (unsigned)disp); + printf("0x%02X", (unsigned)disp); } else if (disp < 1000) { - printf("%02XH", (unsigned)disp); + printf("0x%02X", (unsigned)disp); } else if (disp <= 0xFFFF) { - printf("%04XH", (unsigned)disp); + printf("0x%04X", (unsigned)disp); } else { - printf("%08XH", (unsigned)disp); + printf("0x%08X", (unsigned)disp); } } else if (disp < 0) { if (frameRef) { - printf("-%02XH", (unsigned)-disp); + printf("-0x%02X", (unsigned)-disp); } else if (disp > -1000) { - printf("-%02XH", (unsigned)-disp); + printf("-0x%02X", (unsigned)-disp); } else if (disp >= -0xFFFF) { - printf("-%04XH", (unsigned)-disp); + printf("-0x%04X", (unsigned)-disp); } else if (disp < -0xFFFFFF) { @@ -10601,16 +10601,16 @@ void emitter::emitDispAddrMode(instrDesc* id, bool noDetail) { printf("+"); } - printf("%08XH", (unsigned)disp); + printf("0x%08X", (unsigned)disp); } else { - printf("-%08XH", (unsigned)-disp); + printf("-0x%08X", (unsigned)-disp); } } else if (!nsep) { - printf("%04XH", (unsigned)disp); + printf("0x%04X", (unsigned)disp); } } @@ -15667,7 +15667,7 @@ BYTE* emitter::emitOutputLJ(insGroup* ig, BYTE* dst, instrDesc* i) { size_t sz = id->idjShort ? ssz : lsz; int distValSize = id->idjShort ? 4 : 8; - printf("; %s jump [%08X/%03u] from %0*X to %0*X: dist = %08XH\n", (dstOffs <= srcOffs) ? "Fwd" : "Bwd", + printf("; %s jump [%08X/%03u] from %0*X to %0*X: dist = 0x%08X\n", (dstOffs <= srcOffs) ? "Fwd" : "Bwd", emitComp->dspPtr(id), id->idDebugOnlyInfo()->idNum, distValSize, srcOffs + sz, distValSize, dstOffs, distVal); } diff --git a/src/coreclr/jit/gcencode.cpp b/src/coreclr/jit/gcencode.cpp index 5cf1eece3e47d..96409d4ce904f 100644 --- a/src/coreclr/jit/gcencode.cpp +++ b/src/coreclr/jit/gcencode.cpp @@ -340,11 +340,11 @@ void GCInfo::gcDumpVarPtrDsc(varPtrDsc* desc) if (offs < 0) { - printf("-%02XH", -offs); + printf("-0x%02X", -offs); } else if (offs > 0) { - printf("+%02XH", +offs); + printf("+0x%02X", +offs); } printf("] live from %04X to %04X\n", desc->vpdBegOfs, desc->vpdEndOfs); diff --git a/src/coreclr/jit/gcinfo.cpp b/src/coreclr/jit/gcinfo.cpp index bd2f92400bbac..c139d01d72b86 100644 --- a/src/coreclr/jit/gcinfo.cpp +++ b/src/coreclr/jit/gcinfo.cpp @@ -461,11 +461,11 @@ void GCInfo::gcCountForHeader(UNALIGNED unsigned int* pUntrackedCount, UNALIGNED if (offs < 0) { - printf("-%02XH", -offs); + printf("-0x%02X", -offs); } else if (offs > 0) { - printf("+%02XH", +offs); + printf("+0x%02X", +offs); } printf("]\n"); @@ -500,11 +500,11 @@ void GCInfo::gcCountForHeader(UNALIGNED unsigned int* pUntrackedCount, UNALIGNED if (offs < 0) { - printf("-%02XH", -offs); + printf("-0x%02X", -offs); } else if (offs > 0) { - printf("+%02XH", +offs); + printf("+0x%02X", +offs); } printf("]\n"); diff --git a/src/coreclr/jit/lclvars.cpp b/src/coreclr/jit/lclvars.cpp index 5f6352d8fc2e6..cf0ab866ceaf3 100644 --- a/src/coreclr/jit/lclvars.cpp +++ b/src/coreclr/jit/lclvars.cpp @@ -7394,7 +7394,7 @@ void Compiler::lvaDumpFrameLocation(unsigned lclNum) baseReg = EBPbased ? REG_FPBASE : REG_SPBASE; #endif - printf("[%2s%1s%02XH] ", getRegName(baseReg), (offset < 0 ? "-" : "+"), (offset < 0 ? -offset : offset)); + printf("[%2s%1s0x%02X] ", getRegName(baseReg), (offset < 0 ? "-" : "+"), (offset < 0 ? -offset : offset)); } /*****************************************************************************