Change SOFTWARE_SINGLE_STEP_P into SOFTWARE_SINGLE_STEP_P().

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 384fdfc84d297268b8fa2d322b322257fa505ea1..07bd6e83783fb6680a5ae8025506a75ff5af5268 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,19 @@
+2001-03-20  Andrew Cagney  <ac131313@redhat.com>
+
+       * target.h (SOFTWARE_SINGLE_STEP_P): Add empty parameter list.
+       * breakpoint.c (bpstat_stop_status): Update.
+       * infrun.c (handle_inferior_event): Ditto.
+       * mips-tdep.c (mips_dump_tdep): Ditto.
+       * infrun.c (resume): Ditto.
+       * infptrace.c (child_resume): Ditto.
+       * config/mips/tm-wince.h (SOFTWARE_SINGLE_STEP_P): Ditto.
+       * config/sh/tm-wince.h (SOFTWARE_SINGLE_STEP_P): Ditto.
+       * config/sparc/tm-sparc.h (SOFTWARE_SINGLE_STEP_P): Ditto.
+       * config/powerpc/tm-linux.h (SOFTWARE_SINGLE_STEP_P): Ditto.
+       * config/arm/tm-wince.h (SOFTWARE_SINGLE_STEP_P): Ditto.
+       * config/arc/tm-arc.h (SOFTWARE_SINGLE_STEP_P): Ditto.
+       * config/powerpc/tm-ppc-eabi.h (SOFTWARE_SINGLE_STEP_P): Ditto.
+
 2001-03-20  Andrew Cagney  <ac131313@redhat.com>
 
        * config/powerpc/tm-linux.h (SOFTWARE_SINGLE_STEP): Replace abort

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 5382b15298b88a61c7dd069b554795b38691a013..5eb1fa4d93b8165424df5a833fbfab55b5f751e0 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -2395,7 +2395,7 @@ bpstat_stop_status (CORE_ADDR *pc, int not_a_breakpoint)
   char message[sizeof (message1) + 30 /* slop */ ];
 
   /* Get the address where the breakpoint would have been.  */
-  bp_addr = *pc - (not_a_breakpoint && !SOFTWARE_SINGLE_STEP_P ? 
+  bp_addr = *pc - (not_a_breakpoint && !SOFTWARE_SINGLE_STEP_P () ? 
                    0 : DECR_PC_AFTER_BREAK);
 
   ALL_BREAKPOINTS_SAFE (b, temp)

diff --git a/gdb/config/arc/tm-arc.h b/gdb/config/arc/tm-arc.h
index 93ba3952ecfc09f5f6db63f14b2f66a846960c44..8595d859b4781145ada9a0d66b9973235f89ab4f 100644 (file)
--- a/gdb/config/arc/tm-arc.h
+++ b/gdb/config/arc/tm-arc.h
@@ -63,7 +63,7 @@ extern CORE_ADDR arc_skip_prologue (CORE_ADDR, int);
 
 /* We don't have a reliable single step facility.
    ??? We do have a cycle single step facility, but that won't work.  */
-#define SOFTWARE_SINGLE_STEP_P 1
+#define SOFTWARE_SINGLE_STEP_P() 1
 extern void arc_software_single_step (unsigned int, int);
 #define SOFTWARE_SINGLE_STEP(sig,bp_p) arc_software_single_step (sig, bp_p)
 

diff --git a/gdb/config/arm/tm-wince.h b/gdb/config/arm/tm-wince.h
index 0de5fbe096e7b5cd3a0ab880505437721af76da2..40e58ba2598a18b11d4cb0580bf1f98b369dec2d 100644 (file)
--- a/gdb/config/arm/tm-wince.h
+++ b/gdb/config/arm/tm-wince.h
@@ -24,7 +24,7 @@
 #include "arm/tm-arm.h"
 
 #undef SOFTWARE_SINGLE_STEP_P
-#define SOFTWARE_SINGLE_STEP_P 1
+#define SOFTWARE_SINGLE_STEP_P() 1
 
 #undef SOFTWARE_SINGLE_STEP
 #define SOFTWARE_SINGLE_STEP(sig, bp_p) wince_software_single_step (sig, bp_p)

diff --git a/gdb/config/mips/tm-wince.h b/gdb/config/mips/tm-wince.h
index 2cb7e494e11f85e50fa76fe6c98aa284f3b311ab..10e2eeb5d2b032ff5bcceaaebe3620251d00b944 100644 (file)
--- a/gdb/config/mips/tm-wince.h
+++ b/gdb/config/mips/tm-wince.h
@@ -25,7 +25,7 @@
 #include "mips/tm-mips.h"
 
 #undef SOFTWARE_SINGLE_STEP_P
-#define SOFTWARE_SINGLE_STEP_P 1
+#define SOFTWARE_SINGLE_STEP_P() 1
 #define SOFTWARE_SINGLE_STEP(sig, bp_p) wince_software_single_step (sig, bp_p)
 
 void wince_software_single_step (unsigned int, int);

diff --git a/gdb/config/powerpc/tm-linux.h b/gdb/config/powerpc/tm-linux.h
index 20a062b21b2d92b597e84a190b2e3c64ffb6ac14..a7935c2326ab1b8a4389e5a44fc06a56ee85347e 100644 (file)
--- a/gdb/config/powerpc/tm-linux.h
+++ b/gdb/config/powerpc/tm-linux.h
@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #undef  SOFTWARE_SINGLE_STEP
 #define SOFTWARE_SINGLE_STEP(p,q) internal_error (__FILE__, __LINE__, "Will never execute!")
 #undef  SOFTWARE_SINGLE_STEP_P
-#define SOFTWARE_SINGLE_STEP_P 0
+#define SOFTWARE_SINGLE_STEP_P() 0
 
 /* Make sure nexti gets the help it needs for debugging assembly code
    without symbols */

diff --git a/gdb/config/powerpc/tm-ppc-eabi.h b/gdb/config/powerpc/tm-ppc-eabi.h
index 2640cfca35708a77fda29d67545fef32e9aff4e8..f0410b713565fa8e2ffbbbd12f5b9a94ccce16e9 100644 (file)
--- a/gdb/config/powerpc/tm-ppc-eabi.h
+++ b/gdb/config/powerpc/tm-ppc-eabi.h
@@ -26,7 +26,7 @@
 #include "rs6000/tm-rs6000.h"
 /* except we want to allow single stepping */
 #undef SOFTWARE_SINGLE_STEP_P
-#define SOFTWARE_SINGLE_STEP_P 0
+#define SOFTWARE_SINGLE_STEP_P() 0
 
 #undef DEFAULT_LR_SAVE
 #define        DEFAULT_LR_SAVE 4       /* eabi saves LR at 4 off of SP */

diff --git a/gdb/config/rs6000/tm-rs6000.h b/gdb/config/rs6000/tm-rs6000.h
index 47be046ca0fd5944de289b5f8d655f9bc9d7e4b4..015169aeedd6cc2dd486748e56515480212beae5 100644 (file)
--- a/gdb/config/rs6000/tm-rs6000.h
+++ b/gdb/config/rs6000/tm-rs6000.h
@@ -98,7 +98,7 @@ extern void aix_process_linenos (void);
 
 /* RS6000/AIX does not support PT_STEP.  Has to be simulated.  */
 
-#define SOFTWARE_SINGLE_STEP_P 1
+#define SOFTWARE_SINGLE_STEP_P() 1
 extern void rs6000_software_single_step (unsigned int, int);
 #define SOFTWARE_SINGLE_STEP(sig,bp_p) rs6000_software_single_step (sig, bp_p)
 

diff --git a/gdb/config/sh/tm-wince.h b/gdb/config/sh/tm-wince.h
index 16816141d357cd377eafd4b4f7defb2a312584cc..4c4869af7a3d009c855930af2365fa470fe07021 100644 (file)
--- a/gdb/config/sh/tm-wince.h
+++ b/gdb/config/sh/tm-wince.h
@@ -23,7 +23,7 @@
 
 #include "sh/tm-sh.h"
 #undef SOFTWARE_SINGLE_STEP_P
-#define SOFTWARE_SINGLE_STEP_P 1
+#define SOFTWARE_SINGLE_STEP_P() 1
 
 #undef SOFTWARE_SINGLE_STEP
 #define SOFTWARE_SINGLE_STEP(sig, bp_p) wince_software_single_step (sig, bp_p)

diff --git a/gdb/config/sparc/tm-sparc.h b/gdb/config/sparc/tm-sparc.h
index 02b9a1a1d3e2d8235f750bf7407beec0a37d0eff..eb2b298d79f134f8c0310156b3d63a1a9b78114b 100644 (file)
--- a/gdb/config/sparc/tm-sparc.h
+++ b/gdb/config/sparc/tm-sparc.h
@@ -739,7 +739,7 @@ extern void sparc32_extract_return_value (struct type *, char[], char *);
 \f
 /* Sparc has no reliable single step ptrace call */
 
-#define SOFTWARE_SINGLE_STEP_P 1
+#define SOFTWARE_SINGLE_STEP_P() 1
 extern void sparc_software_single_step (unsigned int, int);
 #define SOFTWARE_SINGLE_STEP(sig,bp_p) sparc_software_single_step (sig,bp_p)
 

diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 2a40377508aeeb31d6d92699a2b565ea7b35a7a6..7e0d5766fbb870cfb35929ac601f51c3cc749508 100644 (file)
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-20  Andrew Cagney  <ac131313@redhat.com>
+
+       * gdbint.texinfo (Target Architecture Definition): Update
+       definition of SOFTWARE_SINGLE_STEP_P to include empty parameter
+       list.
+
 2001-03-06  Kevin Buettner  <kevinb@redhat.com>
 
        * Makefile.in, all-cfg.texi, annotate.texi, gdb.texinfo,

diff --git a/gdb/doc/gdbint.texinfo b/gdb/doc/gdbint.texinfo
index 1710f3e97dd575d762dc892992daabdf5babae69..bf05fec6f63e06226053118d6e59e8ef1fa1f739 100644 (file)
--- a/gdb/doc/gdbint.texinfo
+++ b/gdb/doc/gdbint.texinfo
@@ -2151,7 +2151,7 @@ languages, these predicates will always see a pointer type, never an
 array type.  All the references above to arrays being returned by value
 apply only to other languages.
 
-@item SOFTWARE_SINGLE_STEP_P
+@item SOFTWARE_SINGLE_STEP_P()
 @findex SOFTWARE_SINGLE_STEP_P
 Define this as 1 if the target does not have a hardware single-step
 mechanism.  The macro @code{SOFTWARE_SINGLE_STEP} must also be defined.

diff --git a/gdb/infptrace.c b/gdb/infptrace.c
index 0a3e34db1525998e450358fa49e4d13ed938fbf7..e41ca030d5ccaba388d6ddd03a5d881b4b659ba8 100644 (file)
--- a/gdb/infptrace.c
+++ b/gdb/infptrace.c
@@ -273,7 +273,7 @@ child_resume (int pid, int step, enum target_signal signal)
 
   if (step)
     {
-      if (SOFTWARE_SINGLE_STEP_P)
+      if (SOFTWARE_SINGLE_STEP_P ())
        internal_error (__FILE__, __LINE__, "failed internal consistency check");               /* Make sure this doesn't happen. */
       else
        ptrace (PT_STEP, pid, (PTRACE_ARG3_TYPE) 1,

diff --git a/gdb/infrun.c b/gdb/infrun.c
index 92d7f615173eee9e0364957ce7555c08f9a002f9..d2373ad8428dab04551ff812370af630d015d78e 100644 (file)
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -838,7 +838,7 @@ resume (int step, enum target_signal sig)
   if (breakpoint_here_p (read_pc ()) == permanent_breakpoint_here)
     SKIP_PERMANENT_BREAKPOINT ();
 
-  if (SOFTWARE_SINGLE_STEP_P && step)
+  if (SOFTWARE_SINGLE_STEP_P () && step)
     {
       /* Do it the hard way, w/temp breakpoints */
       SOFTWARE_SINGLE_STEP (sig, 1 /*insert-breakpoints */ );
@@ -1562,7 +1562,7 @@ handle_inferior_event (struct execution_control_state *ecs)
                                          (LONGEST) ecs->ws.value.integer));
        gdb_flush (gdb_stdout);
        target_mourn_inferior ();
-       singlestep_breakpoints_inserted_p = 0;  /*SOFTWARE_SINGLE_STEP_P */
+       singlestep_breakpoints_inserted_p = 0;  /*SOFTWARE_SINGLE_STEP_P() */
        stop_print_frame = 0;
        stop_stepping (ecs);
        return;
@@ -1580,7 +1580,7 @@ handle_inferior_event (struct execution_control_state *ecs)
        target_mourn_inferior ();
 
        print_stop_reason (SIGNAL_EXITED, stop_signal);
-       singlestep_breakpoints_inserted_p = 0;  /*SOFTWARE_SINGLE_STEP_P */
+       singlestep_breakpoints_inserted_p = 0;  /*SOFTWARE_SINGLE_STEP_P() */
        stop_stepping (ecs);
        return;
 
@@ -1821,7 +1821,7 @@ handle_inferior_event (struct execution_control_state *ecs)
 
     if (stop_signal == TARGET_SIGNAL_TRAP)
       {
-       if (SOFTWARE_SINGLE_STEP_P && singlestep_breakpoints_inserted_p)
+       if (SOFTWARE_SINGLE_STEP_P () && singlestep_breakpoints_inserted_p)
          ecs->random_signal = 0;
        else if (breakpoints_inserted
                 && breakpoint_here_p (stop_pc - DECR_PC_AFTER_BREAK))
@@ -1984,7 +1984,7 @@ handle_inferior_event (struct execution_control_state *ecs)
        flush_cached_frames ();
       }
 
-    if (SOFTWARE_SINGLE_STEP_P && singlestep_breakpoints_inserted_p)
+    if (SOFTWARE_SINGLE_STEP_P () && singlestep_breakpoints_inserted_p)
       {
        /* Pull the single step breakpoints out of the target. */
        SOFTWARE_SINGLE_STEP (0, 0);

diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index cdd58f42ae30e95780cfc10bf23a1fe569943cba..05c738cb8a50ae2af03e885811f097e35bd040e8 100644 (file)
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -4470,11 +4470,8 @@ mips_dump_tdep (struct gdbarch *current_gdbarch, struct ui_file *file)
                      "mips_dump_tdep: SOFTWARE_SINGLE_STEP # %s\n",
                      XSTRING (SOFTWARE_SINGLE_STEP (SIG, BP_P)));
   fprintf_unfiltered (file,
-                     "mips_dump_tdep: SOFTWARE_SINGLE_STEP_P = %d\n",
-                     SOFTWARE_SINGLE_STEP_P);
-  fprintf_unfiltered (file,
-                     "mips_dump_tdep: SOFTWARE_SINGLE_STEP_P = %d\n",
-                     SOFTWARE_SINGLE_STEP_P);
+                     "mips_dump_tdep: SOFTWARE_SINGLE_STEP_P () = %d\n",
+                     SOFTWARE_SINGLE_STEP_P ());
   fprintf_unfiltered (file,
                      "mips_dump_tdep: STAB_REG_TO_REGNUM # %s\n",
                      XSTRING (STAB_REG_TO_REGNUM (REGNUM)));

diff --git a/gdb/target.h b/gdb/target.h
index fb4e18777a5f8c497b67465d7e22ea0ffb51454d..05f15ee0cf447fb1ee1747822e833e56466fbcbc 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -1395,7 +1395,7 @@ extern void push_remote_target (char *name, int from_tty);
 /* Imported from machine dependent code */
 
 #ifndef SOFTWARE_SINGLE_STEP_P
-#define SOFTWARE_SINGLE_STEP_P 0
+#define SOFTWARE_SINGLE_STEP_P() 0
 #define SOFTWARE_SINGLE_STEP(sig,bp_p) \
      (internal_error (__FILE__, __LINE__, "SOFTWARE_SINGLE_STEP"), 0)
 #endif /* SOFTWARE_SINGLE_STEP_P */