[RFA] target adjust pc after break with itself

[teawater <teawater@gmail.com>]

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

Hi Pedro,

According to your idea, I write a patch
"target_adjust_pc_with_itself.txt" for it. It's for the main trunk and
20080930 branch.

2008-11-02  Hui Zhu  <teawater@gmail.com>

	* target.h (target_ops): Add "to_adjust_pc_with_itself".
	Return true if target adjust pc after break with itself.
	(target_adjust_pc_with_itself): New macro.
	Call "to_adjust_pc_with_itself".
	* target.c (update_current_target): Set
	"to_adjust_pc_with_itself".
	* infrun.c (adjust_pc_after_break): If
	"target_adjust_pc_with_itself" return true, not adjust pc.

To make P record support it. I make another patch
"record_adjust_pc_with_itself.txt".

2008-11-02  Hui Zhu  <teawater@gmail.com>

	* record.c (record_adjust_pc_with_itself): New function.
	Return true.
	(init_record_ops): Set to_adjust_pc_with_itself point to
	record_adjust_pc_with_itself.

Thanks,
Hui

[-- Attachment #2: target_adjust_pc_with_itself.txt --]
[-- Type: text/plain, Size: 1692 bytes --]

--- a/target.h
+++ b/target.h
@@ -536,6 +536,9 @@ struct target_ops
     /* Can target execute in reverse?  */
     int (*to_can_execute_reverse) ();
 
+    /* Can target adjust pc after break with itself?  */
+    int (*to_adjust_pc_with_itself) (ptid_t ptid);
+
     /* Does this target support debugging multiple processes
        simultaneously?  */
     int (*to_supports_multi_process) (void);
@@ -1155,6 +1158,11 @@ extern int target_stopped_data_address_p
      (current_target.to_can_execute_reverse ? \
       current_target.to_can_execute_reverse () : 0)
 
+/* Can target adjust pc after break with itself?  */
+#define target_adjust_pc_with_itself(ptid) \
+     (current_target.to_adjust_pc_with_itself ? \
+      current_target.to_adjust_pc_with_itself (ptid) : 0)
+
 extern const struct target_desc *target_read_description (struct target_ops *);
 
 #define target_get_ada_task_ptid(lwp, tid) \
--- a/target.c
+++ b/target.c
@@ -468,6 +468,7 @@ update_current_target (void)
       INHERIT (to_make_corefile_notes, t);
       INHERIT (to_get_thread_local_address, t);
       INHERIT (to_can_execute_reverse, t);
+      INHERIT (to_adjust_pc_with_itself, t);
       /* Do not inherit to_read_description.  */
       INHERIT (to_get_ada_task_ptid, t);
       /* Do not inherit to_search_memory.  */
--- a/infrun.c
+++ b/infrun.c
@@ -1944,6 +1944,9 @@ adjust_pc_after_break (struct execution_
      target with both of these set in GDB history, and it seems unlikely to be
      correct, so gdbarch_have_nonsteppable_watchpoint is not checked here.  */
 
+  if (target_adjust_pc_with_itself (ecs->ptid))
+    return;
+
   if (ecs->ws.kind != TARGET_WAITKIND_STOPPED)
     return;
 

[-- Attachment #3: record_adjust_pc_with_itself.txt --]
[-- Type: text/plain, Size: 609 bytes --]

--- a/record.c
+++ b/record.c
@@ -954,6 +954,12 @@ record_can_execute_reverse (void)
   return 1;
 }
 
+static int
+record_adjust_pc_with_itself (ptid_t ptid)
+{
+  return 1;
+}
+
 static void
 init_record_ops (void)
 {
@@ -975,6 +981,7 @@ init_record_ops (void)
   record_ops.to_insert_breakpoint = record_insert_breakpoint;
   record_ops.to_remove_breakpoint = record_remove_breakpoint;
   record_ops.to_can_execute_reverse = record_can_execute_reverse;
+  record_ops.to_adjust_pc_with_itself = record_adjust_pc_with_itself;
   record_ops.to_stratum = record_stratum;
   record_ops.to_magic = OPS_MAGIC;
 }