fix 295799 Missing \n with get_vbits in gdbserver when line is % 80 and there are...

patch from Marc Bessières

Thanks

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12453

diff --git a/NEWS b/NEWS
index b43d8ab1ac9f92e690860b3daff8aa82f4f5bc05..e221491a570187af79cbf1765c927e927858d237 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -56,7 +56,7 @@ https://bugs.kde.org/show_bug.cgi?id=XXXXXX
 where XXXXXX is the bug number as listed below.
 
 247386  make perf does not run all performance tests
-270006 -Valgrind scheduler unfair 
+270006  Valgrind scheduler unfair 
 270796  s390x: Removed broken support for the TS insn
 271438  Fix configure for proper SSE4.2 detection
 273114  s390x: Support TR, TRE, TROO, TROT, TRTO, and TRTT instructions
@@ -76,6 +76,7 @@ where XXXXXX is the bug number as listed below.
 293088  Add some VEX sanity checks for ppc64 unhandled instructions
 294055  regtest none/tests/shell fails when locale is not set to C
 294190  --vgdb-error=xxx can be out of sync with errors shown to the user
+295799  Missing \n with get_vbits in gdbserver when line is % 80 and there are some unaddressable bytes 
 n-i-bz  s390x: Shadow registers can now be examined using vgdb
 
 

diff --git a/memcheck/mc_main.c b/memcheck/mc_main.c
index ccad3bc3514d5517964fc9f16e2c63b51ba9bf2f..d0f0ad87ec4e6b3368bed28dbd27f89dc1693d92 100644 (file)
--- a/memcheck/mc_main.c
+++ b/memcheck/mc_main.c
@@ -5139,8 +5139,10 @@ static Bool handle_gdb_monitor_command (ThreadId tid, Char *req)
                (address+i, (Addr) &vbits, 1, 
                 False, /* get them */
                 False  /* is client request */ ); 
+            /* we are before the first character on next line, print a \n. */
             if ((i % 32) == 0 && i != 0)
                VG_(gdb_printf) ("\n");
+            /* we are before the next block of 4 starts, print a space. */
             else if ((i % 4) == 0 && i != 0)
                VG_(gdb_printf) (" ");
             if (res == 1) {
@@ -5151,8 +5153,7 @@ static Bool handle_gdb_monitor_command (ThreadId tid, Char *req)
                VG_(gdb_printf) ("__");
             }
          }
-         if ((i % 80) != 0)
-            VG_(gdb_printf) ("\n");
+         VG_(gdb_printf) ("\n");
          if (unaddressable) {
             VG_(gdb_printf)
                ("Address %p len %ld has %d bytes unaddressable\n",