summaryrefslogtreecommitdiff
path: root/gdb/sh3-rom.c
diff options
context:
space:
mode:
Diffstat (limited to 'gdb/sh3-rom.c')
-rw-r--r--gdb/sh3-rom.c35
1 files changed, 12 insertions, 23 deletions
diff --git a/gdb/sh3-rom.c b/gdb/sh3-rom.c
index b76e8ca73af..47c147b7db0 100644
--- a/gdb/sh3-rom.c
+++ b/gdb/sh3-rom.c
@@ -1,5 +1,5 @@
/* Remote target glue for the Hitachi SH-3 ROM monitor.
- Copyright 1995, 1996 Free Software Foundation, Inc.
+ Copyright 1995, 1996, 2000 Free Software Foundation, Inc.
This file is part of GDB.
@@ -24,6 +24,7 @@
#include "monitor.h"
#include "serial.h"
#include "srec.h"
+#include "arch-utils.h"
static serial_t parallel;
static int parallel_in_use;
@@ -31,11 +32,7 @@ static int parallel_in_use;
static void sh3_open (char *args, int from_tty);
static void
-sh3_supply_register (regname, regnamelen, val, vallen)
- char *regname;
- int regnamelen;
- char *val;
- int vallen;
+sh3_supply_register (char *regname, int regnamelen, char *val, int vallen)
{
int numregs;
int regno;
@@ -75,9 +72,9 @@ sh3_supply_register (regname, regnamelen, val, vallen)
break;
case 'S':
if (regname[1] == 'S' && regname[2] == 'R')
- regno = SSR_REGNUM;
+ regno = gdbarch_tdep (current_gdbarch)->SSR_REGNUM;
else if (regname[1] == 'P' && regname[2] == 'C')
- regno = SPC_REGNUM;
+ regno = gdbarch_tdep (current_gdbarch)->SPC_REGNUM;
break;
}
}
@@ -121,10 +118,7 @@ sh3_supply_register (regname, regnamelen, val, vallen)
}
static void
-sh3_load (desc, file, hashmark)
- serial_t desc;
- char *file;
- int hashmark;
+sh3_load (serial_t desc, char *file, int hashmark)
{
if (parallel_in_use)
{
@@ -152,7 +146,7 @@ sh3_load (desc, file, hashmark)
than does GDB, and don't necessarily support all the registers
either. So, typing "info reg sp" becomes a "r30". */
-static char *sh3_regnames[NUM_REGS] =
+static char *sh3_regnames[] =
{
"R0", "R1", "R2", "R3", "R4", "R5", "R6", "R7",
"R8", "R9", "R10", "R11", "R12", "R13", "R14", "R15",
@@ -167,7 +161,7 @@ static char *sh3_regnames[NUM_REGS] =
"R4_BANK1", "R5_BANK1", "R6_BANK1", "R7_BANK1"
};
-static char *sh3e_regnames[NUM_REGS] =
+static char *sh3e_regnames[] =
{
"R0", "R1", "R2", "R3", "R4", "R5", "R6", "R7",
"R8", "R9", "R10", "R11", "R12", "R13", "R14", "R15",
@@ -248,9 +242,7 @@ init_sh3_cmds (void)
static struct monitor_ops sh3e_cmds;
static void
-sh3_open (args, from_tty)
- char *args;
- int from_tty;
+sh3_open (char *args, int from_tty)
{
char *serial_port_name = args;
char *parallel_port_name = 0;
@@ -290,9 +282,7 @@ sh3_open (args, from_tty)
static void
-sh3e_open (args, from_tty)
- char *args;
- int from_tty;
+sh3e_open (char *args, int from_tty)
{
char *serial_port_name = args;
char *parallel_port_name = 0;
@@ -338,8 +328,7 @@ sh3e_open (args, from_tty)
}
static void
-sh3_close (quitting)
- int quitting;
+sh3_close (int quitting)
{
monitor_close (quitting);
if (parallel_in_use)
@@ -350,7 +339,7 @@ sh3_close (quitting)
}
void
-_initialize_sh3_rom ()
+_initialize_sh3_rom (void)
{
init_sh3_cmds ();
init_monitor_ops (&sh3_ops);