expose 64 bit addresses through MI

[ki.stfu]

Summary

This changes all reporting of addresses from lldb-mi to be 64 bit capable. There could have been cases where a 64 bit address was getting truncated to 32 bit format.

Patch from [e-mail]

[zturner]

Hi Chuck, can you resubmit this patch attached to the other review? The
workflow isn't entirely obvious, but there's a couple of things you need to
do different.

1. When you create the diff with the suggested changes, create the diff

against origin (or whatever you created the *original* patch against), not
against the first version of the patch. So if HEAD is the first version of
the patch you uploaded, create your diff against HEAD~1. You want the new
patch to contain the changes _plus_ the original patch.

2. When you attach the patch to Phabricator, you'll get a combo box and the

default value is "Create new revision". Change this to "Attach to existing
revision" and then choose the entry for the first patch you uploaded.

[zturner]

Ahh, sorry. It seems I was the one that was confused then. Sorry for the
noise.

[abidh]

Looks good.

[ki.stfu]

In D8238#138685, @abidh wrote:

Looks good.

Should we print address as "%016llx" everywhere? Previously I supposed that we should use %08llx for 32bit & %016llx for 64bit app.

[ki.stfu]

As you may understood, I'm not sure about this patch.
In addition, if we should use %016 everywhere, we should fix it everywhere and it'll be nice to do in one patch.

[abidh]

In D8238#138694, @ki.stfu wrote:

As you may understood, I'm not sure about this patch.
In addition, if we should use %016 everywhere, we should fix it everywhere and it'll be nice to do in one patch.

I also thought about that when testing the patch. The address in some frame was printed as 32-bit. It will be a good cleanup going forward.

[ChuckR]

These are the files that have the string '%08' in them, should I fix all of them up as part of this patch?

.//MICmdCmdBreak.cpp:    // "^done,bkpt={number=\"%d\",type=\"breakpoint\",disp=\"%s\",enabled=\"%c\",addr=\"0x%08x\",func=\"%s\",file=\"%s\",fullname=\"%s/%s\",line=\"%d\",thread-groups=[\"%s\"],times=\"%d\",original-location=\"%s\"}"
.//MICmdCmdData.cpp:        // MI "{address=\"0x%08llx\",func-name=\"%s\",offset=\"%lld\",inst=\"%s %s\"}"
.//MICmdCmdData.cpp:        const CMICmnMIValueConst miValueConst(CMIUtilString::Format("0x%08llx", addr));
.//MICmdCmdData.cpp:    // MI: memory=[{begin=\"0x%08x\",offset=\"0x%08x\",end=\"0x%08x\",contents=\" \" }]"
.//MICmdCmdData.cpp:    const CMICmnMIValueConst miValueConst(CMIUtilString::Format("0x%08llx", m_nAddrStart));
.//MICmdCmdData.cpp:    const CMICmnMIValueConst miValueConst2(CMIUtilString::Format("0x%08llx", m_nAddrOffset));
.//MICmdCmdData.cpp:    const CMICmnMIValueConst miValueConst3(CMIUtilString::Format("0x%08llx", m_nAddrStart + m_nAddrNumBytesToRead));
.//MICmdCmdGdbInfo.cpp:                  rStdout.TextToStdout(CMIUtilString::Format("~\"0x%08x\t0x%08x\t%s\t\t%s\"", addrLoadS, addrLoadS + addrLoadSize,
.//MICmnLLDBDebuggerHandleEvents.cpp:    // MI print "=breakpoint-modified,bkpt={number=\"%d\",type=\"breakpoint\",disp=\"%s\",enabled=\"%c\",addr=\"0x%08x\",
.//MICmnLLDBDebuggerHandleEvents.cpp:        // "=breakpoint-modified,bkpt={number=\"%d\",type=\"breakpoint\",disp=\"%s\",enabled=\"%c\",addr=\"0x%08x\",func=\"%s\",file=\"%s\",fullname=\"%s/%s\",line=\"%d\",times=\"%d\",original-location=\"%s\"}"
.//MICmnLLDBDebuggerHandleEvents.cpp:        // "=breakpoint-created,bkpt={number=\"%d\",type=\"breakpoint\",disp=\"%s\",enabled=\"%c\",addr=\"0x%08x\",func=\"%s\",file=\"%s\",fullname=\"%s/%s\",line=\"%d\",times=\"%d\",original-location=\"%s\"}"
.//MICmnLLDBDebuggerHandleEvents.cpp:    // "*stopped,reason=\"breakpoint-hit\",disp=\"del\",bkptno=\"%d\",frame={addr=\"0x%08x\",func=\"%s\",args=[],file=\"%s\",fullname=\"%s\",line=\"%d\"},thread-id=\"%d\",stopped-threads=\"all\""
.//MICmnLLDBDebuggerHandleEvents.cpp:    // frame={addr=\"0x%08x\",func=\"%s\",args=[],file=\"%s\",fullname=\"%s\",line=\"%d\"}
.//MICmnLLDBDebuggerHandleEvents.cpp:    // "*stopped,reason=\"end-stepping-range\",frame={addr=\"0x%08x\",func=\"%s\",args=[\"%s\"],file=\"%s\",fullname=\"%s\",line=\"%d\"},thread-id=\"%d\",stopped-threads=\"all\""
.//MICmnLLDBDebugSessionInfo.cpp:    // "frame={level=\"%d\",addr=\"0x%08llx\",func=\"%s\",args=[%s],file=\"%s\",fullname=\"%s\",line=\"%d\"},frame={level=\"%d\",addr=\"0x%08llx\",func=\"%s\",args=[%s],file=\"%s\",fullname=\"%s\",line=\"%d\"},
.//MICmnLLDBDebugSessionInfo.cpp:    // "frame={level=\"%d\",addr=\"0x%08llx\",func=\"%s\",args=[%s],file=\"%s\",fullname=\"%s\",line=\"%d\"},frame={level=\"%d\",addr=\"0x%08llx\",func=\"%s\",args=[%s],file=\"%s\",fullname=\"%s\",line=\"%d\"},
.//MICmnLLDBDebugSessionInfo.cpp:    // MI print "{level=\"0\",addr=\"0x%08llx\",func=\"%s\",file=\"%s\",fullname=\"%s\",line=\"%d\"}"
.//MICmnLLDBDebugSessionInfo.cpp:    const CMIUtilString strAddr(CMIUtilString::Format("0x%08llx", vPc));
.//MICmnLLDBDebugSessionInfo.cpp:    const CMIUtilString strAddr(CMIUtilString::Format("0x%08llx", vPc));
.//MICmnLLDBDebugSessionInfo.cpp:    // MI print "=breakpoint-modified,bkpt={number=\"%d\",type=\"breakpoint\",disp=\"%s\",enabled=\"%c\",addr=\"0x%08x\",
.//MICmnResources.cpp:    {IDS_CMD_ERR_LLDB_ERR_NOT_READ_WHOLE_BLK, "Command '%s'. LLDB unable to read entire memory block of %u bytes at address 0x%08x"},
.//MICmnResources.cpp:    {IDS_CMD_ERR_LLDB_ERR_READ_MEM_BYTES, "Command '%s'. Unable to read memory block of %u bytes at address 0x%08x: %s "},
.//MICmnResources.cpp:    {IDS_CMD_ERR_LLDB_ERR_READ_MEM_BYTES, "Command '%s'. Unable to write memory block of %u bytes at address 0x%08x: %s "},
.//MICmnResources.cpp:    {IDS_CMD_ERR_LLDB_ERR_NOT_WRITE_WHOLEBLK, "Command '%s'. LLDB unable to write entire memory block of %u bytes at address 0x%08x"},

[ChuckR]

Fixed all the places I could find.

[ki.stfu]

In some places address is printed as "int" instead of "long long". I suppose that we should use "%llx" instead of "%x".

But perhaps would be better to use PRIx64 (or PRIxPTR) macro.

tools/lldb-mi/MICmdCmdBreak.cpp

337

address should be printed as a long long value:

addr=\"0x%016llx\"

tools/lldb-mi/MICmdCmdData.cpp

642

address should be printed as a long long value:

begin=\"0x%016llx\",offset=...,end=...

tools/lldb-mi/MICmdCmdGdbInfo.cpp

212

I am worried about how it will work in case of 32 bit arch.

232

address should be printed as a long long value:

~\"0x%016llx\t0x%016llx\t..."

tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp

1091

address should be printed as a long long value:

addr=\"0x%016llx\"

tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp

348

address should be printed as a long long value:

addr=\"0x%016llx\"

444

address should be printed as a long long value:

addr=\"0x%016llx\"

466

address should be printed as a long long value:

addr=\"0x%016llx\"

1278

address should be printed as a long long value:

addr=\"0x%016llx\"

1290

address should be printed as a long long value:

addr=\"0x%016llx\"

1355

address should be printed as a long long value:

addr=\"0x%016llx\"

tools/lldb-mi/MICmnResources.cpp

255–256

address should be printed as a long long value

261–262

address should be printed as a long long value

[zturner]

You must use PRIx64 for 64 bit types. %ll isn't right on windows

[zturner]

Or PRIxPTR as you said. Definitely not %ll though

[ki.stfu]

In D8238#140458, @zturner wrote:

Or PRIxPTR as you said. Definitely not %ll though

It depends on how an address type was specified. If it's uint64_t then use PRIx64, but if it was specified like "void*" then use PRIxPTR.

[ChuckR]

I am now using the PRIx64 macro in all locations. I checked and made sure that every type being used is either an MIUint64 or and lldb::addr_t, both of with are uint64s. I also noticed that IDS_CMD_ERR_LLDB_ERR_READ_MEM_BYTES was being initialized twice, and switched the second initialization to the correct IDS_CMD_ERR_LLDB_ERR_NOT_WRITE_WHOLEBLK

[ki.stfu]

lgtm apart few comments

tools/lldb-mi/MICmdCmdData.cpp

21

#include <inttypes.h> // For PRIx64

tools/lldb-mi/MICmdCmdGdbInfo.cpp

13

#include <inttypes.h> // For PRIx64

tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp

11

#include <inttypes.h> // For PRIx64

tools/lldb-mi/MICmnResources.cpp

11

#include <inttypes.h> // For PRIx64

[ChuckR]

I fixed the comments based on feedback from Ilia K. Can somebody please check this in on my behalf?

[ki.stfu]

In D8238#143408, @ChuckR wrote:

I fixed the comments based on feedback from Ilia K. Can somebody please check this in on my behalf?

Yes, I can.

[ki.stfu]

Fix MiDataTestCase.test_lldbmi_data_disassemble

test/tools/lldb-mi/data/TestMiData.py

def test_lldbmi_data_disassemble(self):
 
         # Get an address for disassembling: use main
         self.runCmd("-data-evaluate-expression main")
         self.expect("\^done,value=\"0x[0-9a-f]+\"")
         addr = int(self.child.after.split("\"")[1], 16)
 
         # Test -data-disassemble: try to disassemble some address
         self.runCmd("-data-disassemble -s %#x -e %#x -- 0" % (addr, addr + 0x10))
-        self.expect("\^done,asm_insns=\[{address=\"0x%08x\",func-name=\"main\",offset=\"0\",size=\"[1-9]+\",inst=\".+\"}," % addr)
+        self.expect("\^done,asm_insns=\[{address=\"0x0*%x\",func-name=\"main\",offset=\"0\",size=\"[1-9]+\",inst=\".+\"}," % addr)
 
     @lldbmi_test
     @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for windows")
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @unittest2.skip("-data-evaluate-expression doesn't work") #FIXME: the global case worked before refactoring
     def test_lldbmi_data_read_memory_bytes(self):
         """Test that 'lldb-mi --interpreter' works for -data-read-memory-bytes."""
 

tools/lldb-mi/MICmdCmdBreak.cpp

CMICmdCmdBreakInsert::Acknowledge(void)
     sBrkPtInfo.m_nIgnore = m_nBrkPtIgnoreCount;
     sBrkPtInfo.m_bPending = m_bBrkPtIsPending;
     sBrkPtInfo.m_bCondition = m_bBrkPtCondition;
     sBrkPtInfo.m_strCondition = m_brkPtCondition;
     sBrkPtInfo.m_bBrkPtThreadId = m_bBrkPtThreadId;
     sBrkPtInfo.m_nBrkPtThreadId = m_nBrkPtThreadId;
 
     // MI print
-    // "^done,bkpt={number=\"%d\",type=\"breakpoint\",disp=\"%s\",enabled=\"%c\",addr=\"0x%08x\",func=\"%s\",file=\"%s\",fullname=\"%s/%s\",line=\"%d\",thread-groups=[\"%s\"],times=\"%d\",original-location=\"%s\"}"
+    // "^done,bkpt={number=\"%d\",type=\"breakpoint\",disp=\"%s\",enabled=\"%c\",addr=\"0x%016" PRIx64 "\",func=\"%s\",file=\"%s\",fullname=\"%s/%s\",line=\"%d\",thread-groups=[\"%s\"],times=\"%d\",original-location=\"%s\"}"
     CMICmnMIValueTuple miValueTuple;
     if (!rSessionInfo.MIResponseFormBrkPtInfo(sBrkPtInfo, miValueTuple))
     {
         return MIstatus::failure;
     }
 
     const CMICmnMIValueResult miValueResultD("bkpt", miValueTuple);
     const CMICmnMIResultRecord miRecordResult(m_cmdData.strMiCmdToken, CMICmnMIResultRecord::eResultClass_Done, miValueResultD);
     m_miResultRecord = miRecordResult;
 
     return MIstatus::success;
 }
 
 //++ ------------------------------------------------------------------------------------
 // Details: Required by the CMICmdFactory when registering *this command. The factory
 //          calls this function to create an instance of *this command.
 // Type:    Static method.
 // Args:    None.

tools/lldb-mi/MICmdCmdData.cpp

 //              CMICmdCmdDataReadMemory             implementation.
 //              CMICmdCmdDataListRegisterNames      implementation.
 //              CMICmdCmdDataListRegisterValues     implementation.
 //              CMICmdCmdDataListRegisterChanged    implementation.
 //              CMICmdCmdDataWriteMemoryBytes       implementation.
 //              CMICmdCmdDataWriteMemory            implementation.
 
 // Third Party Headers:
+#include <inttypes.h> // For PRIx64
 #include "lldb/API/SBThread.h"
 #include "lldb/API/SBInstruction.h"
 #include "lldb/API/SBInstructionList.h"
 #include "lldb/API/SBStream.h"
 
 // In-house headers:
 #include "MICmdCmdData.h"
 #include "MICmnMIResultRecord.h"
for (size_t i = 0; i < nInstructions; i++)
         lldb::addr_t addr = address.GetLoadAddress(sbTarget);
         const MIchar *pFnName = address.GetFunction().GetName();
         pFnName = (pFnName != nullptr) ? pFnName : pUnknown;
         lldb::addr_t addrOffSet = address.GetOffset() - start_offset;
         const MIchar *pStrOperands = instrt.GetOperands(sbTarget);
         pStrOperands = (pStrOperands != nullptr) ? pStrOperands : pUnknown;
         const size_t instrtSize = instrt.GetByteSize();
 
-        // MI "{address=\"0x%08llx\",func-name=\"%s\",offset=\"%lld\",inst=\"%s %s\"}"
-        const CMICmnMIValueConst miValueConst(CMIUtilString::Format("0x%08llx", addr));
+        // MI "{address=\"0x%016" PRIx64 "\",func-name=\"%s\",offset=\"%lld\",inst=\"%s %s\"}"
+        const CMICmnMIValueConst miValueConst(CMIUtilString::Format("0x%016" PRIx64, addr));
         const CMICmnMIValueResult miValueResult("address", miValueConst);
         CMICmnMIValueTuple miValueTuple(miValueResult);
         const CMICmnMIValueConst miValueConst2(pFnName);
         const CMICmnMIValueResult miValueResult2("func-name", miValueConst2);
         miValueTuple.Add(miValueResult2);
         const CMICmnMIValueConst miValueConst3(CMIUtilString::Format("%lld", addrOffSet));
         const CMICmnMIValueResult miValueResult3("offset", miValueConst3);
         miValueTuple.Add(miValueResult3);

 // Args:    None.
 // Return:  MIstatus::success - Functional succeeded.
 //          MIstatus::failure - Functional failed.
 // Throws:  None.
 //--
 bool
 CMICmdCmdDataReadMemoryBytes::Acknowledge(void)
 {
-    // MI: memory=[{begin=\"0x%08x\",offset=\"0x%08x\",end=\"0x%08x\",contents=\" \" }]"
-    const CMICmnMIValueConst miValueConst(CMIUtilString::Format("0x%08llx", m_nAddrStart));
+    // MI: memory=[{begin=\"0x%016" PRIx64 "\",offset=\"0x%016" PRIx64" \",end=\"0x%016" PRIx64 "\",contents=\" \" }]"
+    const CMICmnMIValueConst miValueConst(CMIUtilString::Format("0x%016" PRIx64, m_nAddrStart));
     const CMICmnMIValueResult miValueResult("begin", miValueConst);
     CMICmnMIValueTuple miValueTuple(miValueResult);
-    const CMICmnMIValueConst miValueConst2(CMIUtilString::Format("0x%08llx", m_nAddrOffset));
+    const CMICmnMIValueConst miValueConst2(CMIUtilString::Format("0x%016" PRIx64, m_nAddrOffset));
     const CMICmnMIValueResult miValueResult2("offset", miValueConst2);
     miValueTuple.Add(miValueResult2);
-    const CMICmnMIValueConst miValueConst3(CMIUtilString::Format("0x%08llx", m_nAddrStart + m_nAddrNumBytesToRead));
+    const CMICmnMIValueConst miValueConst3(CMIUtilString::Format("0x%016" PRIx64, m_nAddrStart + m_nAddrNumBytesToRead));
     const CMICmnMIValueResult miValueResult3("end", miValueConst3);
     miValueTuple.Add(miValueResult3);
 
     // MI: contents=\" \"
     CMIUtilString strContent;
     strContent.reserve((m_nAddrNumBytesToRead << 1) + 1);
     for (MIuint64 i = 0; i < m_nAddrNumBytesToRead; i++)
     {
         strContent += CMIUtilString::Format("%02hhx", m_pBufferMemory[i]);
     }

tools/lldb-mi/MICmdCmdGdbInfo.cpp

 //===-- MICmdCmdGdbInfo.cpp ------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 // Overview:    CMICmdCmdGdbInfo        implementation.
 
 // Third party headers:
+#include <inttypes.h> // For PRIx64
 #include "lldb/API/SBCommandReturnObject.h"
 
 // In-house headers:
 #include "MICmdCmdGdbInfo.h"
 #include "MICmnMIResultRecord.h"
 #include "MICmnMIValueConst.h"
 #include "MICmdArgValString.h"
 #include "MICmnStreamStdout.h"
CMICmdCmdGdbInfo::PrintFnSharedLibrary(void)
     {
         lldb::SBModule module = sbTarget.GetModuleAtIndex(i);
         if (module.IsValid())
         {
             const CMIUtilString strModuleFilePath(module.GetFileSpec().GetDirectory());
             const CMIUtilString strModuleFileName(module.GetFileSpec().GetFilename());
             const CMIUtilString strModuleFullPath(CMIUtilString::Format("%s/%s", strModuleFilePath.c_str(), strModuleFileName.c_str()));
             const CMIUtilString strHasSymbols = (module.GetNumSymbols() > 0) ? "Yes" : "No";
-            lldb::addr_t addrLoadS = 0xffffffff;
+            lldb::addr_t addrLoadS = 0xffffffffffffffff;
             lldb::addr_t addrLoadSize = 0;
             bool bHaveAddrLoad = false;
             const MIuint nSections = module.GetNumSections();
             for (MIuint j = 0; j < nSections; j++)
             {
                 lldb::SBSection section = module.GetSectionAtIndex(j);
                 lldb::addr_t addrLoad = section.GetLoadAddress(sbTarget);
                 if (addrLoad != (lldb::addr_t) - 1)
                 {
                     if (!bHaveAddrLoad)
                     {
                         bHaveAddrLoad = true;
                         addrLoadS = addrLoad;
                     }
 
                     addrLoadSize += section.GetByteSize();
                 }
             }
             bOk = bOk &&
-                  rStdout.TextToStdout(CMIUtilString::Format("~\"0x%08x\t0x%08x\t%s\t\t%s\"", addrLoadS, addrLoadS + addrLoadSize,
+                  rStdout.TextToStdout(CMIUtilString::Format("~\"0x%016" PRIx64 "\t0x%016" PRIx64 "\t%s\t\t%s\"", addrLoadS, addrLoadS + addrLoadSize,
                                                              strHasSymbols.c_str(), strModuleFullPath.c_str()));
         }
     }
 
     return bOk;
 }

tools/lldb-mi/MICmnLLDBDebugSessionInfo.h

struct SBrkPtInfo
             , m_nBrkPtThreadId(0)
         {
         }
 
         MIuint m_id;                    // LLDB break point ID.
         CMIUtilString m_strType;        // Break point type.
         bool m_bDisp;                   // True = "del", false = "keep".
         bool m_bEnabled;                // True = enabled, false = disabled break point.
-        MIuint m_pc;                    // Address number.
+        lldb::addr_t m_pc;              // Address number.
         CMIUtilString m_fnName;         // Function name.
         CMIUtilString m_fileName;       // File name text.
         CMIUtilString m_path;           // Full file name and path text.
         MIuint m_nLine;                 // File line number.
         bool m_bHaveArgOptionThreadGrp; // True = include MI field, false = do not include "thread-groups".
         CMIUtilString m_strOptThrdGrp;  // Thread group number.
         MIuint m_nTimes;                // The count of the breakpoint existence.
         CMIUtilString m_strOrigLoc;     // The name of the break point.

tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp

 //===-- MICmnLLDBDebugSessionInfo.cpp ---------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 // Third party headers:
+#include <inttypes.h> // For PRIx64
 #include "lldb/API/SBThread.h"
 #ifdef _WIN32
 #include <io.h> // For the ::_access()
 #else
 #include <unistd.h> // For the ::access()
 #endif              // _WIN32
 #include "lldb/API/SBBreakpointLocation.h"
 
if (nFrames == 0)
         // MI print "frame={}"
         CMICmnMIValueTuple miValueTuple;
         CMICmnMIValueResult miValueResult("frame", miValueTuple);
         vwrThreadFrames = miValueResult.GetString();
         return MIstatus::success;
     }
 
     // MI print
-    // "frame={level=\"%d\",addr=\"0x%08llx\",func=\"%s\",args=[%s],file=\"%s\",fullname=\"%s\",line=\"%d\"},frame={level=\"%d\",addr=\"0x%08llx\",func=\"%s\",args=[%s],file=\"%s\",fullname=\"%s\",line=\"%d\"},
+    // "frame={level=\"%d\",addr=\"0x%016" PRIx64 "\",func=\"%s\",args=[%s],file=\"%s\",fullname=\"%s\",line=\"%d\"},frame={level=\"%d\",addr=\"0x%016" PRIx64 "\",func=\"%s\",args=[%s],file=\"%s\",fullname=\"%s\",line=\"%d\"},
     // ..."
     CMIUtilString strListCommaSeperated;
     for (MIuint nLevel = 0; nLevel < nFrames; nLevel++)
     {
         lldb::SBFrame frame = thread.GetFrameAtIndex(nLevel);
         lldb::addr_t pc = 0;
         CMIUtilString fnName;
         CMIUtilString fileName;
if (nFrames == 0)
         // MI print "frame={}"
         CMICmnMIValueTuple miValueTuple;
         CMICmnMIValueResult miValueResult("frame", miValueTuple);
         vwrThreadFrames = miValueResult.GetString();
         return MIstatus::success;
     }
 
     // MI print
-    // "frame={level=\"%d\",addr=\"0x%08llx\",func=\"%s\",args=[%s],file=\"%s\",fullname=\"%s\",line=\"%d\"},frame={level=\"%d\",addr=\"0x%08llx\",func=\"%s\",args=[%s],file=\"%s\",fullname=\"%s\",line=\"%d\"},
+    // "frame={level=\"%d\",addr=\"0x%016" PRIx64 "\",func=\"%s\",args=[%s],file=\"%s\",fullname=\"%s\",line=\"%d\"},frame={level=\"%d\",addr=\"0x%016" PRIx64 "\",func=\"%s\",args=[%s],file=\"%s\",fullname=\"%s\",line=\"%d\"},
     // ..."
     CMIUtilString strListCommaSeperated;
     for (MIuint nLevel = 0; nLevel < nFrames; nLevel++)
     {
         lldb::SBFrame frame = thread.GetFrameAtIndex(nLevel);
         lldb::addr_t pc = 0;
         CMIUtilString fnName;
         CMIUtilString fileName;
CMICmnLLDBDebugSessionInfo::MIResponseFormFrameInfo(const lldb::SBThread &vrThread, const MIuint vnLevel,
     lldb::addr_t pc = 0;
     CMIUtilString fnName;
     CMIUtilString fileName;
     CMIUtilString path;
     MIuint nLine = 0;
     if (!GetFrameInfo(frame, pc, fnName, fileName, path, nLine))
         return MIstatus::failure;
 
-    // MI print "{level=\"0\",addr=\"0x%08llx\",func=\"%s\",file=\"%s\",fullname=\"%s\",line=\"%d\"}"
+    // MI print "{level=\"0\",addr=\"0x%016" PRIx64 "\",func=\"%s\",file=\"%s\",fullname=\"%s\",line=\"%d\"}"
     const CMIUtilString strLevel(CMIUtilString::Format("%d", vnLevel));
     const CMICmnMIValueConst miValueConst(strLevel);
     const CMICmnMIValueResult miValueResult("level", miValueConst);
     CMICmnMIValueTuple miValueTuple(miValueResult);
     if (!MIResponseFormFrameInfo(pc, fnName, fileName, path, nLine, miValueTuple))
         return MIstatus::failure;
 
     vwrMiValueTuple = miValueTuple;

 // Return:  MIstatus::success - Functional succeeded.
 //          MIstatus::failure - Functional failed.
 // Throws:  None.
 //--
 bool
 CMICmnLLDBDebugSessionInfo::MIResponseFormFrameInfo(const lldb::addr_t vPc, const CMIUtilString &vFnName, const CMIUtilString &vFileName,
                                                     const CMIUtilString &vPath, const MIuint vnLine, CMICmnMIValueTuple &vwrMiValueTuple)
 {
-    const CMIUtilString strAddr(CMIUtilString::Format("0x%08llx", vPc));
+    const CMIUtilString strAddr(CMIUtilString::Format("0x%016" PRIx64, vPc));
     const CMICmnMIValueConst miValueConst2(strAddr);
     const CMICmnMIValueResult miValueResult2("addr", miValueConst2);
     if (!vwrMiValueTuple.Add(miValueResult2))
         return MIstatus::failure;
     const CMICmnMIValueConst miValueConst3(vFnName);
     const CMICmnMIValueResult miValueResult3("func", miValueConst3);
     if (!vwrMiValueTuple.Add(miValueResult3))
         return MIstatus::failure;

 //          MIstatus::failure - Functional failed.
 // Throws:  None.
 //--
 bool
 CMICmnLLDBDebugSessionInfo::MIResponseFormFrameInfo2(const lldb::addr_t vPc, const CMIUtilString &vArgInfo, const CMIUtilString &vFnName,
                                                      const CMIUtilString &vFileName, const CMIUtilString &vPath, const MIuint vnLine,
                                                      CMICmnMIValueTuple &vwrMiValueTuple)
 {
-    const CMIUtilString strAddr(CMIUtilString::Format("0x%08llx", vPc));
+    const CMIUtilString strAddr(CMIUtilString::Format("0x%016" PRIx64, vPc));
     const CMICmnMIValueConst miValueConst2(strAddr);
     const CMICmnMIValueResult miValueResult2("addr", miValueConst2);
     if (!vwrMiValueTuple.Add(miValueResult2))
         return MIstatus::failure;
     const CMICmnMIValueConst miValueConst3(vFnName);
     const CMICmnMIValueResult miValueResult3("func", miValueConst3);
     if (!vwrMiValueTuple.Add(miValueResult3))
         return MIstatus::failure;

 //          vwrMIValueTuple - (W) MI value tuple object.
 // Return:  MIstatus::success - Functional succeeded.
 //          MIstatus::failure - Functional failed.
 // Throws:  None.
 //--
 bool
 CMICmnLLDBDebugSessionInfo::MIResponseFormBrkPtFrameInfo(const SBrkPtInfo &vrBrkPtInfo, CMICmnMIValueTuple &vwrMiValueTuple)
 {
-    const CMIUtilString strAddr(CMIUtilString::Format("0x%08llx", vrBrkPtInfo.m_pc));
+    const CMIUtilString strAddr(CMIUtilString::Format("0x%016" PRIx64, vrBrkPtInfo.m_pc));
     const CMICmnMIValueConst miValueConst2(strAddr);
     const CMICmnMIValueResult miValueResult2("addr", miValueConst2);
     if (!vwrMiValueTuple.Add(miValueResult2))
         return MIstatus::failure;
     const CMICmnMIValueConst miValueConst3(vrBrkPtInfo.m_fnName);
     const CMICmnMIValueResult miValueResult3("func", miValueConst3);
     if (!vwrMiValueTuple.Add(miValueResult3))
         return MIstatus::failure;

 //          vwrMIValueTuple - (W) MI value tuple object.
 // Return:  MIstatus::success - Functional succeeded.
 //          MIstatus::failure - Functional failed.
 // Throws:  None.
 //--
 bool
 CMICmnLLDBDebugSessionInfo::MIResponseFormBrkPtInfo(const SBrkPtInfo &vrBrkPtInfo, CMICmnMIValueTuple &vwrMiValueTuple)
 {
-    // MI print "=breakpoint-modified,bkpt={number=\"%d\",type=\"breakpoint\",disp=\"%s\",enabled=\"%c\",addr=\"0x%08x\",
+    // MI print "=breakpoint-modified,bkpt={number=\"%d\",type=\"breakpoint\",disp=\"%s\",enabled=\"%c\",addr=\"0x%016" PRIx64 "\",
     // func=\"%s\",file=\"%s\",fullname=\"%s/%s\",line=\"%d\",times=\"%d\",original-location=\"%s\"}"
 
     // "number="
     const CMICmnMIValueConst miValueConst(CMIUtilString::Format("%d", vrBrkPtInfo.m_id));
     const CMICmnMIValueResult miValueResult("number", miValueConst);
     CMICmnMIValueTuple miValueTuple(miValueResult);
     // "type="
     const CMICmnMIValueConst miValueConst2(vrBrkPtInfo.m_strType);
     const CMICmnMIValueResult miValueResult2("type", miValueConst2);
     bool bOk = miValueTuple.Add(miValueResult2);
     // "disp="
     const CMICmnMIValueConst miValueConst3(vrBrkPtInfo.m_bDisp ? "del" : "keep");
     const CMICmnMIValueResult miValueResult3("disp", miValueConst3);
     bOk = bOk && miValueTuple.Add(miValueResult3);
     // "enabled="
     const CMICmnMIValueConst miValueConst4(vrBrkPtInfo.m_bEnabled ? "y" : "n");
     const CMICmnMIValueResult miValueResult4("enabled", miValueConst4);
     bOk = bOk && miValueTuple.Add(miValueResult4);
     // "addr="

tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp

CMICmnLLDBDebuggerHandleEvents::HandleEventSBBreakpointCmn(const lldb::SBEvent &vEvent)
     sBrkPtInfo.m_strOrigLoc = sBrkPtInfoRec.m_strOrigLoc;
     sBrkPtInfo.m_nIgnore = sBrkPtInfoRec.m_nIgnore;
     sBrkPtInfo.m_bPending = sBrkPtInfoRec.m_bPending;
     sBrkPtInfo.m_bCondition = sBrkPtInfoRec.m_bCondition;
     sBrkPtInfo.m_strCondition = sBrkPtInfoRec.m_strCondition;
     sBrkPtInfo.m_bBrkPtThreadId = sBrkPtInfoRec.m_bBrkPtThreadId;
     sBrkPtInfo.m_nBrkPtThreadId = sBrkPtInfoRec.m_nBrkPtThreadId;
 
-    // MI print "=breakpoint-modified,bkpt={number=\"%d\",type=\"breakpoint\",disp=\"%s\",enabled=\"%c\",addr=\"0x%08x\",
+    // MI print "=breakpoint-modified,bkpt={number=\"%d\",type=\"breakpoint\",disp=\"%s\",enabled=\"%c\",addr=\"0x%016" PRIx64 "\",
     // func=\"%s\",file=\"%s\",fullname=\"%s/%s\",line=\"%d\",times=\"%d\",original-location=\"%s\"}"
     CMICmnMIValueTuple miValueTuple;
     if (!rSessionInfo.MIResponseFormBrkPtInfo(sBrkPtInfo, miValueTuple))
     {
         SetErrorDescription(CMIUtilString::Format(MIRSRC(IDS_LLDBOUTOFBAND_ERR_FORM_MI_RESPONSE), "HandleEventSBBreakpointCmn()"));
         return MIstatus::failure;
     }
 
     const CMICmnMIValueResult miValueResultC("bkpt", miValueTuple);
     const CMICmnMIOutOfBandRecord miOutOfBandRecord(CMICmnMIOutOfBandRecord::eOutOfBand_BreakPointModified, miValueResultC);
     const bool bOk = MiOutOfBandRecordToStdout(miOutOfBandRecord);
 
     return bOk;
 }
 
 //++ ------------------------------------------------------------------------------------
 // Details: Handle a LLDB SBBreakpoint added event.
 //          Add more breakpoint information or overwrite existing information.
 //          Normally a break point session info objects exists by now when an MI command
 //          was issued to insert a break so the retrieval would normally always succeed
if (!rSessionInfo.MIResponseFormBrkPtInfo(sBrkPtInfo, miValueTuple))
         SetErrorDescription(CMIUtilString::Format(MIRSRC(IDS_LLDBOUTOFBAND_ERR_FORM_MI_RESPONSE), "HandleEventSBBreakpointAdded()"));
         return MIstatus::failure;
     }
 
     bool bOk = MIstatus::success;
     if (bBrkPtExistAlready)
     {
         // MI print
-        // "=breakpoint-modified,bkpt={number=\"%d\",type=\"breakpoint\",disp=\"%s\",enabled=\"%c\",addr=\"0x%08x\",func=\"%s\",file=\"%s\",fullname=\"%s/%s\",line=\"%d\",times=\"%d\",original-location=\"%s\"}"
+        // "=breakpoint-modified,bkpt={number=\"%d\",type=\"breakpoint\",disp=\"%s\",enabled=\"%c\",addr=\"0x%016" PRIx64 "\",func=\"%s\",file=\"%s\",fullname=\"%s/%s\",line=\"%d\",times=\"%d\",original-location=\"%s\"}"
         const CMICmnMIValueResult miValueResult("bkpt", miValueTuple);
         const CMICmnMIOutOfBandRecord miOutOfBandRecord(CMICmnMIOutOfBandRecord::eOutOfBand_BreakPointModified, miValueResult);
         bOk = MiOutOfBandRecordToStdout(miOutOfBandRecord);
     }
     else
     {
         // CODETAG_LLDB_BRKPT_ID_MAX
         if (brkPt.GetID() > (lldb::break_id_t)rSessionInfo.m_nBrkPointCntMax)
         {
             SetErrorDescription(CMIUtilString::Format(MIRSRC(IDS_CMD_ERR_BRKPT_CNT_EXCEEDED), "HandleEventSBBreakpointAdded()",
                                                       rSessionInfo.m_nBrkPointCntMax, sBrkPtInfo.m_id));
             return MIstatus::failure;
         }
         if (!rSessionInfo.RecordBrkPtInfo(brkPt.GetID(), sBrkPtInfo))
         {
             SetErrorDescription(
                 CMIUtilString::Format(MIRSRC(IDS_LLDBOUTOFBAND_ERR_BRKPT_INFO_SET), "HandleEventSBBreakpointAdded()", sBrkPtInfo.m_id));
             return MIstatus::failure;
         }
 
         // MI print
-        // "=breakpoint-created,bkpt={number=\"%d\",type=\"breakpoint\",disp=\"%s\",enabled=\"%c\",addr=\"0x%08x\",func=\"%s\",file=\"%s\",fullname=\"%s/%s\",line=\"%d\",times=\"%d\",original-location=\"%s\"}"
+        // "=breakpoint-created,bkpt={number=\"%d\",type=\"breakpoint\",disp=\"%s\",enabled=\"%c\",addr=\"0x%016" PRIx64 "\",func=\"%s\",file=\"%s\",fullname=\"%s/%s\",line=\"%d\",times=\"%d\",original-location=\"%s\"}"
         const CMICmnMIValueResult miValueResult("bkpt", miValueTuple);
         const CMICmnMIOutOfBandRecord miOutOfBandRecord(CMICmnMIOutOfBandRecord::eOutOfBand_BreakPointCreated, miValueResult);
         bOk = MiOutOfBandRecordToStdout(miOutOfBandRecord);
     }
 
     return bOk;
 }
 
 //++ ------------------------------------------------------------------------------------
 // Details: Handle a LLDB SBThread event.
 // Type:    Method.
 // Args:    vEvent  - (R) An LLDB broadcast event.
 // Return:  MIstatus::success - Functionality succeeded.
 //          MIstatus::failure - Functionality failed.
 // Throws:  None.
 //--
 bool
 CMICmnLLDBDebuggerHandleEvents::HandleEventSBThread(const lldb::SBEvent &vEvent)
 {
     if (!ChkForStateChanges())
CMICmnLLDBDebuggerHandleEvents::MiStoppedAtBreakPoint(const MIuint64 vBrkPtId, const lldb::SBBreakpoint &vBrkPt)
     MIuint nLine = 0;
     if (!rSession.GetFrameInfo(frame, pc, fnName, fileName, path, nLine))
     {
         SetErrorDescription(CMIUtilString::Format(MIRSRC(IDS_LLDBOUTOFBAND_ERR_FRAME_INFO_GET), "MiStoppedAtBreakPoint()"));
         return MIstatus::failure;
     }
 
     // MI print
-    // "*stopped,reason=\"breakpoint-hit\",disp=\"del\",bkptno=\"%d\",frame={addr=\"0x%08x\",func=\"%s\",args=[],file=\"%s\",fullname=\"%s\",line=\"%d\"},thread-id=\"%d\",stopped-threads=\"all\""
+    // "*stopped,reason=\"breakpoint-hit\",disp=\"del\",bkptno=\"%d\",frame={addr=\"0x%016" PRIx64 "\",func=\"%s\",args=[],file=\"%s\",fullname=\"%s\",line=\"%d\"},thread-id=\"%d\",stopped-threads=\"all\""
     const CMICmnMIValueConst miValueConst("breakpoint-hit");
     const CMICmnMIValueResult miValueResult("reason", miValueConst);
     CMICmnMIOutOfBandRecord miOutOfBandRecord(CMICmnMIOutOfBandRecord::eOutOfBand_Stopped, miValueResult);
     const CMICmnMIValueConst miValueConstA("del");
     const CMICmnMIValueResult miValueResultA("disp", miValueConstA);
     bOk = miOutOfBandRecord.Add(miValueResultA);
     const CMIUtilString strBkp(CMIUtilString::Format("%d", vBrkPtId));
     const CMICmnMIValueConst miValueConstB(strBkp);
     CMICmnMIValueResult miValueResultB("bkptno", miValueConstB);
     bOk = bOk && miOutOfBandRecord.Add(miValueResultB);
 
-    // frame={addr=\"0x%08x\",func=\"%s\",args=[],file=\"%s\",fullname=\"%s\",line=\"%d\"}
+    // frame={addr=\"0x%016" PRIx64 "\",func=\"%s\",args=[],file=\"%s\",fullname=\"%s\",line=\"%d\"}
     if (bOk)
     {
         CMICmnMIValueList miValueList(true);
         const MIuint maskVarTypes = CMICmnLLDBDebugSessionInfo::eVariableType_Arguments;
         bOk = rSession.MIResponseFormVariableInfo2(frame, maskVarTypes, CMICmnLLDBDebugSessionInfo::eVariableInfoFormat_AllValues, miValueList);
 
         CMICmnMIValueTuple miValueTuple;
         bOk = bOk && rSession.MIResponseFormFrameInfo2(pc, miValueList.GetString(), fnName, fileName, path, nLine, miValueTuple);
         const CMICmnMIValueResult miValueResult8("frame", miValueTuple);
         bOk = bOk && miOutOfBandRecord.Add(miValueResult8);
     }
 
     // Add to MI thread-id=\"%d\",stopped-threads=\"all\"
     if (bOk)
     {
         const CMIUtilString strThreadId(CMIUtilString::Format("%d", thread.GetIndexID()));
         const CMICmnMIValueConst miValueConst8(strThreadId);
         const CMICmnMIValueResult miValueResult8("thread-id", miValueConst8);
if (nFrame == 0)
         bOk = MiOutOfBandRecordToStdout(miOutOfBandRecord);
         bOk = bOk && TextToStdout("(gdb)");
         return bOk;
     }
 
     CMICmnLLDBDebugSessionInfo &rSession = CMICmnLLDBDebugSessionInfo::Instance();
 
     // MI print
-    // "*stopped,reason=\"end-stepping-range\",frame={addr=\"0x%08x\",func=\"%s\",args=[\"%s\"],file=\"%s\",fullname=\"%s\",line=\"%d\"},thread-id=\"%d\",stopped-threads=\"all\""
+    // "*stopped,reason=\"end-stepping-range\",frame={addr=\"0x%016" PRIx64 "\",func=\"%s\",args=[\"%s\"],file=\"%s\",fullname=\"%s\",line=\"%d\"},thread-id=\"%d\",stopped-threads=\"all\""
     lldb::SBFrame frame = thread.GetFrameAtIndex(0);
     lldb::addr_t pc = 0;
     CMIUtilString fnName;
     CMIUtilString fileName;
     CMIUtilString path;
     MIuint nLine = 0;
     if (!rSession.GetFrameInfo(frame, pc, fnName, fileName, path, nLine))
     {
         SetErrorDescription(CMIUtilString::Format(MIRSRC(IDS_LLDBOUTOFBAND_ERR_FRAME_INFO_GET), "HandleProcessEventStopReasonTrace()"));
         return MIstatus::failure;
     }
 
     // Function args
     CMICmnMIValueList miValueList(true);
     const MIuint maskVarTypes = CMICmnLLDBDebugSessionInfo::eVariableType_Arguments;
     if (!rSession.MIResponseFormVariableInfo2(frame, maskVarTypes, CMICmnLLDBDebugSessionInfo::eVariableInfoFormat_AllValues, miValueList))
         return MIstatus::failure;
     CMICmnMIValueTuple miValueTuple;

tools/lldb-mi/MICmnResources.cpp

 //===-- MICmnResources.cpp --------------------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 // Third party headers
+#include <inttypes.h> // For PRIx64
 #include "assert.h"
 
 // In-house headers:
 #include "MICmnResources.h"
 
 // Instantiations:
 const CMICmnResources::SRsrcTextData CMICmnResources::ms_pResourceId2TextData[] = {
     {IDS_PROJNAME, "LLDB Machine Interface Driver (MI) All rights reserved"},
const CMICmnResources::SRsrcTextData CMICmnResources::ms_pResourceId2TextData[] = {
     {IDS_CMD_ERR_VARIABLE_ENUM_INVALID, "Command '%s'. Invalid enumeration for variable '%s' formatted string '%s'"},
     {IDS_CMD_ERR_VARIABLE_EXPRESSIONPATH, "Command '%s'. Failed to get expression for variable '%s'"},
     {IDS_CMD_ERR_VARIABLE_CREATION_FAILED, "Failed to create variable object for '%s'"},
     {IDS_CMD_ERR_CMD_RUN_BUT_NO_ACTION, "<Error: Command run but command did not do anything useful. No MI response formed>"},
     {IDS_CMD_ERR_EVENT_HANDLED_BUT_NO_ACTION, "<Error: Command run and event caught, did nothing useful. No MI Out-of-Bound formed>"},
     {IDS_CMD_ERR_DISASM_ADDR_START_INVALID, "Command '%s'. Invalid start value '%s'"},
     {IDS_CMD_ERR_DISASM_ADDR_END_INVALID, "Command '%s'. Invalid end value '%s'"},
     {IDS_CMD_ERR_MEMORY_ALLOC_FAILURE, "Command '%s'. Failed to allocate memory %d bytes"},
-    {IDS_CMD_ERR_LLDB_ERR_NOT_READ_WHOLE_BLK, "Command '%s'. LLDB unable to read entire memory block of %u bytes at address 0x%08x"},
-    {IDS_CMD_ERR_LLDB_ERR_READ_MEM_BYTES, "Command '%s'. Unable to read memory block of %u bytes at address 0x%08x: %s "},
+    {IDS_CMD_ERR_LLDB_ERR_NOT_READ_WHOLE_BLK, "Command '%s'. LLDB unable to read entire memory block of %u bytes at address 0x%016" PRIx64 },
+    {IDS_CMD_ERR_LLDB_ERR_READ_MEM_BYTES, "Command '%s'. Unable to read memory block of %u bytes at address 0x%016" PRIx64 ": %s "},
     {IDS_CMD_ERR_INVALID_PROCESS, "Command '%s'. Invalid process during debug session"},
     {IDS_CMD_ERR_INVALID_PRINT_VALUES, "Command '%s'. Unknown value for PRINT_VALUES: must be: 0 or \"--no-values\", 1 or \"--all-values\", 2 or \"--simple-values\""},
     {IDS_CMD_ERR_INVALID_FORMAT_TYPE, "Command '%s'. Invalid var format type '%s'"},
     {IDS_CMD_ERR_BRKPT_INFO_OBJ_NOT_FOUND, "Command '%s'. Breakpoint information for breakpoint ID %d not found"},
-    {IDS_CMD_ERR_LLDB_ERR_READ_MEM_BYTES, "Command '%s'. Unable to write memory block of %u bytes at address 0x%08x: %s "},
-    {IDS_CMD_ERR_LLDB_ERR_NOT_WRITE_WHOLEBLK, "Command '%s'. LLDB unable to write entire memory block of %u bytes at address 0x%08x"},
+    {IDS_CMD_ERR_LLDB_ERR_WRITE_MEM_BYTES, "Command '%s'. Unable to write memory block of %u bytes at address 0x%016" PRIx64 ": %s "},
+    {IDS_CMD_ERR_LLDB_ERR_NOT_WRITE_WHOLEBLK, "Command '%s'. LLDB unable to write entire memory block of %u bytes at address 0x%016" PRIX64},
     {IDS_CMD_ERR_SET_NEW_DRIVER_STATE, "Command '%s'. Command tried to set new MI Driver running state and failed. %s"},
     {IDS_CMD_ERR_INFO_PRINTFN_NOT_FOUND, "The request '%s' was not recogised, not implemented"},
     {IDS_CMD_ERR_INFO_PRINTFN_FAILED, "The request '%s' failed."},
     {IDS_CMD_ERR_GDBSET_OPT_SOLIBSEARCHPATH, "'solib-search-path' requires at least one argument"}};
 
 //++ ------------------------------------------------------------------------------------
 // Details: CMICmnResources constructor.
 // Type:    Method.
 // Args:    None.
 // Return:  None.
 // Throws:  None.
 //--
 CMICmnResources::CMICmnResources(void)
     : m_nResourceId2TextDataSize(0)
 {
     // Do not use this constructor, use Initialize()
 }
 
 //++ ------------------------------------------------------------------------------------
 // Details: CMICmnResources destructor.
 // Type:    Overridden.
 // Args:    None.
 // Return:  None.
 // Throws:  None.
 //--