* remote-e7000.c: unuse TM_FILE defined macro.
(e7000_fetch_registers) (e7000_store_registers) (e7000_wait): delete NUM_REALREGS. * remote-hms.c: move TM_FILE macro. (CCR_REGNO): move define from tm-h8300.h.
This commit is contained in:
parent
5ff625e975
commit
7124f6fbb4
3 changed files with 32 additions and 3 deletions
|
@ -1,3 +1,12 @@
|
||||||
|
2005-02-16 Yoshinori Sato <ysato@users.sourceforge.jp>
|
||||||
|
|
||||||
|
* remote-e7000.c: unuse TM_FILE defined macro.
|
||||||
|
(e7000_fetch_registers)
|
||||||
|
(e7000_store_registers)
|
||||||
|
(e7000_wait): delete NUM_REALREGS.
|
||||||
|
* remote-hms.c: move TM_FILE macro.
|
||||||
|
(CCR_REGNO): move define from tm-h8300.h.
|
||||||
|
|
||||||
2005-02-15 Mark Kettenis <kettenis@gnu.org>
|
2005-02-15 Mark Kettenis <kettenis@gnu.org>
|
||||||
|
|
||||||
* amd64-linux-tdep.c: Update copyright year.
|
* amd64-linux-tdep.c: Update copyright year.
|
||||||
|
|
|
@ -893,12 +893,14 @@ e7000_fetch_registers (void)
|
||||||
{
|
{
|
||||||
int regno;
|
int regno;
|
||||||
char *wanted = NULL;
|
char *wanted = NULL;
|
||||||
|
int realregs = 0;
|
||||||
|
|
||||||
puts_e7000debug ("R\r");
|
puts_e7000debug ("R\r");
|
||||||
|
|
||||||
if (TARGET_ARCHITECTURE->arch == bfd_arch_sh)
|
if (TARGET_ARCHITECTURE->arch == bfd_arch_sh)
|
||||||
{
|
{
|
||||||
wanted = want_sh;
|
wanted = want_sh;
|
||||||
|
realregs = 59;
|
||||||
switch (TARGET_ARCHITECTURE->mach)
|
switch (TARGET_ARCHITECTURE->mach)
|
||||||
{
|
{
|
||||||
case bfd_mach_sh3:
|
case bfd_mach_sh3:
|
||||||
|
@ -910,6 +912,7 @@ e7000_fetch_registers (void)
|
||||||
if (TARGET_ARCHITECTURE->arch == bfd_arch_h8300)
|
if (TARGET_ARCHITECTURE->arch == bfd_arch_h8300)
|
||||||
{
|
{
|
||||||
wanted = want_h8300h;
|
wanted = want_h8300h;
|
||||||
|
realregs = 10;
|
||||||
switch (TARGET_ARCHITECTURE->mach)
|
switch (TARGET_ARCHITECTURE->mach)
|
||||||
{
|
{
|
||||||
case bfd_mach_h8300s:
|
case bfd_mach_h8300s:
|
||||||
|
@ -917,13 +920,14 @@ e7000_fetch_registers (void)
|
||||||
case bfd_mach_h8300sx:
|
case bfd_mach_h8300sx:
|
||||||
case bfd_mach_h8300sxn:
|
case bfd_mach_h8300sxn:
|
||||||
wanted = want_h8300s;
|
wanted = want_h8300s;
|
||||||
|
realregs = 11;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fetch_regs_from_dump (gch, wanted);
|
fetch_regs_from_dump (gch, wanted);
|
||||||
|
|
||||||
/* And supply the extra ones the simulator uses */
|
/* And supply the extra ones the simulator uses */
|
||||||
for (regno = NUM_REALREGS; regno < NUM_REGS; regno++)
|
for (regno = realregs; regno < NUM_REGS; regno++)
|
||||||
{
|
{
|
||||||
int buf = 0;
|
int buf = 0;
|
||||||
|
|
||||||
|
@ -946,8 +950,18 @@ static void
|
||||||
e7000_store_registers (void)
|
e7000_store_registers (void)
|
||||||
{
|
{
|
||||||
int regno;
|
int regno;
|
||||||
|
int realregs = 0;
|
||||||
|
|
||||||
for (regno = 0; regno < NUM_REALREGS; regno++)
|
if (TARGET_ARCHITECTURE->arch == bfd_arch_sh)
|
||||||
|
realregs = 59;
|
||||||
|
if (TARGET_ARCHITECTURE->arch == bfd_arch_h8300) {
|
||||||
|
realregs = ((TARGET_ARCHITECTURE->mach == bfd_mach_h8300s ||
|
||||||
|
TARGET_ARCHITECTURE->mach == bfd_mach_h8300sn ||
|
||||||
|
TARGET_ARCHITECTURE->mach == bfd_mach_h8300sx ||
|
||||||
|
TARGET_ARCHITECTURE->mach == bfd_mach_h8300sxn) ? 11 : 10);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (regno = 0; regno < realregs; regno++)
|
||||||
e7000_store_register (regno);
|
e7000_store_register (regno);
|
||||||
|
|
||||||
registers_changed ();
|
registers_changed ();
|
||||||
|
@ -1998,6 +2012,7 @@ e7000_wait (ptid_t ptid, struct target_waitstatus *status)
|
||||||
int had_sleep = 0;
|
int had_sleep = 0;
|
||||||
int loop = 1;
|
int loop = 1;
|
||||||
char *wanted_nopc = NULL;
|
char *wanted_nopc = NULL;
|
||||||
|
int realregs = 0;
|
||||||
|
|
||||||
/* Then echo chars until PC= string seen */
|
/* Then echo chars until PC= string seen */
|
||||||
gch (); /* Drop cr */
|
gch (); /* Drop cr */
|
||||||
|
@ -2039,6 +2054,7 @@ e7000_wait (ptid_t ptid, struct target_waitstatus *status)
|
||||||
if (TARGET_ARCHITECTURE->arch == bfd_arch_sh)
|
if (TARGET_ARCHITECTURE->arch == bfd_arch_sh)
|
||||||
{
|
{
|
||||||
wanted_nopc = want_nopc_sh;
|
wanted_nopc = want_nopc_sh;
|
||||||
|
realregs = 59;
|
||||||
switch (TARGET_ARCHITECTURE->mach)
|
switch (TARGET_ARCHITECTURE->mach)
|
||||||
{
|
{
|
||||||
case bfd_mach_sh3:
|
case bfd_mach_sh3:
|
||||||
|
@ -2050,6 +2066,7 @@ e7000_wait (ptid_t ptid, struct target_waitstatus *status)
|
||||||
if (TARGET_ARCHITECTURE->arch == bfd_arch_h8300)
|
if (TARGET_ARCHITECTURE->arch == bfd_arch_h8300)
|
||||||
{
|
{
|
||||||
wanted_nopc = want_nopc_h8300h;
|
wanted_nopc = want_nopc_h8300h;
|
||||||
|
realregs = 10;
|
||||||
switch (TARGET_ARCHITECTURE->mach)
|
switch (TARGET_ARCHITECTURE->mach)
|
||||||
{
|
{
|
||||||
case bfd_mach_h8300s:
|
case bfd_mach_h8300s:
|
||||||
|
@ -2057,12 +2074,13 @@ e7000_wait (ptid_t ptid, struct target_waitstatus *status)
|
||||||
case bfd_mach_h8300sx:
|
case bfd_mach_h8300sx:
|
||||||
case bfd_mach_h8300sxn:
|
case bfd_mach_h8300sxn:
|
||||||
wanted_nopc = want_nopc_h8300s;
|
wanted_nopc = want_nopc_h8300s;
|
||||||
|
realregs = 11;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fetch_regs_from_dump (gch, wanted_nopc);
|
fetch_regs_from_dump (gch, wanted_nopc);
|
||||||
|
|
||||||
/* And supply the extra ones the simulator uses */
|
/* And supply the extra ones the simulator uses */
|
||||||
for (regno = NUM_REALREGS; regno < NUM_REGS; regno++)
|
for (regno = realregs; regno < NUM_REGS; regno++)
|
||||||
{
|
{
|
||||||
int buf = 0;
|
int buf = 0;
|
||||||
regcache_raw_supply (current_regcache, regno, (char *) &buf);
|
regcache_raw_supply (current_regcache, regno, (char *) &buf);
|
||||||
|
|
|
@ -28,6 +28,8 @@
|
||||||
#include "serial.h"
|
#include "serial.h"
|
||||||
#include "regcache.h"
|
#include "regcache.h"
|
||||||
|
|
||||||
|
#define CCR_REGNUM 8
|
||||||
|
|
||||||
static void hms_open (char *args, int from_tty);
|
static void hms_open (char *args, int from_tty);
|
||||||
static void
|
static void
|
||||||
hms_supply_register (char *regname, int regnamelen, char *val, int vallen)
|
hms_supply_register (char *regname, int regnamelen, char *val, int vallen)
|
||||||
|
|
Loading…
Add table
Reference in a new issue