sim: callback: drop unused printf helpers

[deliverable/binutils-gdb.git] / sim / common / sim-watch.c

diff --git a/sim/common/sim-watch.c b/sim/common/sim-watch.c
index 6d177298597103cd4140f86660e9656a3b13acb1..bc6c44bcfd17937796f7e0720ca468a4ca36a3b9 100644 (file)
--- a/sim/common/sim-watch.c
+++ b/sim/common/sim-watch.c
@@ -17,9 +17,12 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "config.h"
+/* This must come before any other includes.  */
+#include "defs.h"
+
 #include "sim-main.h"
 #include "sim-options.h"
+#include "sim-signal.h"
 #include "libiberty.h"
 
 #include "sim-assert.h"
@@ -167,18 +170,16 @@ schedule_watchpoint (SIM_DESC sd,
                     sim_watch_point *point)
 {
   sim_watchpoints *watch = STATE_WATCHPOINTS (sd);
+
   switch (point->type)
     {
     case pc_watchpoint:
-      point->event = sim_events_watch_sim (sd,
-                                          watch->pc,
-                                          watch->sizeof_pc,
-                                          HOST_BYTE_ORDER,
-                                          point->is_within,
-                                          point->arg0, point->arg1,
-                                          /* PC in arg0..arg1 */
-                                          handle_watchpoint,
-                                          point);
+      point->event = sim_events_watch_pc (sd,
+                                         point->is_within,
+                                         point->arg0, point->arg1,
+                                         /* PC in arg0..arg1 */
+                                         handle_watchpoint,
+                                         point);
       return SIM_RC_OK;
     case clock_watchpoint:
       point->event = sim_events_watch_clock (sd,
@@ -377,8 +378,8 @@ static const OPTION watchpoint_options[] =
 static const char *default_interrupt_names[] = { "int", 0, };
 
 /* This default handler is "good enough" for targets that just want to trap into
-   gdb when watchpoints are hit, and have only configured STATE_WATCHPOINTS pc &
-   sizeof_pc fields.  */
+   gdb when watchpoints are hit, and have only configured the STATE_WATCHPOINTS
+   pc field.  */
 static void
 default_interrupt_handler (SIM_DESC sd, void *data)
 {