From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Wed, 24 Nov 2010 19:08:30 +0000 (+0000)
Subject: gdb/
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a418ecb545dc6681dbc1c81f2b1b283a2d80589e;p=binutils-gdb.git

gdb/
	Code cleanup.
	* infrun.c (struct inferior_status) <stepping_over_breakpoint>
	(save_inferior_status) <stepping_over_breakpoint>
	(restore_inferior_status) <stepping_over_breakpoint>: Rename to
	trap_expected.
	(struct inferior_status) <step_resume_break_address>: Remove.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e2b1fcf65d2..03bf65d21b5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,15 @@
 2010-11-24  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
+	Code cleanup.
+	* infrun.c (struct inferior_status) <stepping_over_breakpoint>
+	(save_inferior_status) <stepping_over_breakpoint>
+	(restore_inferior_status) <stepping_over_breakpoint>: Rename to
+	trap_expected.
+	(struct inferior_status) <step_resume_break_address>: Remove.
+
+2010-11-24  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Code cleanup.
 	* infrun.c (struct inferior_status, save_inferior_status)
 	(restore_inferior_status): Group and reorder the fields, comment their
 	groups.
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 979b1315a20..bcd991e0ec5 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -6171,7 +6171,7 @@ struct inferior_status
   CORE_ADDR step_range_end;
   struct frame_id step_frame_id;
   struct frame_id step_stack_frame_id;
-  int stepping_over_breakpoint;
+  int trap_expected;
   int proceed_to_finish;
   int in_infcall;
   enum step_over_calls_kind step_over_calls;
@@ -6184,7 +6184,6 @@ struct inferior_status
   /* Other fields:  */
   enum stop_stack_kind stop_stack_dummy;
   int stopped_by_random_signal;
-  CORE_ADDR step_resume_break_address;
   int stop_after_trap;
 
   /* ID if the selected frame when the inferior function call was made.  */
@@ -6206,7 +6205,7 @@ save_inferior_status (void)
   inf_status->step_range_end = tp->step_range_end;
   inf_status->step_frame_id = tp->step_frame_id;
   inf_status->step_stack_frame_id = tp->step_stack_frame_id;
-  inf_status->stepping_over_breakpoint = tp->trap_expected;
+  inf_status->trap_expected = tp->trap_expected;
   inf_status->proceed_to_finish = tp->proceed_to_finish;
   inf_status->in_infcall = tp->in_infcall;
   inf_status->step_over_calls = tp->step_over_calls;
@@ -6266,7 +6265,7 @@ restore_inferior_status (struct inferior_status *inf_status)
   tp->step_range_end = inf_status->step_range_end;
   tp->step_frame_id = inf_status->step_frame_id;
   tp->step_stack_frame_id = inf_status->step_stack_frame_id;
-  tp->trap_expected = inf_status->stepping_over_breakpoint;
+  tp->trap_expected = inf_status->trap_expected;
   tp->proceed_to_finish = inf_status->proceed_to_finish;
   tp->in_infcall = inf_status->in_infcall;
   tp->step_over_calls = inf_status->step_over_calls;