*** empty log message ***

[deliverable/binutils-gdb.git] / gdb / remote-m32r-sdi.c

diff --git a/gdb/remote-m32r-sdi.c b/gdb/remote-m32r-sdi.c
index a2fc04682fef466c3b25343425467d44c1bc144f..4fa797dd1689f6b1fbcf003c4a401d9827b2f99b 100644 (file)
--- a/gdb/remote-m32r-sdi.c
+++ b/gdb/remote-m32r-sdi.c
@@ -312,10 +312,10 @@ m32r_create_inferior (char *execfile, char *args, char **env, int from_tty)
   CORE_ADDR entry_pt;
 
   if (args && *args)
-    error ("Cannot pass arguments to remote STDEBUG process");
+    error (_("Cannot pass arguments to remote STDEBUG process"));
 
   if (execfile == 0 || exec_bfd == 0)
-    error ("No executable file specified");
+    error (_("No executable file specified"));
 
   if (remote_debug)
     fprintf_unfiltered (gdb_stdlog, "m32r_create_inferior(%s,%s)\n", execfile,
@@ -374,13 +374,13 @@ m32r_open (char *args, int from_tty)
 
   sdi_desc = serial_open (hostname);
   if (!sdi_desc)
-    error ("Connection refused\n");
+    error (_("Connection refused."));
 
   if (get_ack () == -1)
-    error ("Cannot connect to SDI target\n");
+    error (_("Cannot connect to SDI target."));
 
   if (send_cmd (SDI_OPEN) == -1)
-    error ("Cannot connect to SDI target\n");
+    error (_("Cannot connect to SDI target."));
 
   /* Get maximum number of ib breakpoints */
   send_one_arg_cmd (SDI_GET_ATTR, SDI_ATTR_BRK);
@@ -703,13 +703,13 @@ m32r_wait (ptid_t ptid, struct target_waitstatus *status)
   /* Wait for ready */
   buf[0] = SDI_WAIT_FOR_READY;
   if (serial_write (sdi_desc, buf, 1) != 0)
-    error ("Remote connection closed");
+    error (_("Remote connection closed"));
 
   while (1)
     {
       c = serial_readchar (sdi_desc, SDI_TIMEOUT);
       if (c < 0)
-       error ("Remote connection closed");
+       error (_("Remote connection closed"));
 
       if (c == '-')            /* error */
        {
@@ -725,7 +725,7 @@ m32r_wait (ptid_t ptid, struct target_waitstatus *status)
       else
        ret = serial_write (sdi_desc, ".", 1);  /* packet to wait */
       if (ret != 0)
-       error ("Remote connection closed");
+       error (_("Remote connection closed"));
     }
 
   status->kind = TARGET_WAITKIND_STOPPED;
@@ -1141,7 +1141,7 @@ m32r_mourn_inferior (void)
 }
 
 static int
-m32r_insert_breakpoint (CORE_ADDR addr, char *shadow)
+m32r_insert_breakpoint (CORE_ADDR addr, bfd_byte *shadow)
 {
   int ib_breakpoints;
   unsigned char buf[13];
@@ -1178,12 +1178,12 @@ m32r_insert_breakpoint (CORE_ADDR addr, char *shadow)
        }
     }
 
-  error ("Too many breakpoints");
+  error (_("Too many breakpoints"));
   return 1;
 }
 
 static int
-m32r_remove_breakpoint (CORE_ADDR addr, char *shadow)
+m32r_remove_breakpoint (CORE_ADDR addr, bfd_byte *shadow)
 {
   int i;
 
@@ -1245,7 +1245,7 @@ m32r_load (char *args, int from_tty)
       else if (strncmp (arg, "-nostart", strlen (arg)) == 0)
        nostart = 1;
       else
-       error ("Unknown option `%s'", arg);
+       error (_("Unknown option `%s'"), arg);
     }
 
   if (!filename)
@@ -1260,7 +1260,7 @@ m32r_load (char *args, int from_tty)
   old_chain = make_cleanup_bfd_close (pbfd);
 
   if (!bfd_check_format (pbfd, bfd_object))
-    error ("\"%s\" is not an object file: %s", filename,
+    error (_("\"%s\" is not an object file: %s"), filename,
           bfd_errmsg (bfd_get_error ()));
 
   start_time = time (NULL);
@@ -1310,7 +1310,7 @@ m32r_load (char *args, int from_tty)
 
              bfd_get_section_contents (pbfd, section, buf + 9, fptr, count);
              if (send_data (buf, count + 9) <= 0)
-               error ("Error while downloading %s section.",
+               error (_("Error while downloading %s section."),
                       bfd_get_section_name (pbfd, section));
 
              if (!quiet)
@@ -1425,7 +1425,7 @@ m32r_insert_watchpoint (CORE_ADDR addr, int len, int type)
        }
     }
 
-  error ("Too many watchpoints");
+  error (_("Too many watchpoints"));
   return 1;
 }
 
@@ -1450,16 +1450,23 @@ m32r_remove_watchpoint (CORE_ADDR addr, int len, int type)
   return 0;
 }
 
-CORE_ADDR
-m32r_stopped_data_address (void)
+int
+m32r_stopped_data_address (struct target_ops *target, CORE_ADDR *addr_p)
 {
-  return hit_watchpoint_addr;
+  int rc = 0;
+  if (hit_watchpoint_addr != 0x00000000)
+    {
+      *addr_p = hit_watchpoint_addr;
+      rc = 1;
+    }
+  return rc;
 }
 
 int
 m32r_stopped_by_watchpoint (void)
 {
-  return (hit_watchpoint_addr != 0x00000000);
+  CORE_ADDR addr;
+  return m32r_stopped_data_address (&current_target, &addr);
 }
 
 
@@ -1568,7 +1575,7 @@ init_m32r_ops (void)
   m32r_ops.to_fetch_registers = m32r_fetch_register;
   m32r_ops.to_store_registers = m32r_store_register;
   m32r_ops.to_prepare_to_store = m32r_prepare_to_store;
-  m32r_ops.to_xfer_memory = m32r_xfer_memory;
+  m32r_ops.deprecated_xfer_memory = m32r_xfer_memory;
   m32r_ops.to_files_info = m32r_files_info;
   m32r_ops.to_insert_breakpoint = m32r_insert_breakpoint;
   m32r_ops.to_remove_breakpoint = m32r_remove_breakpoint;
@@ -1612,21 +1619,21 @@ _initialize_remote_m32r (void)
   add_target (&m32r_ops);
 
   add_com ("sdireset", class_obscure, sdireset_command,
-          "Reset SDI connection.");
+          _("Reset SDI connection."));
 
   add_com ("sdistatus", class_obscure, sdistatus_command,
-          "Show status of SDI connection.");
+          _("Show status of SDI connection."));
 
   add_com ("debug_chaos", class_obscure, debug_chaos_command,
-          "Debug M32R/Chaos.");
+          _("Debug M32R/Chaos."));
 
   add_com ("use_debug_dma", class_obscure, use_debug_dma_command,
-          "Use debug DMA mem access.");
+          _("Use debug DMA mem access."));
   add_com ("use_mon_code", class_obscure, use_mon_code_command,
-          "Use mon code mem access.");
+          _("Use mon code mem access."));
 
   add_com ("use_ib_break", class_obscure, use_ib_breakpoints_command,
-          "Set breakpoints by IB break.");
+          _("Set breakpoints by IB break."));
   add_com ("use_dbt_break", class_obscure, use_dbt_breakpoints_command,
-          "Set breakpoints by dbt.");
+          _("Set breakpoints by dbt."));
 }