Re: fix list/edit command in hook-stop

[Jason Kraftcheck <kraftche@cae.wisc.edu>]

Daniel Jacobowitz wrote:
> On Thu, Feb 23, 2006 at 12:20:14PM -0600, Jason Kraftcheck wrote:
> 
>>An 'edit' or 'list' command in hook-stop doesn't work because the
>>current sal isn't updated until after hook-stop is run.  The following
>>trivial change moves the invocation of hook-stop later in normal_stop.
>>This won't fix the problem in all cases, as the sal is apparently only
>>updated if print_stack_frame is called.  But it doesn't hurt anything
>>and works more often than without the change.
>>
>>
>>2006-02-23  Jason Kraftcheck  <kraftche@cae.wisc.edu>
>>
>>	* infrun.c (normal_stop): call hook-stop handler later, after
>>	  current sal has been set.
> 
> 
>>From the manual:
> 
>    In addition, a pseudo-command, `stop' exists.  Defining
> (`hook-stop') makes the associated commands execute every time
> execution stops in your program: before breakpoint commands are run,
> displays are printed, or the stack frame is printed.
> 
> Your patch would change that; a stop hook which conditionally continued
> would now be noisy instead of silent, so I don't think this is a good
> change.
> 
> Can you just update the sal explicitly, instead of moving things around?
> 
> 


Is this OK?


2006-02-23  Jason Kraftcheck  <kraftche@cae.wisc.edu>

	* infrun.c (normal_stop): Set current SAL before calling
          hook-stop handler so edit and list commands work.
	* frame.h: Add delcaration of set_current_sal_from_frame
	* stack.c: Make set_current_sal_from_frame extern


diff -urp gdb-6.4/gdb/frame.h mod/gdb/frame.h
--- gdb-6.4/gdb/frame.h	2005-05-22 09:53:34.000000000 -0500
+++ mod/gdb/frame.h	2006-02-23 15:33:11.861630699 -0600
@@ -300,6 +300,14 @@ extern CORE_ADDR get_frame_func (struct
 extern void find_frame_sal (struct frame_info *frame,
 			    struct symtab_and_line *sal);

+
+/* Set the current source and line to the location given by frame
+   FRAME, if possible.  When CENTER is true, adjust so the relevant
+   line is in the center of the next 'list'.  */
+extern void set_current_sal_from_frame (struct frame_info * frame,
+                                        int center);
+
+
 /* Return the frame base (what ever that is) (DEPRECATED).

    Old code was trying to use this single method for two conflicting
Only in mod/gdb: gdb-6.4.patch.4
diff -urp gdb-6.4/gdb/infrun.c mod/gdb/infrun.c
--- gdb-6.4/gdb/infrun.c	2005-11-14 09:35:16.000000000 -0600
+++ mod/gdb/infrun.c	2006-02-23 15:28:44.485723627 -0600
@@ -3041,8 +3041,12 @@ Further execution is probably impossible
   /* Look up the hook_stop and run it (CLI internally handles problem
      of stop_command's pre-hook not existing).  */
   if (stop_command)
-    catch_errors (hook_stop_stub, stop_command,
-		  "Error while running hook_stop:\n", RETURN_MASK_ALL);
+    {
+      if (target_has_stack)
+        set_current_sal_from_frame (get_current_frame (), 1);
+      catch_errors (hook_stop_stub, stop_command,
+		    "Error while running hook_stop:\n", RETURN_MASK_ALL);
+    }

   if (!target_has_stack)
     {
diff -urp gdb-6.4/gdb/stack.c mod/gdb/stack.c
--- gdb-6.4/gdb/stack.c	2005-08-18 08:26:41.000000000 -0500
+++ mod/gdb/stack.c	2006-02-23 15:36:40.575237163 -0600
@@ -61,8 +61,6 @@ static void print_frame (struct frame_in
 			 enum print_what print_what,  int print_args,
 			 struct symtab_and_line sal);

-static void set_current_sal_from_frame (struct frame_info *, int);
-
 /* Zero means do things normally; we are interacting directly with the
    user.  One means print the full filename and linenumber when a
    frame is printed, and do so in a format emacs18/emacs19.22 can
@@ -373,7 +371,7 @@ print_args_stub (void *args)
    FRAME, if possible.  When CENTER is true, adjust so the relevant
    line is in the center of the next 'list'.  */

-static void
+void
 set_current_sal_from_frame (struct frame_info *frame, int center)
 {
   struct symtab_and_line sal;