Fix the macOS build all the way after r296909.

llvm-svn: 296938

diff --git a/lldb/lldb.xcodeproj/project.pbxproj b/lldb/lldb.xcodeproj/project.pbxproj
index 26c44a5..eca82e8 100644 (file)
--- a/lldb/lldb.xcodeproj/project.pbxproj
+++ b/lldb/lldb.xcodeproj/project.pbxproj
@@ -721,6 +721,7 @@
                4C0083401B9F9BA900D5CF24 /* UtilityFunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C00833F1B9F9BA900D5CF24 /* UtilityFunction.cpp */; };
                4C2479BD1BA39295009C9A7B /* FunctionCaller.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C0083321B9A5DE200D5CF24 /* FunctionCaller.cpp */; };
                4C3ADCD61810D88B00357218 /* BreakpointResolverFileRegex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CAA56141422D986001FFA01 /* BreakpointResolverFileRegex.cpp */; };
+               4C4EB7811E6A4DCC002035C0 /* DumpDataExtractor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C4EB77F1E6A4DB8002035C0 /* DumpDataExtractor.cpp */; };
                4C562CC71CC07DF700C52EAC /* PDBASTParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C562CC21CC07DDD00C52EAC /* PDBASTParser.cpp */; };
                4C56543119D1EFAA002E9C44 /* ThreadPlanPython.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C56543019D1EFAA002E9C44 /* ThreadPlanPython.cpp */; };
                4C56543519D2297A002E9C44 /* SBThreadPlan.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C56543419D2297A002E9C44 /* SBThreadPlan.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -2503,6 +2504,8 @@
                4C43DF8611069BFD00E55CBF /* ThreadPlanStepOverRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThreadPlanStepOverRange.h; path = include/lldb/Target/ThreadPlanStepOverRange.h; sourceTree = "<group>"; };
                4C43DF8911069C3200E55CBF /* ThreadPlanStepInRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ThreadPlanStepInRange.cpp; path = source/Target/ThreadPlanStepInRange.cpp; sourceTree = "<group>"; };
                4C43DF8A11069C3200E55CBF /* ThreadPlanStepOverRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ThreadPlanStepOverRange.cpp; path = source/Target/ThreadPlanStepOverRange.cpp; sourceTree = "<group>"; };
+               4C4EB77F1E6A4DB8002035C0 /* DumpDataExtractor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DumpDataExtractor.cpp; path = source/Core/DumpDataExtractor.cpp; sourceTree = "<group>"; };
+               4C4EB7821E6A4DE7002035C0 /* DumpDataExtractor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DumpDataExtractor.h; path = include/lldb/Core/DumpDataExtractor.h; sourceTree = "<group>"; };
                4C562CC21CC07DDD00C52EAC /* PDBASTParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PDBASTParser.cpp; path = PDB/PDBASTParser.cpp; sourceTree = "<group>"; };
                4C562CC31CC07DDD00C52EAC /* PDBASTParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PDBASTParser.h; path = PDB/PDBASTParser.h; sourceTree = "<group>"; };
                4C56543019D1EFAA002E9C44 /* ThreadPlanPython.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ThreadPlanPython.cpp; path = source/Target/ThreadPlanPython.cpp; sourceTree = "<group>"; };
@@ -4654,6 +4657,8 @@
                                263664921140A4930075843B /* Debugger.cpp */,
                                26BC7D5E10F1B77400F91463 /* Disassembler.h */,
                                26BC7E7610F1B85900F91463 /* Disassembler.cpp */,
+                               4C4EB7821E6A4DE7002035C0 /* DumpDataExtractor.h */,
+                               4C4EB77F1E6A4DB8002035C0 /* DumpDataExtractor.cpp */,
                                26BC7D5F10F1B77400F91463 /* dwarf.h */,
                                26D9FDC612F784E60003F2EE /* EmulateInstruction.h */,
                                26D9FDC812F784FD0003F2EE /* EmulateInstruction.cpp */,
@@ -7226,6 +7231,7 @@
                                2689007713353E1A00698AC0 /* CFCData.cpp in Sources */,
                                2689007813353E1A00698AC0 /* CFCMutableArray.cpp in Sources */,
                                9418EBCD1AA910910058B02E /* VectorType.cpp in Sources */,
+                               4C4EB7811E6A4DCC002035C0 /* DumpDataExtractor.cpp in Sources */,
                                2689007913353E1A00698AC0 /* CFCMutableDictionary.cpp in Sources */,
                                2689007A13353E1A00698AC0 /* CFCMutableSet.cpp in Sources */,
                                26764C971E48F482008D3573 /* ConstString.cpp in Sources */,

diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp b/lldb/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp
index 0a480cf..1226941 100644 (file)
--- a/lldb/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp
+++ b/lldb/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp
@@ -859,15 +859,17 @@ void CommunicationKDP::DumpPacket(Stream &s, const DataExtractor &packet) {
           const uint32_t count = packet.GetByteSize() - offset;
           s.Printf(" (error = 0x%8.8x:\n", error);
           if (count > 0)
-            packet.Dump(&s,                      // Stream to dump to
-                        offset,                  // Offset within "packet"
-                        eFormatBytesWithASCII,   // Format to use
-                        1,                       // Size of each item in bytes
-                        count,                   // Number of items
-                        16,                      // Number per line
-                        m_last_read_memory_addr, // Don't show addresses before
-                                                 // each line
-                        0, 0);                   // No bitfields
+            DumpDataExtractor(packet, 
+                              &s,                      // Stream to dump to
+                              offset,                  // Offset within "packet"
+                              eFormatBytesWithASCII,   // Format to use
+                              1,                       // Size of each item 
+                                                       // in bytes
+                              count,                   // Number of items
+                              16,                      // Number per line
+                              m_last_read_memory_addr, // Don't show addresses
+                                                       // before each line
+                              0, 0);                   // No bitfields
         } break;
 
         case KDP_READREGS: {
@@ -875,15 +877,19 @@ void CommunicationKDP::DumpPacket(Stream &s, const DataExtractor &packet) {
           const uint32_t count = packet.GetByteSize() - offset;
           s.Printf(" (error = 0x%8.8x regs:\n", error);
           if (count > 0)
-            packet.Dump(
-                &s,                       // Stream to dump to
-                offset,                   // Offset within "packet"
-                eFormatHex,               // Format to use
-                m_addr_byte_size,         // Size of each item in bytes
-                count / m_addr_byte_size, // Number of items
-                16 / m_addr_byte_size,    // Number per line
-                LLDB_INVALID_ADDRESS, // Don't show addresses before each line
-                0, 0);                // No bitfields
+            DumpDataExtractor(packet, 
+                              &s,                       // Stream to dump to
+                              offset,                   // Offset within "packet"
+                              eFormatHex,               // Format to use
+                              m_addr_byte_size,         // Size of each item 
+                                                        // in bytes
+                              count / m_addr_byte_size, // Number of items
+                              16 / m_addr_byte_size,    // Number per line
+                              LLDB_INVALID_ADDRESS, 
+                                                        // Don't 
+                                                        // show addresses before
+                                                        // each line
+                              0, 0);                    // No bitfields
         } break;
 
         case KDP_KERNELVERSION: {
@@ -906,29 +912,32 @@ void CommunicationKDP::DumpPacket(Stream &s, const DataExtractor &packet) {
           const uint32_t count = packet.GetByteSize() - offset;
           s.Printf(" (error = 0x%8.8x io:\n", error);
           if (count > 0)
-            packet.Dump(
-                &s,                   // Stream to dump to
-                offset,               // Offset within "packet"
-                eFormatHex,           // Format to use
-                1,                    // Size of each item in bytes
-                count,                // Number of items
-                16,                   // Number per line
-                LLDB_INVALID_ADDRESS, // Don't show addresses before each line
-                0, 0);                // No bitfields
+            DumpDataExtractor(packet, 
+                              &s,                   // Stream to dump to
+                              offset,               // Offset within "packet"
+                              eFormatHex,           // Format to use
+                              1,                    // Size of each item in bytes
+                              count,                // Number of items
+                              16,                   // Number per line
+                              LLDB_INVALID_ADDRESS, // Don't show addresses 
+                                                    // before each line
+                              0, 0);                // No bitfields
         } break;
         case KDP_DUMPINFO: {
           const uint32_t count = packet.GetByteSize() - offset;
           s.Printf(" (count = %u, bytes = \n", count);
           if (count > 0)
-            packet.Dump(
-                &s,                   // Stream to dump to
-                offset,               // Offset within "packet"
-                eFormatHex,           // Format to use
-                1,                    // Size of each item in bytes
-                count,                // Number of items
-                16,                   // Number per line
-                LLDB_INVALID_ADDRESS, // Don't show addresses before each line
-                0, 0);                // No bitfields
+            DumpDataExtractor(packet, 
+                              &s,                   // Stream to dump to
+                              offset,               // Offset within "packet"
+                              eFormatHex,           // Format to use
+                              1,                    // Size of each item in 
+                                                    // bytes
+                              count,                // Number of items
+                              16,                   // Number per line
+                              LLDB_INVALID_ADDRESS, // Don't show addresses 
+                                                    // before each line
+                              0, 0);                // No bitfields
 
         } break;
 
@@ -1026,15 +1035,18 @@ void CommunicationKDP::DumpPacket(Stream &s, const DataExtractor &packet) {
           const uint32_t nbytes = packet.GetByteSize() - offset;
           s.Printf(" (cpu = %u, flavor = %u, regs = \n", cpu, flavor);
           if (nbytes > 0)
-            packet.Dump(
-                &s,                        // Stream to dump to
-                offset,                    // Offset within "packet"
-                eFormatHex,                // Format to use
-                m_addr_byte_size,          // Size of each item in bytes
-                nbytes / m_addr_byte_size, // Number of items
-                16 / m_addr_byte_size,     // Number per line
-                LLDB_INVALID_ADDRESS, // Don't show addresses before each line
-                0, 0);                // No bitfields
+            DumpDataExtractor(packet, 
+                              &s,                        // Stream to dump to
+                              offset,                    // Offset within 
+                                                         // "packet"
+                              eFormatHex,                // Format to use
+                              m_addr_byte_size,          // Size of each item in 
+                                                         // bytes
+                              nbytes / m_addr_byte_size, // Number of items
+                              16 / m_addr_byte_size,     // Number per line
+                              LLDB_INVALID_ADDRESS,      // Don't show addresses
+                                                         // before each line
+                              0, 0);                // No bitfields
         } break;
 
         case KDP_BREAKPOINT_SET:
@@ -1129,15 +1141,17 @@ void CommunicationKDP::DumpPacket(Stream &s, const DataExtractor &packet) {
           s.Printf(" (address=0x%8.8x, lcpu=0x%4.4x, nbytes=0x%8.8x)", lcpu,
                    address, nbytes);
           if (nbytes > 0)
-            packet.Dump(
-                &s,                   // Stream to dump to
-                offset,               // Offset within "packet"
-                eFormatHex,           // Format to use
-                1,                    // Size of each item in bytes
-                nbytes,               // Number of items
-                16,                   // Number per line
-                LLDB_INVALID_ADDRESS, // Don't show addresses before each line
-                0, 0);                // No bitfields
+            DumpDataExtractor(packet, 
+                              &s,                   // Stream to dump to
+                              offset,               // Offset within "packet"
+                              eFormatHex,           // Format to use
+                              1,                    // Size of each item in 
+                                                    // bytes
+                              nbytes,               // Number of items
+                              16,                   // Number per line
+                              LLDB_INVALID_ADDRESS, // Don't show addresses 
+                                                    // before each line
+                              0, 0);                // No bitfields
         } break;
 
         case KDP_READIOPORT: {
@@ -1155,22 +1169,24 @@ void CommunicationKDP::DumpPacket(Stream &s, const DataExtractor &packet) {
           s.Printf(" (lcpu = %u, addr = 0x%4.4x, nbytes = %u, bytes = \n", lcpu,
                    address, nbytes);
           if (nbytes > 0)
-            packet.Dump(
-                &s,                   // Stream to dump to
-                offset,               // Offset within "packet"
-                eFormatHex,           // Format to use
-                1,                    // Size of each item in bytes
-                nbytes,               // Number of items
-                16,                   // Number per line
-                LLDB_INVALID_ADDRESS, // Don't show addresses before each line
-                0, 0);                // No bitfields
+            DumpDataExtractor(packet, 
+                              &s,                   // Stream to dump to
+                              offset,               // Offset within "packet"
+                              eFormatHex,           // Format to use
+                              1,                    // Size of each item in 
+                                                    // bytes
+                              nbytes,               // Number of items
+                              16,                   // Number per line
+                              LLDB_INVALID_ADDRESS, // Don't show addresses 
+                                                    // before each line
+                              0, 0);                // No bitfields
         } break;
 
         case KDP_DUMPINFO: {
           const uint32_t count = packet.GetByteSize() - offset;
           s.Printf(" (count = %u, bytes = \n", count);
           if (count > 0)
-            packet.Dump(
+            DumpDataExtractor(packet, 
                 &s,                   // Stream to dump to
                 offset,               // Offset within "packet"
                 eFormatHex,           // Format to use
@@ -1191,14 +1207,17 @@ void CommunicationKDP::DumpPacket(Stream &s, const DataExtractor &packet) {
   if (error_desc) {
     s.PutCString(error_desc);
 
-    packet.Dump(&s,                   // Stream to dump to
-                0,                    // Offset into "packet"
-                eFormatBytes,         // Dump as hex bytes
-                1,                    // Size of each item is 1 for single bytes
-                packet.GetByteSize(), // Number of bytes
-                UINT32_MAX,           // Num bytes per line
-                LLDB_INVALID_ADDRESS, // Base address
-                0, 0); // Bitfield info set to not do anything bitfield related
+    DumpDataExtractor(packet,
+                      &s,                   // Stream to dump to
+                      0,                    // Offset into "packet"
+                      eFormatBytes,         // Dump as hex bytes
+                      1,                    // Size of each item is 1 for 
+                                            // single bytes
+                      packet.GetByteSize(), // Number of bytes
+                      UINT32_MAX,           // Num bytes per line
+                      LLDB_INVALID_ADDRESS, // Base address
+                      0, 0);                // Bitfield info set to not do  
+                                            // anything bitfield related
   }
 }