*** empty log message ***

[deliverable/binutils-gdb.git] / gdb / remote-rdi.c

diff --git a/gdb/remote-rdi.c b/gdb/remote-rdi.c
index 28d86891c22edbd09a7d4af6e8a90ae36354af47..55401755c74c49d38f1e8cf0f0df4894bd72d25a 100644 (file)
--- a/gdb/remote-rdi.c
+++ b/gdb/remote-rdi.c
@@ -74,9 +74,9 @@ static void arm_rdi_kill (void);
 
 static void arm_rdi_detach (char *args, int from_tty);
 
-static int arm_rdi_insert_breakpoint (CORE_ADDR, char *);
+static int arm_rdi_insert_breakpoint (CORE_ADDR, bfd_byte *);
 
-static int arm_rdi_remove_breakpoint (CORE_ADDR, char *);
+static int arm_rdi_remove_breakpoint (CORE_ADDR, bfd_byte *);
 
 static char *rdi_error_message (int err);
 
@@ -668,14 +668,14 @@ arm_rdi_mourn_inferior (void)
    here.  */
 
 static int
-arm_rdi_insert_breakpoint (CORE_ADDR addr, char *contents_cache)
+arm_rdi_insert_breakpoint (CORE_ADDR addr, bfd_byte *contents_cache)
 {
   int rslt;
   PointHandle point;
   struct local_bp_list_entry *entry;
   int type = RDIPoint_EQ;
 
-  if (arm_pc_is_thumb (addr) || arm_pc_is_thumb_dummy (addr))
+  if (arm_pc_is_thumb (addr))
     type |= RDIPoint_16Bit;
   rslt = angel_RDI_setbreak (addr, type, 0, &point);
   if (rslt != RDIError_NoError)
@@ -692,7 +692,7 @@ arm_rdi_insert_breakpoint (CORE_ADDR addr, char *contents_cache)
 }
 
 static int
-arm_rdi_remove_breakpoint (CORE_ADDR addr, char *contents_cache)
+arm_rdi_remove_breakpoint (CORE_ADDR addr, bfd_byte *contents_cache)
 {
   int rslt;
   PointHandle point;
@@ -994,8 +994,8 @@ Set target has ROM at addr 0."), _("\
 Show if target has ROM at addr 0."), _("\
 A true value disables vector catching, false enables vector catching.\n\
 This is evaluated at the time the 'target rdi' command is executed."),
+                          NULL,
                           NULL, /* FIXME: i18n: Target has ROM at addr 0 is %s.  */
-                          NULL, NULL,
                           &setlist, &showlist);
 
   add_setshow_boolean_cmd ("rdiheartbeat", no_class, &rdi_heartbeat, _("\
@@ -1004,8 +1004,8 @@ Show enable for ADP heartbeat packets."), _("\
 I don't know why you would want this. If you enable them,\n\
 it will confuse ARM and EPI JTAG interface boxes as well\n\
 as the Angel Monitor."),
+                          NULL,
                           NULL, /* FIXME: i18n: Enable for ADP heartbeat packets is %s.  */
-                          NULL, NULL,
                           &setlist, &showlist);
 }