Fix problems introduced with my last change.

[deliverable/binutils-gdb.git] / gdb / monitor.c

diff --git a/gdb/monitor.c b/gdb/monitor.c
index e57c010383db00f9da113274488d1e9a5fb5877a..a9bd5026c2603bdf4a4b805d6bae066d426444cd 100644 (file)
--- a/gdb/monitor.c
+++ b/gdb/monitor.c
@@ -50,7 +50,7 @@
 #include "monitor.h"
 #include "gdbcmd.h"
 #include "inferior.h"
-#include "gnu-regex.h"
+#include "gdb_regex.h"
 #include "dcache.h"
 #include "srec.h"
 
@@ -1206,11 +1206,14 @@ monitor_fetch_register (regno)
      int regno;
 {
   char *name;
-  static char zerobuf[MAX_REGISTER_RAW_SIZE] =
-  {0};
-  char regbuf[MAX_REGISTER_RAW_SIZE * 2 + 1];
+  char *zerobuf;
+  char *regbuf;
   int i;
 
+  regbuf  = alloca (MAX_REGISTER_RAW_SIZE * 2 + 1);
+  zerobuf = alloca (MAX_REGISTER_RAW_SIZE);
+  memset (zerobuf, 0, MAX_REGISTER_RAW_SIZE);
+
   name = current_monitor->regnames[regno];
   monitor_debug ("MON fetchreg %d '%s'\n", regno, name ? name : "(null name)");
 
@@ -2410,15 +2413,11 @@ When enabled, a hashmark \'#\' is displayed.",
                                  &setlist),
                     &showlist);
 
-#if 0
-  /* FIXME: cagney/1999-10-07: Wait until there is a generic ``set
-     debug ...'' rather than another ``set ...debug'' command. */
   add_show_from_set
-    (add_set_cmd ("monitordebug", no_class, var_zinteger,
+    (add_set_cmd ("monitor", no_class, var_zinteger,
                  (char *) &monitor_debug_p,
                  "Set debugging of remote monitor communication.\n\
 When enabled, communication between GDB and the remote monitor\n\
-is displayed.", &setlist),
-     &showlist);
-#endif
+is displayed.", &setdebuglist),
+     &showdebuglist);
 }