Fix typo; some progress in ppcbug support

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c27e3ff..23d6a7b 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
 Fri Dec  1 07:23:57 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
 
+       * ppcbug-rom.c (ppcbug_cmds): Turn on MO_GETMEM_READ_SINGLE
+       because PPCbug displays the memory as characters as well as hex.
+       Fix getmem/setmem commands.
+
+       * srec.c (load_srec): Fix off by one typo in last submission.
+
        * rs6000-tdep.c (push_arguments): Fix typo.
 
 Thu Nov 30 23:54:17 1995  Per Bothner  <bothner@kalessin.cygnus.com>

diff --git a/gdb/ppcbug-rom.c b/gdb/ppcbug-rom.c
index e20dc63..044d8b3 100644 (file)
--- a/gdb/ppcbug-rom.c
+++ b/gdb/ppcbug-rom.c
@@ -40,7 +40,6 @@ ppcbug_supply_register (regname, regnamelen, val, vallen)
   if (regnamelen < 2 || regnamelen > 4)
     return;
 
-  fprintf_unfiltered(stderr, "ppcbug_supply_register, %.*s = %.*s\n", regnamelen, regname, vallen, val);
   switch (regname[0])
     {
     case 'R':
@@ -134,7 +133,9 @@ static char *ppcbug_inits[] = {"\r", NULL};
 
 static struct monitor_ops ppcbug_cmds =
 {
-  MO_CLR_BREAK_USES_ADDR,
+                               /* use read single because PPCBUG insists on emiting
+                                  the word in character notation after the hex.  */
+  MO_CLR_BREAK_USES_ADDR | MO_GETMEM_READ_SINGLE,
   ppcbug_inits,                        /* Init strings */
   "g\r",                       /* continue command */
   "t\r",                       /* single step */
@@ -153,10 +154,10 @@ static struct monitor_ops ppcbug_cmds =
     NULL,                      /* setreg.term_cmd */
   },
   {
-    "md %x:%x;b\r",            /* getmem.cmdb (addr, len) */
-    "md %x:%x;b\r",            /* getmem.cmdw (addr, len) */
-    "md %x:%x;b\r",            /* getmem.cmdl (addr, len) */
-    NULL,                      /* getmem.cmdll (addr, len) */
+    "md %x;b\r",               /* getmem.cmdb addr */
+    "md %x;h\r",               /* getmem.cmdw addr */
+    "md %x;w\r",               /* getmem.cmdl addr */
+    "md %x:2;w\r",             /* getmem.cmdll addr */
     " ",                       /* getmem.resp_delim */
     NULL,                      /* getmem.term */
     NULL,                      /* getmem.term_cmd */

diff --git a/gdb/srec.c b/gdb/srec.c
index 96361c0..a16a90b 100644 (file)
--- a/gdb/srec.c
+++ b/gdb/srec.c
@@ -105,7 +105,7 @@ load_srec (desc, file, maxrecsize, flags, hashmark)
     fprintf_unfiltered (gdb_stderr, "%.*s\\r\n", reclen-1, srec);
   SERIAL_WRITE (desc, srec, reclen);
 
-  SERIAL_WRITE (desc, "\r\r", 3); /* Some monitors need these to wake up */
+  SERIAL_WRITE (desc, "\r\r", 2); /* Some monitors need these to wake up */
 
   SERIAL_FLUSH_INPUT (desc);
 }