2007-03-29 Denis Pilat <denis.pilat@st.com>

	* stack.c (print_stack_frame): Always use LOC_AND_ADDRESS in MI output.
	* infrun.c (normal_stop): Remove MI specific frame printing treatment.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 14fb171..7f149bb 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-29  Denis Pilat  <denis.pilat@st.com>
+
+       * stack.c (print_stack_frame): Always use LOC_AND_ADDRESS in MI output.
+       * infrun.c (normal_stop): Remove MI specific frame printing treatment.
+
 2007-03-29  Pedro Alves  <pedro_alves@portugalmail.pt>
 
        * arm-wince-tdep.c: New.

diff --git a/gdb/infrun.c b/gdb/infrun.c
index 394fa86..8fd0376 100644 (file)
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -3193,10 +3193,6 @@ Further execution is probably impossible.\n"));
            default:
              internal_error (__FILE__, __LINE__, _("Unknown value."));
            }
-         /* For mi, have the same behavior every time we stop:
-            print everything but the source line. */
-         if (ui_out_is_mi_like_p (uiout))
-           source_flag = LOC_AND_ADDRESS;
 
          if (ui_out_is_mi_like_p (uiout))
            ui_out_field_int (uiout, "thread-id",

diff --git a/gdb/stack.c b/gdb/stack.c
index 0267d0b..08eac88 100644 (file)
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -106,6 +106,8 @@ print_stack_frame (struct frame_info *frame, int print_level,
   args.frame = frame;
   args.print_level = print_level;
   args.print_what = print_what;
+  /* For mi, alway print location and address.  */
+  args.print_what = ui_out_is_mi_like_p (uiout) ? LOC_AND_ADDRESS : print_what;
   args.print_args = 1;
 
   catch_errors (print_stack_frame_stub, &args, "", RETURN_MASK_ALL);