haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

libvixl: Fix format strings for several int64_t values

Browse source 
"%d" or "%x" won't work on hosts where int values are smaller than 64 bit.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Message-id: 1394219753-26106-1-git-send-email-sw@weilnetz.de
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Stefan Weil 2014-03-10 14:56:29 +00:00 committed by Peter Maydell
parent 0624976f61
commit b29c8f115d
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
disas/libvixl/a64/disasm-a64.cc
View file

@ -1342,7 +1342,7 @@ int Disassembler::SubstituteImmediateField(Instruction* instr,
ASSERT(format[5] == 'L'); ASSERT(format[5] == 'L');
AppendToOutput("#0x%" PRIx64, instr->ImmMoveWide()); AppendToOutput("#0x%" PRIx64, instr->ImmMoveWide());
if (instr->ShiftMoveWide() > 0) { if (instr->ShiftMoveWide() > 0) {
AppendToOutput(", lsl #%d", 16 * instr->ShiftMoveWide()); AppendToOutput(", lsl #%" PRId64, 16 * instr->ShiftMoveWide());
} }
} }
return 8; return 8;
@ -1391,7 +1391,7 @@ int Disassembler::SubstituteImmediateField(Instruction* instr,
} }
case 'F': { // IFPSingle, IFPDouble or IFPFBits. case 'F': { // IFPSingle, IFPDouble or IFPFBits.
if (format[3] == 'F') { // IFPFbits. if (format[3] == 'F') { // IFPFbits.
AppendToOutput("#%d", 64 - instr->FPScale()); AppendToOutput("#%" PRId64, 64 - instr->FPScale());
return 8; return 8;
} else { } else {
AppendToOutput("#0x%" PRIx64 " (%.4f)", instr->ImmFP(), AppendToOutput("#0x%" PRIx64 " (%.4f)", instr->ImmFP(),
@ -1412,23 +1412,23 @@ int Disassembler::SubstituteImmediateField(Instruction* instr,
return 5; return 5;
} }
case 'P': { // IP - Conditional compare. case 'P': { // IP - Conditional compare.
AppendToOutput("#%d", instr->ImmCondCmp()); AppendToOutput("#%" PRId64, instr->ImmCondCmp());
return 2; return 2;
} }
case 'B': { // Bitfields. case 'B': { // Bitfields.
return SubstituteBitfieldImmediateField(instr, format); return SubstituteBitfieldImmediateField(instr, format);
} }
case 'E': { // IExtract. case 'E': { // IExtract.
AppendToOutput("#%d", instr->ImmS()); AppendToOutput("#%" PRId64, instr->ImmS());
return 8; return 8;
} }
case 'S': { // IS - Test and branch bit. case 'S': { // IS - Test and branch bit.
AppendToOutput("#%d", (instr->ImmTestBranchBit5() << 5) | AppendToOutput("#%" PRId64, (instr->ImmTestBranchBit5() << 5) |
instr->ImmTestBranchBit40()); instr->ImmTestBranchBit40());
return 2; return 2;
} }
case 'D': { // IDebug - HLT and BRK instructions. case 'D': { // IDebug - HLT and BRK instructions.
AppendToOutput("#0x%x", instr->ImmException()); AppendToOutput("#0x%" PRIx64, instr->ImmException());
return 6; return 6;
} }
default: { default: {
@ -1598,12 +1598,12 @@ int Disassembler::SubstituteExtendField(Instruction* instr,
(((instr->ExtendMode() == UXTW) && (instr->SixtyFourBits() == 0)) || (((instr->ExtendMode() == UXTW) && (instr->SixtyFourBits() == 0)) ||
(instr->ExtendMode() == UXTX))) { (instr->ExtendMode() == UXTX))) {
if (instr->ImmExtendShift() > 0) { if (instr->ImmExtendShift() > 0) {
AppendToOutput(", lsl #%d", instr->ImmExtendShift()); AppendToOutput(", lsl #%" PRId64, instr->ImmExtendShift());
} }
} else { } else {
AppendToOutput(", %s", extend_mode[instr->ExtendMode()]); AppendToOutput(", %s", extend_mode[instr->ExtendMode()]);
if (instr->ImmExtendShift() > 0) { if (instr->ImmExtendShift() > 0) {
AppendToOutput(" #%d", instr->ImmExtendShift()); AppendToOutput(" #%" PRId64, instr->ImmExtendShift());
} }
} }
return 3; return 3;
@ -1632,7 +1632,7 @@ int Disassembler::SubstituteLSRegOffsetField(Instruction* instr,
if (!((ext == UXTX) && (shift == 0))) { if (!((ext == UXTX) && (shift == 0))) {
AppendToOutput(", %s", extend_mode[ext]); AppendToOutput(", %s", extend_mode[ext]);
if (shift != 0) { if (shift != 0) {
AppendToOutput(" #%d", instr->SizeLS()); AppendToOutput(" #%" PRId64, instr->SizeLS());
} }
} }
return 9; return 9;