X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fremote-m32r-sdi.c;h=81fea53955d5e773926e3cc56580813b19304296;hb=0002ad5f4575ad8f85bac2989ce4e1e8b99c905b;hp=f1592d72d07669b7024c016f038504dd7940087f;hpb=2ea286498fd2ddceaf074bfbc9a2986777ea0396;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/remote-m32r-sdi.c b/gdb/remote-m32r-sdi.c index f1592d72d0..81fea53955 100644 --- a/gdb/remote-m32r-sdi.c +++ b/gdb/remote-m32r-sdi.c @@ -1,6 +1,6 @@ /* Remote debugging interface for M32R/SDI. - Copyright (C) 2003-2012 Free Software Foundation, Inc. + Copyright (C) 2003-2013 Free Software Foundation, Inc. Contributed by Renesas Technology Co. Written by Kei Sakamoto . @@ -39,7 +39,8 @@ #include #include #include - +#include "gdb_bfd.h" +#include "cli/cli-utils.h" #include "serial.h" @@ -375,14 +376,14 @@ m32r_open (char *args, int from_tty) push_target (&m32r_ops); if (args == NULL) - sprintf (hostname, "localhost:%d", SDIPORT); + xsnprintf (hostname, sizeof (hostname), "localhost:%d", SDIPORT); else { port_str = strchr (args, ':'); if (port_str == NULL) - sprintf (hostname, "%s:%d", args, SDIPORT); + xsnprintf (hostname, sizeof (hostname), "%s:%d", args, SDIPORT); else - strcpy (hostname, args); + xsnprintf (hostname, sizeof (hostname), "%s", args); } sdi_desc = serial_open (hostname); @@ -429,10 +430,10 @@ m32r_open (char *args, int from_tty) /* Close out all files and local state before this target loses control. */ static void -m32r_close (int quitting) +m32r_close (void) { if (remote_debug) - fprintf_unfiltered (gdb_stdlog, "m32r_close(%d)\n", quitting); + fprintf_unfiltered (gdb_stdlog, "m32r_close()\n"); if (sdi_desc) { @@ -486,7 +487,7 @@ m32r_resume (struct target_ops *ops, else { buf[0] = SDI_WRITE_MEMORY; - if (gdbarch_byte_order (target_gdbarch) == BFD_ENDIAN_BIG) + if (gdbarch_byte_order (target_gdbarch ()) == BFD_ENDIAN_BIG) store_long_parameter (buf + 1, pc_addr); else store_long_parameter (buf + 1, pc_addr - 1); @@ -526,7 +527,7 @@ m32r_resume (struct target_ops *ops, continue; /* Set PBP. */ - if (gdbarch_byte_order (target_gdbarch) == BFD_ENDIAN_BIG) + if (gdbarch_byte_order (target_gdbarch ()) == BFD_ENDIAN_BIG) send_three_arg_cmd (SDI_WRITE_MEMORY, 0xffff8000 + 4 * i, 4, 0x00000006); else @@ -553,7 +554,7 @@ m32r_resume (struct target_ops *ops, store_long_parameter (buf + 5, 4); if ((bp_addr & 2) == 0 && bp_addr != (pc_addr & 0xfffffffc)) { - if (gdbarch_byte_order (target_gdbarch) == BFD_ENDIAN_BIG) + if (gdbarch_byte_order (target_gdbarch ()) == BFD_ENDIAN_BIG) { buf[9] = dbt_bp_entry[0]; buf[10] = dbt_bp_entry[1]; @@ -570,7 +571,7 @@ m32r_resume (struct target_ops *ops, } else { - if (gdbarch_byte_order (target_gdbarch) == BFD_ENDIAN_BIG) + if (gdbarch_byte_order (target_gdbarch ()) == BFD_ENDIAN_BIG) { if ((bp_addr & 2) == 0) { @@ -617,7 +618,7 @@ m32r_resume (struct target_ops *ops, continue; /* DBC register. */ - if (gdbarch_byte_order (target_gdbarch) == BFD_ENDIAN_BIG) + if (gdbarch_byte_order (target_gdbarch ()) == BFD_ENDIAN_BIG) { switch (ab_type[i]) { @@ -711,7 +712,7 @@ m32r_wait (struct target_ops *ops, fprintf_unfiltered (gdb_stdlog, "m32r_wait()\n"); status->kind = TARGET_WAITKIND_EXITED; - status->value.sig = TARGET_SIGNAL_0; + status->value.sig = GDB_SIGNAL_0; interrupted = 0; prev_sigint = signal (SIGINT, gdb_cntrl_c); @@ -730,7 +731,7 @@ m32r_wait (struct target_ops *ops, if (c == '-') /* error */ { status->kind = TARGET_WAITKIND_STOPPED; - status->value.sig = TARGET_SIGNAL_HUP; + status->value.sig = GDB_SIGNAL_HUP; return inferior_ptid; } else if (c == '+') /* stopped */ @@ -746,9 +747,9 @@ m32r_wait (struct target_ops *ops, status->kind = TARGET_WAITKIND_STOPPED; if (interrupted) - status->value.sig = TARGET_SIGNAL_INT; + status->value.sig = GDB_SIGNAL_INT; else - status->value.sig = TARGET_SIGNAL_TRAP; + status->value.sig = GDB_SIGNAL_TRAP; interrupted = 0; signal (SIGINT, prev_sigint); @@ -759,7 +760,7 @@ m32r_wait (struct target_ops *ops, if (last_pc_addr != 0xffffffff) { buf[0] = SDI_WRITE_MEMORY; - if (gdbarch_byte_order (target_gdbarch) == BFD_ENDIAN_BIG) + if (gdbarch_byte_order (target_gdbarch ()) == BFD_ENDIAN_BIG) store_long_parameter (buf + 1, last_pc_addr); else store_long_parameter (buf + 1, last_pc_addr - 1); @@ -788,7 +789,7 @@ m32r_wait (struct target_ops *ops, address, we have to take care of it later. */ if ((pc_addr & 0x2) != 0) { - if (gdbarch_byte_order (target_gdbarch) == BFD_ENDIAN_BIG) + if (gdbarch_byte_order (target_gdbarch ()) == BFD_ENDIAN_BIG) { if ((bp_data[i][2] & 0x80) != 0) { @@ -850,7 +851,7 @@ m32r_wait (struct target_ops *ops, c = serial_readchar (sdi_desc, SDI_TIMEOUT); if (c != '-' && recv_data (buf, 4) != -1) { - if (gdbarch_byte_order (target_gdbarch) == BFD_ENDIAN_BIG) + if (gdbarch_byte_order (target_gdbarch ()) == BFD_ENDIAN_BIG) { if ((buf[3] & 0x1) == 0x1) hit_watchpoint_addr = ab_address[i]; @@ -882,10 +883,10 @@ m32r_detach (struct target_ops *ops, char *args, int from_tty) if (remote_debug) fprintf_unfiltered (gdb_stdlog, "m32r_detach(%d)\n", from_tty); - m32r_resume (ops, inferior_ptid, 0, TARGET_SIGNAL_0); + m32r_resume (ops, inferior_ptid, 0, GDB_SIGNAL_0); /* Calls m32r_close to do the real work. */ - pop_target (); + unpush_target (ops); if (from_tty) fprintf_unfiltered (gdb_stdlog, "Ending remote %s debugging\n", target_shortname); @@ -932,7 +933,7 @@ m32r_fetch_register (struct target_ops *ops, } else { - char buffer[MAX_REGISTER_SIZE]; + gdb_byte buffer[MAX_REGISTER_SIZE]; regid = get_reg_id (regno); send_one_arg_cmd (SDI_READ_CPU_REG, regid); @@ -1054,10 +1055,10 @@ m32r_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, { if (write) fprintf_unfiltered (gdb_stdlog, "m32r_xfer_memory(%s,%d,write)\n", - paddress (target_gdbarch, memaddr), len); + paddress (target_gdbarch (), memaddr), len); else fprintf_unfiltered (gdb_stdlog, "m32r_xfer_memory(%s,%d,read)\n", - paddress (target_gdbarch, memaddr), len); + paddress (target_gdbarch (), memaddr), len); } if (write) @@ -1233,8 +1234,7 @@ m32r_load (char *args, int from_tty) { char *arg; - while (isspace (*args)) - args++; + args = skip_spaces (args); arg = args; @@ -1257,13 +1257,13 @@ m32r_load (char *args, int from_tty) if (!filename) filename = get_exec_file (1); - pbfd = bfd_openr (filename, gnutarget); + pbfd = gdb_bfd_open (filename, gnutarget, -1); if (pbfd == NULL) { perror_with_name (filename); return; } - old_chain = make_cleanup_bfd_close (pbfd); + old_chain = make_cleanup_bfd_unref (pbfd); if (!bfd_check_format (pbfd, bfd_object)) error (_("\"%s\" is not an object file: %s"), filename, @@ -1423,7 +1423,7 @@ m32r_insert_watchpoint (CORE_ADDR addr, int len, int type, if (remote_debug) fprintf_unfiltered (gdb_stdlog, "m32r_insert_watchpoint(%s,%d,%d)\n", - paddress (target_gdbarch, addr), len, type); + paddress (target_gdbarch (), addr), len, type); for (i = 0; i < MAX_ACCESS_BREAKS; i++) { @@ -1448,7 +1448,7 @@ m32r_remove_watchpoint (CORE_ADDR addr, int len, int type, if (remote_debug) fprintf_unfiltered (gdb_stdlog, "m32r_remove_watchpoint(%s,%d,%d)\n", - paddress (target_gdbarch, addr), len, type); + paddress (target_gdbarch (), addr), len, type); for (i = 0; i < MAX_ACCESS_BREAKS; i++) {