Logging and return code fixes.

Greg Clayton · Greg Clayton · commit 5b442374e94a · 2011-07-29T22:26:36.000Z
llvm-svn: 136530
diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp b/lldb/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp
@@ -753,7 +753,7 @@ CommunicationKDP::DumpPacket (Stream &s, const DataExtractor& packet)
                         {
                             const uint32_t error = packet.GetU32 (&offset);
                             const uint32_t count = packet.GetByteSize() - offset;
-                            s.Printf(" (error = 0x%8.8x <0x%x>:\n", error, count); 
+                            s.Printf(" (error = 0x%8.8x:\n", error); 
                             if (count > 0)
                                 packet.Dump (&s,                        // Stream to dump to
                                              offset,                    // Offset within "packet"
@@ -770,7 +770,7 @@ CommunicationKDP::DumpPacket (Stream &s, const DataExtractor& packet)
                         {
                             const uint32_t error = packet.GetU32 (&offset);
                             const uint32_t count = packet.GetByteSize() - offset;
-                            s.Printf(" (error = 0x%8.8x <0x%x> regs:\n", error, count); 
+                            s.Printf(" (error = 0x%8.8x regs:\n", error); 
                             if (count > 0)
                                 packet.Dump (&s,                        // Stream to dump to
                                              offset,                    // Offset within "packet"
@@ -817,7 +817,7 @@ CommunicationKDP::DumpPacket (Stream &s, const DataExtractor& packet)
                         {
                             const uint16_t reply_port = packet.GetU16 (&offset);
                             const uint16_t exc_port = packet.GetU16 (&offset);
-                            s.Printf(" (reply_port=%u, exc_port=%u, greeting=\"%s\")", reply_port, exc_port, packet.GetCStr(&offset));
+                            s.Printf(" (reply_port = %u, exc_port = %u, greeting = \"%s\")", reply_port, exc_port, packet.GetCStr(&offset));
                         }
                         break;
                                  
@@ -845,7 +845,7 @@ CommunicationKDP::DumpPacket (Stream &s, const DataExtractor& packet)
                         {
                             const uint32_t addr = packet.GetU32 (&offset);
                             const uint32_t size = packet.GetU32 (&offset);
-                            s.Printf(" (addr = 0x%8.8x, size=%u)", addr, size);
+                            s.Printf(" (addr = 0x%8.8x, size = %u)", addr, size);
                             m_last_read_memory_addr = addr;
                         }
                         break;
@@ -854,7 +854,7 @@ CommunicationKDP::DumpPacket (Stream &s, const DataExtractor& packet)
                         {
                             const uint32_t addr = packet.GetU32 (&offset);
                             const uint32_t size = packet.GetU32 (&offset);
-                            s.Printf(" (addr = 0x%8.8x, size=%u, bytes:\n", addr, size);
+                            s.Printf(" (addr = 0x%8.8x, size = %u, bytes = \n", addr, size);
                             if (size > 0)
                                 DataExtractor::DumpHexBytes(&s, packet.GetData(&offset, size), size, 32, addr);
                         }
@@ -864,7 +864,7 @@ CommunicationKDP::DumpPacket (Stream &s, const DataExtractor& packet)
                         {
                             const uint64_t addr = packet.GetU64 (&offset);
                             const uint32_t size = packet.GetU32 (&offset);
-                            s.Printf(" (addr = 0x%16.16llx, size=%u)", addr, size);
+                            s.Printf(" (addr = 0x%16.16llx, size = %u)", addr, size);
                             m_last_read_memory_addr = addr;
                         }
                         break;
@@ -873,7 +873,7 @@ CommunicationKDP::DumpPacket (Stream &s, const DataExtractor& packet)
                         {
                             const uint64_t addr = packet.GetU64 (&offset);
                             const uint32_t size = packet.GetU32 (&offset);
-                            s.Printf(" (addr = 0x%16.16llx, size=%u, bytes:", addr, size);
+                            s.Printf(" (addr = 0x%16.16llx, size = %u, bytes = \n", addr, size);
                             if (size > 0)
                                 DataExtractor::DumpHexBytes(&s, packet.GetData(&offset, size), size, 32, addr);
                         }
@@ -883,7 +883,7 @@ CommunicationKDP::DumpPacket (Stream &s, const DataExtractor& packet)
                         {
                             const uint32_t cpu = packet.GetU32 (&offset);
                             const uint32_t flavor = packet.GetU32 (&offset);
-                            s.Printf(" (cpu = %u, flavor=%u)", cpu, flavor);
+                            s.Printf(" (cpu = %u, flavor = %u)", cpu, flavor);
                         }
                         break;
 
@@ -892,7 +892,7 @@ CommunicationKDP::DumpPacket (Stream &s, const DataExtractor& packet)
                             const uint32_t cpu = packet.GetU32 (&offset);
                             const uint32_t flavor = packet.GetU32 (&offset);
                             const uint32_t nbytes = packet.GetByteSize() - offset;
-                            s.Printf(" (cpu = %u, flavor=%u, regs:\n", cpu, flavor);
+                            s.Printf(" (cpu = %u, flavor = %u, regs = \n", cpu, flavor);
                             if (nbytes > 0)
                                 packet.Dump (&s,                        // Stream to dump to
                                              offset,                    // Offset within "packet"
@@ -975,7 +975,7 @@ CommunicationKDP::DumpPacket (Stream &s, const DataExtractor& packet)
                     case KDP_REATTACH:
                         {
                             const uint16_t reply_port = packet.GetU16 (&offset);
-                            s.Printf(" (reply_port=%u)", reply_port);
+                            s.Printf(" (reply_port = %u)", reply_port);
                         }
                         break;
                 }
@@ -1080,7 +1080,12 @@ CommunicationKDP::SendRequestBreakpoint (bool set, addr_t addr)
     
     DataExtractor reply_packet;
     if (SendRequestAndGetReply (command, request_sequence_id, request_packet, reply_packet))
-        return true;
+    {
+        uint32_t offset = 8;
+        uint32_t kdp_error = reply_packet.GetU32 (&offset);        
+        if (kdp_error == 0)
+            return true;
+    }
     return false;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -753,7 +753,7 @@ CommunicationKDP::DumpPacket (Stream &s, const DataExtractor& packet)`
`753`	`753`	`{`
`754`	`754`	`const uint32_t error = packet.GetU32 (&offset);`
`755`	`755`	`const uint32_t count = packet.GetByteSize() - offset;`
`756`		`- s.Printf(" (error = 0x%8.8x <0x%x>:\n", error, count);`
	`756`	`+ s.Printf(" (error = 0x%8.8x:\n", error);`
`757`	`757`	`if (count > 0)`
`758`	`758`	`packet.Dump (&s, // Stream to dump to`
`759`	`759`	`offset, // Offset within "packet"`
`@@ -770,7 +770,7 @@ CommunicationKDP::DumpPacket (Stream &s, const DataExtractor& packet)`
`770`	`770`	`{`
`771`	`771`	`const uint32_t error = packet.GetU32 (&offset);`
`772`	`772`	`const uint32_t count = packet.GetByteSize() - offset;`
`773`		`- s.Printf(" (error = 0x%8.8x <0x%x> regs:\n", error, count);`
	`773`	`+ s.Printf(" (error = 0x%8.8x regs:\n", error);`
`774`	`774`	`if (count > 0)`
`775`	`775`	`packet.Dump (&s, // Stream to dump to`
`776`	`776`	`offset, // Offset within "packet"`
`@@ -817,7 +817,7 @@ CommunicationKDP::DumpPacket (Stream &s, const DataExtractor& packet)`
`817`	`817`	`{`
`818`	`818`	`const uint16_t reply_port = packet.GetU16 (&offset);`
`819`	`819`	`const uint16_t exc_port = packet.GetU16 (&offset);`
`820`		`- s.Printf(" (reply_port=%u, exc_port=%u, greeting=\"%s\")", reply_port, exc_port, packet.GetCStr(&offset));`
	`820`	`+ s.Printf(" (reply_port = %u, exc_port = %u, greeting = \"%s\")", reply_port, exc_port, packet.GetCStr(&offset));`
`821`	`821`	`}`
`822`	`822`	`break;`
`823`	`823`
`@@ -845,7 +845,7 @@ CommunicationKDP::DumpPacket (Stream &s, const DataExtractor& packet)`
`845`	`845`	`{`
`846`	`846`	`const uint32_t addr = packet.GetU32 (&offset);`
`847`	`847`	`const uint32_t size = packet.GetU32 (&offset);`
`848`		`- s.Printf(" (addr = 0x%8.8x, size=%u)", addr, size);`
	`848`	`+ s.Printf(" (addr = 0x%8.8x, size = %u)", addr, size);`
`849`	`849`	`m_last_read_memory_addr = addr;`
`850`	`850`	`}`
`851`	`851`	`break;`
`@@ -854,7 +854,7 @@ CommunicationKDP::DumpPacket (Stream &s, const DataExtractor& packet)`
`854`	`854`	`{`
`855`	`855`	`const uint32_t addr = packet.GetU32 (&offset);`
`856`	`856`	`const uint32_t size = packet.GetU32 (&offset);`
`857`		`- s.Printf(" (addr = 0x%8.8x, size=%u, bytes:\n", addr, size);`
	`857`	`+ s.Printf(" (addr = 0x%8.8x, size = %u, bytes = \n", addr, size);`
`858`	`858`	`if (size > 0)`
`859`	`859`	`DataExtractor::DumpHexBytes(&s, packet.GetData(&offset, size), size, 32, addr);`
`860`	`860`	`}`
`@@ -864,7 +864,7 @@ CommunicationKDP::DumpPacket (Stream &s, const DataExtractor& packet)`
`864`	`864`	`{`
`865`	`865`	`const uint64_t addr = packet.GetU64 (&offset);`
`866`	`866`	`const uint32_t size = packet.GetU32 (&offset);`
`867`		`- s.Printf(" (addr = 0x%16.16llx, size=%u)", addr, size);`
	`867`	`+ s.Printf(" (addr = 0x%16.16llx, size = %u)", addr, size);`
`868`	`868`	`m_last_read_memory_addr = addr;`
`869`	`869`	`}`
`870`	`870`	`break;`
`@@ -873,7 +873,7 @@ CommunicationKDP::DumpPacket (Stream &s, const DataExtractor& packet)`
`873`	`873`	`{`
`874`	`874`	`const uint64_t addr = packet.GetU64 (&offset);`
`875`	`875`	`const uint32_t size = packet.GetU32 (&offset);`
`876`		`- s.Printf(" (addr = 0x%16.16llx, size=%u, bytes:", addr, size);`
	`876`	`+ s.Printf(" (addr = 0x%16.16llx, size = %u, bytes = \n", addr, size);`
`877`	`877`	`if (size > 0)`
`878`	`878`	`DataExtractor::DumpHexBytes(&s, packet.GetData(&offset, size), size, 32, addr);`
`879`	`879`	`}`
`@@ -883,7 +883,7 @@ CommunicationKDP::DumpPacket (Stream &s, const DataExtractor& packet)`
`883`	`883`	`{`
`884`	`884`	`const uint32_t cpu = packet.GetU32 (&offset);`
`885`	`885`	`const uint32_t flavor = packet.GetU32 (&offset);`
`886`		`- s.Printf(" (cpu = %u, flavor=%u)", cpu, flavor);`
	`886`	`+ s.Printf(" (cpu = %u, flavor = %u)", cpu, flavor);`
`887`	`887`	`}`
`888`	`888`	`break;`
`889`	`889`
`@@ -892,7 +892,7 @@ CommunicationKDP::DumpPacket (Stream &s, const DataExtractor& packet)`
`892`	`892`	`const uint32_t cpu = packet.GetU32 (&offset);`
`893`	`893`	`const uint32_t flavor = packet.GetU32 (&offset);`
`894`	`894`	`const uint32_t nbytes = packet.GetByteSize() - offset;`
`895`		`- s.Printf(" (cpu = %u, flavor=%u, regs:\n", cpu, flavor);`
	`895`	`+ s.Printf(" (cpu = %u, flavor = %u, regs = \n", cpu, flavor);`
`896`	`896`	`if (nbytes > 0)`
`897`	`897`	`packet.Dump (&s, // Stream to dump to`
`898`	`898`	`offset, // Offset within "packet"`
`@@ -975,7 +975,7 @@ CommunicationKDP::DumpPacket (Stream &s, const DataExtractor& packet)`
`975`	`975`	`case KDP_REATTACH:`
`976`	`976`	`{`
`977`	`977`	`const uint16_t reply_port = packet.GetU16 (&offset);`
`978`		`- s.Printf(" (reply_port=%u)", reply_port);`
	`978`	`+ s.Printf(" (reply_port = %u)", reply_port);`
`979`	`979`	`}`
`980`	`980`	`break;`
`981`	`981`	`}`
`@@ -1080,7 +1080,12 @@ CommunicationKDP::SendRequestBreakpoint (bool set, addr_t addr)`
`1080`	`1080`
`1081`	`1081`	`DataExtractor reply_packet;`
`1082`	`1082`	`if (SendRequestAndGetReply (command, request_sequence_id, request_packet, reply_packet))`
`1083`		`- return true;`
	`1083`	`+ {`
	`1084`	`+ uint32_t offset = 8;`
	`1085`	`+ uint32_t kdp_error = reply_packet.GetU32 (&offset);`
	`1086`	`+ if (kdp_error == 0)`
	`1087`	`+ return true;`
	`1088`	`+ }`
`1084`	`1089`	`return false;`
`1085`	`1090`	`}`
`1086`	`1091`