[Lldb-commits] [lldb] ec2d0de - [lldb] Remove "0x" prefix from hex values in dirty-pages

[Michał Górny via lldb-commits]

Author: Michał Górny
Date: 2021-10-11T21:04:11+02:00
New Revision: ec2d0ded1b3fc941119935c66576329b9f43a9f1

URL: https://github.com/llvm/llvm-project/commit/ec2d0ded1b3fc941119935c66576329b9f43a9f1
DIFF: https://github.com/llvm/llvm-project/commit/ec2d0ded1b3fc941119935c66576329b9f43a9f1.diff

LOG: [lldb] Remove "0x" prefix from hex values in dirty-pages

Remove the redudant "0x" prefix in the "dirty-pages" key of
qMemoryRegionInfo packet.  The client accepts hex values both with
and without the prefix.

Differential Revision: https://reviews.llvm.org/D110510

Added: 
    

Modified: 
    lldb/test/API/functionalities/gdb_remote_client/TestMemoryRegionDirtyPages.py
    lldb/tools/debugserver/source/RNBRemote.cpp

Removed: 
    


################################################################################
diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestMemoryRegionDirtyPages.py b/lldb/test/API/functionalities/gdb_remote_client/TestMemoryRegionDirtyPages.py
index 38ff267d2c68c..3844699f012b3 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestMemoryRegionDirtyPages.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestMemoryRegionDirtyPages.py
@@ -19,9 +19,9 @@ def qMemoryRegionInfo(self, addr):
                 if addr == 0x100000000:
                     return "start:100000000;size:4000;permissions:rx;dirty-pages:;"
                 if addr == 0x100004000:
-                    return "start:100004000;size:4000;permissions:r;dirty-pages:0x100004000;"
+                    return "start:100004000;size:4000;permissions:r;dirty-pages:100004000;"
                 if addr == 0x1000a2000:
-                    return "start:1000a2000;size:5000;permissions:r;dirty-pages:0x1000a2000,0x1000a3000,0x1000a4000,0x1000a5000,0x1000a6000;"
+                    return "start:1000a2000;size:5000;permissions:r;dirty-pages:1000a2000,1000a3000,1000a4000,1000a5000,1000a6000;"
 
         self.server.responder = MyResponder()
         target = self.dbg.CreateTarget('')

diff  --git a/lldb/tools/debugserver/source/RNBRemote.cpp b/lldb/tools/debugserver/source/RNBRemote.cpp
index dd8b90297995a..035e6bfee4ab9 100644
--- a/lldb/tools/debugserver/source/RNBRemote.cpp
+++ b/lldb/tools/debugserver/source/RNBRemote.cpp
@@ -4306,7 +4306,7 @@ rnb_err_t RNBRemote::HandlePacket_MemoryRegionInfo(const char *p) {
         if (!first)
           ostrm << ",";
         first = false;
-        ostrm << "0x" << std::hex << addr;
+        ostrm << std::hex << addr;
       }
     }
     ostrm << ";";