From c58ba935035cad43e239c1377b3db11a9dd87012 Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Sat, 25 Mar 2017 14:04:02 -0700 Subject: [PATCH] Arm64: Use PRIi64/PRIx64 for printf --- Source/Core/Common/Arm64Emitter.cpp | 42 +++++++++++-------- .../PowerPC/JitArm64/JitArm64_BackPatch.cpp | 3 +- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/Source/Core/Common/Arm64Emitter.cpp b/Source/Core/Common/Arm64Emitter.cpp index 637f7d06c2..68da5d8587 100644 --- a/Source/Core/Common/Arm64Emitter.cpp +++ b/Source/Core/Common/Arm64Emitter.cpp @@ -4,6 +4,7 @@ #include #include +#include #include #include @@ -480,13 +481,13 @@ void ARM64XEmitter::EncodeCompareBranchInst(u32 op, ARM64Reg Rt, const void* ptr bool b64Bit = Is64Bit(Rt); s64 distance = (s64)ptr - (s64)m_code; - _assert_msg_(DYNA_REC, !(distance & 0x3), "%s: distance must be a multiple of 4: %lx", + _assert_msg_(DYNA_REC, !(distance & 0x3), "%s: distance must be a multiple of 4: %" PRIx64, __FUNCTION__, distance); distance >>= 2; _assert_msg_(DYNA_REC, distance >= -0x40000 && distance <= 0x3FFFF, - "%s: Received too large distance: %lx", __FUNCTION__, distance); + "%s: Received too large distance: %" PRIx64, __FUNCTION__, distance); Rt = DecodeReg(Rt); Write32((b64Bit << 31) | (0x34 << 24) | (op << 24) | (((u32)distance << 5) & 0xFFFFE0) | Rt); @@ -497,13 +498,13 @@ void ARM64XEmitter::EncodeTestBranchInst(u32 op, ARM64Reg Rt, u8 bits, const voi bool b64Bit = Is64Bit(Rt); s64 distance = (s64)ptr - (s64)m_code; - _assert_msg_(DYNA_REC, !(distance & 0x3), "%s: distance must be a multiple of 4: %lx", + _assert_msg_(DYNA_REC, !(distance & 0x3), "%s: distance must be a multiple of 4: %" PRIx64, __FUNCTION__, distance); distance >>= 2; _assert_msg_(DYNA_REC, distance >= -0x3FFF && distance < 0x3FFF, - "%s: Received too large distance: %lx", __FUNCTION__, distance); + "%s: Received too large distance: %" PRIx64, __FUNCTION__, distance); Rt = DecodeReg(Rt); Write32((b64Bit << 31) | (0x36 << 24) | (op << 24) | (bits << 19) | @@ -514,13 +515,13 @@ void ARM64XEmitter::EncodeUnconditionalBranchInst(u32 op, const void* ptr) { s64 distance = (s64)ptr - s64(m_code); - _assert_msg_(DYNA_REC, !(distance & 0x3), "%s: distance must be a multiple of 4: %lx", + _assert_msg_(DYNA_REC, !(distance & 0x3), "%s: distance must be a multiple of 4: %" PRIx64, __FUNCTION__, distance); distance >>= 2; _assert_msg_(DYNA_REC, distance >= -0x2000000LL && distance <= 0x1FFFFFFLL, - "%s: Received too large distance: %lx", __FUNCTION__, distance); + "%s: Received too large distance: %" PRIx64, __FUNCTION__, distance); Write32((op << 31) | (0x5 << 26) | (distance & 0x3FFFFFF)); } @@ -902,37 +903,42 @@ void ARM64XEmitter::SetJumpTarget(FixupBranch const& branch) Not = true; case 0: // CBZ { - _assert_msg_(DYNA_REC, IsInRangeImm19(distance), "%s(%d): Received too large distance: %lx", - __FUNCTION__, branch.type, distance); + _assert_msg_(DYNA_REC, IsInRangeImm19(distance), + "%s(%d): Received too large distance: %" PRIx64, __FUNCTION__, branch.type, + distance); bool b64Bit = Is64Bit(branch.reg); ARM64Reg reg = DecodeReg(branch.reg); inst = (b64Bit << 31) | (0x1A << 25) | (Not << 24) | (MaskImm19(distance) << 5) | reg; } break; case 2: // B (conditional) - _assert_msg_(DYNA_REC, IsInRangeImm19(distance), "%s(%d): Received too large distance: %lx", - __FUNCTION__, branch.type, distance); + _assert_msg_(DYNA_REC, IsInRangeImm19(distance), + "%s(%d): Received too large distance: %" PRIx64, __FUNCTION__, branch.type, + distance); inst = (0x2A << 25) | (MaskImm19(distance) << 5) | branch.cond; break; case 4: // TBNZ Not = true; case 3: // TBZ { - _assert_msg_(DYNA_REC, IsInRangeImm14(distance), "%s(%d): Received too large distance: %lx", - __FUNCTION__, branch.type, distance); + _assert_msg_(DYNA_REC, IsInRangeImm14(distance), + "%s(%d): Received too large distance: %" PRIx64, __FUNCTION__, branch.type, + distance); ARM64Reg reg = DecodeReg(branch.reg); inst = ((branch.bit & 0x20) << 26) | (0x1B << 25) | (Not << 24) | ((branch.bit & 0x1F) << 19) | (MaskImm14(distance) << 5) | reg; } break; case 5: // B (uncoditional) - _assert_msg_(DYNA_REC, IsInRangeImm26(distance), "%s(%d): Received too large distance: %lx", - __FUNCTION__, branch.type, distance); + _assert_msg_(DYNA_REC, IsInRangeImm26(distance), + "%s(%d): Received too large distance: %" PRIx64, __FUNCTION__, branch.type, + distance); inst = (0x5 << 26) | MaskImm26(distance); break; case 6: // BL (unconditional) - _assert_msg_(DYNA_REC, IsInRangeImm26(distance), "%s(%d): Received too large distance: %lx", - __FUNCTION__, branch.type, distance); + _assert_msg_(DYNA_REC, IsInRangeImm26(distance), + "%s(%d): Received too large distance: %" PRIx64, __FUNCTION__, branch.type, + distance); inst = (0x25 << 26) | MaskImm26(distance); break; } @@ -1021,8 +1027,8 @@ void ARM64XEmitter::B(CCFlags cond, const void* ptr) distance >>= 2; _assert_msg_(DYNA_REC, IsInRangeImm19(distance), - "%s: Received too large distance: %p->%p %ld %lx", __FUNCTION__, m_code, ptr, - distance, distance); + "%s: Received too large distance: %p->%p %" PRIi64 " %" PRIx64, __FUNCTION__, m_code, + ptr, distance, distance); Write32((0x54 << 24) | (MaskImm19(distance) << 5) | cond); } diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_BackPatch.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_BackPatch.cpp index 2606df9682..64906d7804 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_BackPatch.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_BackPatch.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include #include #include "Common/BitSet.h" @@ -38,7 +39,7 @@ void JitArm64::DoBacktrace(uintptr_t access_address, SContext* ctx) Common::swap32(*(u32*)(pc + 4)), Common::swap32(*(u32*)(pc + 8)), Common::swap32(*(u32*)(pc + 12))); - ERROR_LOG(DYNA_REC, "0x%016lx: %08x %08x %08x %08x", pc, *(u32*)pc, *(u32*)(pc + 4), + ERROR_LOG(DYNA_REC, "0x%016" PRIx64 ": %08x %08x %08x %08x", pc, *(u32*)pc, *(u32*)(pc + 4), *(u32*)(pc + 8), *(u32*)(pc + 12)); }