commit 323655e22ff7c9cceae93678f23e73659b980b1c
author David Spickett <david.spickett@linaro.org> Tue Jul 26 09:04:32 2022 +0000
committer Copybara-Service <copybara-worker@google.com> Tue Jul 26 02:16:26 2022 -0700
tree a344a100e95928df8055c4f3aae72076be2d004a
parent f302f4ff70e52f5b027e6697749ab731f9139bed

[lldb][ARM] Use portable printf tokens for 64 bit types

Fixes some warnings in the 32 bit build.

GitOrigin-RevId: d0479cb29018d9157ef9c90a922ffa09c445aa7d

source/Plugins/Instruction/ARM/EmulationStateARM.cpp

diff --git a/source/Plugins/Instruction/ARM/EmulationStateARM.cpp b/source/Plugins/Instruction/ARM/EmulationStateARM.cpp
index f100647..da679a3 100644
--- a/source/Plugins/Instruction/ARM/EmulationStateARM.cpp
+++ b/source/Plugins/Instruction/ARM/EmulationStateARM.cpp
@@ -274,7 +274,8 @@
   for (int i = 0; match && i < 16; ++i) {
     if (m_vfp_regs.d_regs[i] != other_state.m_vfp_regs.d_regs[i]) {
       match = false;
-      out_stream->Printf("d%d: 0x%lx != 0x%lx\n", i + 16, m_vfp_regs.d_regs[i],
+      out_stream->Printf("d%d: 0x%" PRIx64 " != 0x%" PRIx64 "\n", i + 16,
+                         m_vfp_regs.d_regs[i],
                          other_state.m_vfp_regs.d_regs[i]);
     }
   }
@@ -285,10 +286,10 @@
     out_stream->Printf("memory does not match\n");
     out_stream->Printf("got memory:\n");
     for (auto p : m_memory)
-      out_stream->Printf("0x%08lx: 0x%08x\n", p.first, p.second);
+      out_stream->Printf("0x%08" PRIx64 ": 0x%08x\n", p.first, p.second);
     out_stream->Printf("expected memory:\n");
     for (auto p : other_state.m_memory)
-      out_stream->Printf("0x%08lx: 0x%08x\n", p.first, p.second);
+      out_stream->Printf("0x%08" PRIx64 ": 0x%08x\n", p.first, p.second);
   }
 
   return match;