[RFA] Ooopsie in mi/mi-main.c

[RFA] Ooopsie in mi/mi-main.c

[Joel Brobecker]

[-- Attachment #1: Type: text/plain, Size: 649 bytes --]

The following change broke the build:

        * mi-main.c (mi_cmd_exec_return): Don't use
        return_command_wrapper, use return_command instead.
        (mi_cmd_exec_interrupt): Don't use
        interrupt_target_command_wrapper, use interrupt_target_command
        instead.

I am quite busy at the moment, so did not spend too much time investigating
how this should be fixed. I suggest the following fix.

2002-10-02  Joel Brobecker  <brobecker@gnat.com>

        * infcmd.c (interrupt_target_command): Make non-static, as it
        is now needed by mi-main.c.
        * stack.c (return_command): Likewise.

Ok to apply?

Thanks,
-- 
Joel

[-- Attachment #2: static.diff --]
[-- Type: text/plain, Size: 2589 bytes --]

Index: infcmd.c
===================================================================
RCS file: /cvs/src/src/gdb/infcmd.c,v
retrieving revision 1.56
diff -c -3 -p -r1.56 infcmd.c
*** infcmd.c	25 Sep 2002 20:30:37 -0000	1.56
--- infcmd.c	3 Oct 2002 01:55:21 -0000
*************** void all_registers_info (char *, int);
*** 50,55 ****
--- 50,57 ----
  
  void registers_info (char *, int);
  
+ void interrupt_target_command (char *args, int from_tty);
+ 
  /* Local functions: */
  
  void continue_command (char *, int);
*************** static void float_info (char *, int);
*** 72,79 ****
  
  static void detach_command (char *, int);
  
- static void interrupt_target_command (char *args, int from_tty);
- 
  static void unset_environment_command (char *, int);
  
  static void set_environment_command (char *, int);
--- 74,79 ----
*************** interrupt_target_command_wrapper (char *
*** 1898,1904 ****
    interrupt_target_command (args, from_tty);
  }
  
! static void
  interrupt_target_command (char *args, int from_tty)
  {
    if (event_loop_p && target_can_async_p ())
--- 1898,1904 ----
    interrupt_target_command (args, from_tty);
  }
  
! void
  interrupt_target_command (char *args, int from_tty)
  {
    if (event_loop_p && target_can_async_p ())
Index: stack.c
===================================================================
RCS file: /cvs/src/src/gdb/stack.c,v
retrieving revision 1.44
diff -c -3 -p -r1.44 stack.c
*** stack.c	22 Sep 2002 22:18:41 -0000	1.44
--- stack.c	3 Oct 2002 01:55:21 -0000
*************** void args_info (char *, int);
*** 46,59 ****
  
  void locals_info (char *, int);
  
  void (*selected_frame_level_changed_hook) (int);
  
  void _initialize_stack (void);
  
  /* Prototypes for local functions. */
  
- static void return_command (char *, int);
- 
  static void down_command (char *, int);
  
  static void down_silently_base (char *);
--- 46,59 ----
  
  void locals_info (char *, int);
  
+ void return_command (char *, int);
+ 
  void (*selected_frame_level_changed_hook) (int);
  
  void _initialize_stack (void);
  
  /* Prototypes for local functions. */
  
  static void down_command (char *, int);
  
  static void down_silently_base (char *);
*************** return_command_wrapper (char *retval_exp
*** 1760,1766 ****
    return_command (retval_exp, from_tty);
  }
  
! static void
  return_command (char *retval_exp, int from_tty)
  {
    struct symbol *thisfun;
--- 1760,1766 ----
    return_command (retval_exp, from_tty);
  }
  
! void
  return_command (char *retval_exp, int from_tty)
  {
    struct symbol *thisfun;

Re: [RFA] Ooopsie in mi/mi-main.c

[Elena Zannoni]

Joel Brobecker writes:
 > The following change broke the build:
 > 
 >         * mi-main.c (mi_cmd_exec_return): Don't use
 >         return_command_wrapper, use return_command instead.
 >         (mi_cmd_exec_interrupt): Don't use
 >         interrupt_target_command_wrapper, use interrupt_target_command
 >         instead.
 > 
 > I am quite busy at the moment, so did not spend too much time investigating
 > how this should be fixed. I suggest the following fix.
 > 
 > 2002-10-02  Joel Brobecker  <brobecker@gnat.com>
 > 
 >         * infcmd.c (interrupt_target_command): Make non-static, as it
 >         is now needed by mi-main.c.
 >         * stack.c (return_command): Likewise.
 > 
 > Ok to apply?
 > 

Ouch, sorry. I forgot to check in a part of the patch. I am doing it now.

Elena


 > Thanks,
 > -- 
 > Joel
 > Index: infcmd.c
 > ===================================================================
 > RCS file: /cvs/src/src/gdb/infcmd.c,v
 > retrieving revision 1.56
 > diff -c -3 -p -r1.56 infcmd.c
 > *** infcmd.c	25 Sep 2002 20:30:37 -0000	1.56
 > --- infcmd.c	3 Oct 2002 01:55:21 -0000
 > *************** void all_registers_info (char *, int);
 > *** 50,55 ****
 > --- 50,57 ----
 >   
 >   void registers_info (char *, int);
 >   
 > + void interrupt_target_command (char *args, int from_tty);
 > + 
 >   /* Local functions: */
 >   
 >   void continue_command (char *, int);
 > *************** static void float_info (char *, int);
 > *** 72,79 ****
 >   
 >   static void detach_command (char *, int);
 >   
 > - static void interrupt_target_command (char *args, int from_tty);
 > - 
 >   static void unset_environment_command (char *, int);
 >   
 >   static void set_environment_command (char *, int);
 > --- 74,79 ----
 > *************** interrupt_target_command_wrapper (char *
 > *** 1898,1904 ****
 >     interrupt_target_command (args, from_tty);
 >   }
 >   
 > ! static void
 >   interrupt_target_command (char *args, int from_tty)
 >   {
 >     if (event_loop_p && target_can_async_p ())
 > --- 1898,1904 ----
 >     interrupt_target_command (args, from_tty);
 >   }
 >   
 > ! void
 >   interrupt_target_command (char *args, int from_tty)
 >   {
 >     if (event_loop_p && target_can_async_p ())
 > Index: stack.c
 > ===================================================================
 > RCS file: /cvs/src/src/gdb/stack.c,v
 > retrieving revision 1.44
 > diff -c -3 -p -r1.44 stack.c
 > *** stack.c	22 Sep 2002 22:18:41 -0000	1.44
 > --- stack.c	3 Oct 2002 01:55:21 -0000
 > *************** void args_info (char *, int);
 > *** 46,59 ****
 >   
 >   void locals_info (char *, int);
 >   
 >   void (*selected_frame_level_changed_hook) (int);
 >   
 >   void _initialize_stack (void);
 >   
 >   /* Prototypes for local functions. */
 >   
 > - static void return_command (char *, int);
 > - 
 >   static void down_command (char *, int);
 >   
 >   static void down_silently_base (char *);
 > --- 46,59 ----
 >   
 >   void locals_info (char *, int);
 >   
 > + void return_command (char *, int);
 > + 
 >   void (*selected_frame_level_changed_hook) (int);
 >   
 >   void _initialize_stack (void);
 >   
 >   /* Prototypes for local functions. */
 >   
 >   static void down_command (char *, int);
 >   
 >   static void down_silently_base (char *);
 > *************** return_command_wrapper (char *retval_exp
 > *** 1760,1766 ****
 >     return_command (retval_exp, from_tty);
 >   }
 >   
 > ! static void
 >   return_command (char *retval_exp, int from_tty)
 >   {
 >     struct symbol *thisfun;
 > --- 1760,1766 ----
 >     return_command (retval_exp, from_tty);
 >   }
 >   
 > ! void
 >   return_command (char *retval_exp, int from_tty)
 >   {
 >     struct symbol *thisfun;

Re: [RFA] Ooopsie in mi/mi-main.c

[Joel Brobecker]

> Ouch, sorry. I forgot to check in a part of the patch. I am doing it now.

Great! thanks.

-- 
Joel

Re: [RFA] Ooopsie in mi/mi-main.c

[Elena Zannoni]

Here is the piece of the patch that I forgot.
I am checking this in right now.

Elena

2002-10-02  Elena Zannoni  <ezannoni@redhat.com>

	* infcmd.c (interrupt_target_command_wrapper): Delete.
	(interrupt_target_command): Make non static.
	(nofp_registers_info): Make static.
	* stack.c (return_command_wrapper): Delete.
	(return_command): Make non static.

Index: stack.c
===================================================================
RCS file: /cvs/uberbaum/gdb/stack.c,v
retrieving revision 1.44
diff -u -p -r1.44 stack.c
--- stack.c	22 Sep 2002 22:18:41 -0000	1.44
+++ stack.c	3 Oct 2002 02:31:00 -0000
@@ -50,9 +50,9 @@ void (*selected_frame_level_changed_hook
 
 void _initialize_stack (void);
 
-/* Prototypes for local functions. */
+void return_command (char *, int);
 
-static void return_command (char *, int);
+/* Prototypes for local functions. */
 
 static void down_command (char *, int);
 
@@ -1755,12 +1755,6 @@ down_command (char *count_exp, int from_
 }
 \f
 void
-return_command_wrapper (char *retval_exp, int from_tty)
-{
-  return_command (retval_exp, from_tty);
-}
-
-static void
 return_command (char *retval_exp, int from_tty)
 {
   struct symbol *thisfun;

Index: infcmd.c
===================================================================
RCS file: /cvs/uberbaum/gdb/infcmd.c,v
retrieving revision 1.56
diff -u -p -r1.56 infcmd.c
--- infcmd.c	25 Sep 2002 20:30:37 -0000	1.56
+++ infcmd.c	3 Oct 2002 02:30:56 -0000
@@ -42,18 +42,24 @@
 #include "parser-defs.h"
 #include "regcache.h"
 
-/* Functions exported for general use: */
-
-void nofp_registers_info (char *, int);
+/* Functions exported for general use, in inferior.h: */
 
 void all_registers_info (char *, int);
 
 void registers_info (char *, int);
 
-/* Local functions: */
+void nexti_command (char *, int);
+
+void stepi_command (char *, int);
 
 void continue_command (char *, int);
 
+void interrupt_target_command (char *args, int from_tty);
+
+/* Local functions: */
+
+static void nofp_registers_info (char *, int);
+
 static void print_return_value (int struct_return, struct type *value_type);
 
 static void finish_command_continuation (struct continuation_arg *);
@@ -72,8 +78,6 @@ static void float_info (char *, int);
 
 static void detach_command (char *, int);
 
-static void interrupt_target_command (char *args, int from_tty);
-
 static void unset_environment_command (char *, int);
 
 static void set_environment_command (char *, int);
@@ -92,10 +96,6 @@ static void step_1 (int, int, char *);
 static void step_once (int skip_subroutines, int single_inst, int count);
 static void step_1_continuation (struct continuation_arg *arg);
 
-void nexti_command (char *, int);
-
-void stepi_command (char *, int);
-
 static void next_command (char *, int);
 
 static void step_command (char *, int);
@@ -1729,7 +1729,7 @@ all_registers_info (char *addr_exp, int 
   registers_info (addr_exp, 1);
 }
 
-void
+static void
 nofp_registers_info (char *addr_exp, int from_tty)
 {
   registers_info (addr_exp, 0);
@@ -1891,14 +1891,7 @@ detach_command (char *args, int from_tty
 
 /* Stop the execution of the target while running in async mode, in
    the backgound. */
-
 void
-interrupt_target_command_wrapper (char *args, int from_tty)
-{
-  interrupt_target_command (args, from_tty);
-}
-
-static void
 interrupt_target_command (char *args, int from_tty)
 {
   if (event_loop_p && target_can_async_p ())