#include <sys/param.h>
#include "gdbcore.h"
#include "value.h" /* For supply_register. */
-#include "inferior.h" /* For ARCH_NUM_REGS. */
#include "regcache.h"
/* These are needed on various systems to expand REGISTER_U_ADDR. */
CORE_ADDR addr;
int bad_reg = -1;
CORE_ADDR reg_ptr = -reg_addr; /* Original u.u_ar0 is -reg_addr. */
- int numregs = ARCH_NUM_REGS;
+ int numregs = NUM_REGS;
/* If u.u_ar0 was an absolute address in the core file, relativize it now,
so we can use it as an offset into core_reg_sect. When we're done,
{
CORE_ADDR addr;
- if (regno < 0 || regno >= ARCH_NUM_REGS)
+ if (regno < 0 || regno >= NUM_REGS)
error ("Invalid register number %d.", regno);
REGISTER_U_ADDR (addr, blockend, regno);