#include "inferior.h"
#include "target.h"
#include "gdbarch.h"
+#include "gdbcmd.h"
/*
* DATA STRUCTURE
* Here is the actual register cache.
*/
-/* NOTE: this is a write-back cache. There is no "dirty" bit for
+/* NOTE: this is a write-through cache. There is no "dirty" bit for
recording if the register values have been changed (eg. by the
user). Therefore all registers must be written back to the
target when appropriate. */
return register_valid[regnum];
}
+/* Record that REGNUM's value is cached if STATE is >0, uncached but
+ fetchable if STATE is 0, and uncached and unfetchable if STATE is <0. */
+
+void
+set_register_cached (int regnum, int state)
+{
+ register_valid[regnum] = state;
+}
+
+/* REGISTER_CHANGED
+
+ invalidate a single register REGNUM in the cache */
+void
+register_changed (int regnum)
+{
+ set_register_cached (regnum, 0);
+}
+
+/* If REGNUM >= 0, return a pointer to register REGNUM's cache buffer area,
+ else return a pointer to the start of the cache buffer. */
+
+char *
+register_buffer (int regnum)
+{
+ if (regnum < 0)
+ return registers;
+ else
+ return ®isters[REGISTER_BYTE (regnum)];
+}
+
+/* Return whether register REGNUM is a real register. */
+
+static int
+real_register (int regnum)
+{
+ return regnum >= 0 && regnum < NUM_REGS;
+}
+
+/* Return whether register REGNUM is a pseudo register. */
+
+static int
+pseudo_register (int regnum)
+{
+ return regnum >= NUM_REGS && regnum < NUM_REGS + NUM_PSEUDO_REGS;
+}
+
+/* Fetch register REGNUM into the cache. */
+
+static void
+fetch_register (int regnum)
+{
+ if (real_register (regnum))
+ target_fetch_registers (regnum);
+ else if (pseudo_register (regnum))
+ FETCH_PSEUDO_REGISTER (regnum);
+}
+
+/* Write register REGNUM cached value to the target. */
+
+static void
+store_register (int regnum)
+{
+ if (real_register (regnum))
+ target_store_registers (regnum);
+ else if (pseudo_register (regnum))
+ STORE_PSEUDO_REGISTER (regnum);
+}
+
/* FIND_SAVED_REGISTER ()
Return the address in which frame FRAME's value of register REGNUM
get_saved_register (myaddr, &optim, (CORE_ADDR *) NULL, frame,
regnum, (enum lval_type *) NULL);
- if (register_valid[regnum] < 0)
+ if (register_cached (regnum) < 0)
return 1; /* register value not available */
return optim;
registers_changed (void)
{
int i;
- int numregs = ARCH_NUM_REGS;
registers_pid = -1;
gdb gives control to the user (ie watchpoints). */
alloca (0);
- for (i = 0; i < numregs; i++)
- register_valid[i] = 0;
+ for (i = 0; i < ARCH_NUM_REGS; i++)
+ set_register_cached (i, 0);
+
+ /* Assume that if all the hardware regs have changed,
+ then so have the pseudo-registers. */
+ for (i = NUM_REGS; i < NUM_REGS + NUM_PSEUDO_REGS; i++)
+ set_register_cached (i, 0);
if (registers_changed_hook)
registers_changed_hook ();
registers_fetched (void)
{
int i;
- int numregs = ARCH_NUM_REGS;
- for (i = 0; i < numregs; i++)
- register_valid[i] = 1;
+ for (i = 0; i < ARCH_NUM_REGS; i++)
+ set_register_cached (i, 1);
+ /* Do not assume that the pseudo-regs have also been fetched.
+ Fetching all real regs might not account for all pseudo-regs. */
}
/* read_register_bytes and write_register_bytes are generally a *BAD*
is that register sizes can vary, so a simple index won't suffice.]
It is far better to call read_register_gen and write_register_gen
if you want to get at the raw register contents, as it only takes a
- regno as an argument, and therefore can't do a partial register
+ regnum as an argument, and therefore can't do a partial register
update.
Prior to the recent fixes to check for partial updates, both read
read_register_bytes (int inregbyte, char *myaddr, int inlen)
{
int inregend = inregbyte + inlen;
- int regno;
+ int regnum;
if (registers_pid != inferior_pid)
{
/* See if we are trying to read bytes from out-of-date registers. If so,
update just those registers. */
- for (regno = 0; regno < NUM_REGS; regno++)
+ for (regnum = 0; regnum < NUM_REGS + NUM_PSEUDO_REGS; regnum++)
{
int regstart, regend;
- if (register_valid[regno])
+ if (register_cached (regnum))
continue;
- if (REGISTER_NAME (regno) == NULL || *REGISTER_NAME (regno) == '\0')
+ if (REGISTER_NAME (regnum) == NULL || *REGISTER_NAME (regnum) == '\0')
continue;
- regstart = REGISTER_BYTE (regno);
- regend = regstart + REGISTER_RAW_SIZE (regno);
+ regstart = REGISTER_BYTE (regnum);
+ regend = regstart + REGISTER_RAW_SIZE (regnum);
if (regend <= inregbyte || inregend <= regstart)
- /* The range the user wants to read doesn't overlap with regno. */
+ /* The range the user wants to read doesn't overlap with regnum. */
continue;
- /* We've found an invalid register where at least one byte will be read.
+ /* We've found an uncached register where at least one byte will be read.
Update it from the target. */
- target_fetch_registers (regno);
+ fetch_register (regnum);
- if (!register_valid[regno])
- error ("read_register_bytes: Couldn't update register %d.", regno);
+ if (!register_cached (regnum))
+ {
+ /* Sometimes pseudoregs are never marked valid, so that they
+ will be fetched every time (it can be complicated to know
+ if a pseudoreg is valid, while "fetching" them can be cheap).
+ */
+ if (regnum < NUM_REGS)
+ error ("read_register_bytes: Couldn't update register %d.", regnum);
+ }
}
if (myaddr != NULL)
- memcpy (myaddr, ®isters[inregbyte], inlen);
+ memcpy (myaddr, register_buffer (-1) + inregbyte, inlen);
}
-/* Read register REGNO into memory at MYADDR, which must be large
- enough for REGISTER_RAW_BYTES (REGNO). Target byte-order. If the
+/* Read register REGNUM into memory at MYADDR, which must be large
+ enough for REGISTER_RAW_BYTES (REGNUM). Target byte-order. If the
register is known to be the size of a CORE_ADDR or smaller,
read_register can be used instead. */
void
-read_register_gen (int regno, char *myaddr)
+read_register_gen (int regnum, char *myaddr)
{
if (registers_pid != inferior_pid)
{
registers_pid = inferior_pid;
}
- if (!register_valid[regno])
- target_fetch_registers (regno);
- memcpy (myaddr, ®isters[REGISTER_BYTE (regno)],
- REGISTER_RAW_SIZE (regno));
+ if (!register_cached (regnum))
+ fetch_register (regnum);
+
+ memcpy (myaddr, register_buffer (regnum),
+ REGISTER_RAW_SIZE (regnum));
}
-/* Write register REGNO at MYADDR to the target. MYADDR points at
- REGISTER_RAW_BYTES(REGNO), which must be in target byte-order. */
+/* Write register REGNUM at MYADDR to the target. MYADDR points at
+ REGISTER_RAW_BYTES(REGNUM), which must be in target byte-order. */
/* Registers we shouldn't try to store. */
#if !defined (CANNOT_STORE_REGISTER)
-#define CANNOT_STORE_REGISTER(regno) 0
+#define CANNOT_STORE_REGISTER(regnum) 0
#endif
void
-write_register_gen (int regno, char *myaddr)
+write_register_gen (int regnum, char *myaddr)
{
int size;
/* On the sparc, writing %g0 is a no-op, so we don't even want to
change the registers array if something writes to this register. */
- if (CANNOT_STORE_REGISTER (regno))
+ if (CANNOT_STORE_REGISTER (regnum))
return;
if (registers_pid != inferior_pid)
registers_pid = inferior_pid;
}
- size = REGISTER_RAW_SIZE (regno);
+ size = REGISTER_RAW_SIZE (regnum);
/* If we have a valid copy of the register, and new value == old value,
then don't bother doing the actual store. */
- if (register_valid[regno]
- && memcmp (®isters[REGISTER_BYTE (regno)], myaddr, size) == 0)
+ if (register_cached (regnum)
+ && memcmp (register_buffer (regnum), myaddr, size) == 0)
return;
- target_prepare_to_store ();
+ if (real_register (regnum))
+ target_prepare_to_store ();
- memcpy (®isters[REGISTER_BYTE (regno)], myaddr, size);
+ memcpy (register_buffer (regnum), myaddr, size);
- register_valid[regno] = 1;
-
- target_store_registers (regno);
+ set_register_cached (regnum, 1);
+ store_register (regnum);
}
/* Copy INLEN bytes of consecutive data from memory at MYADDR
write_register_bytes (int myregstart, char *myaddr, int inlen)
{
int myregend = myregstart + inlen;
- int regno;
+ int regnum;
target_prepare_to_store ();
nice things like handling threads, and avoiding updates when the
new and old contents are the same. */
- for (regno = 0; regno < NUM_REGS; regno++)
+ for (regnum = 0; regnum < NUM_REGS + NUM_PSEUDO_REGS; regnum++)
{
int regstart, regend;
- regstart = REGISTER_BYTE (regno);
- regend = regstart + REGISTER_RAW_SIZE (regno);
+ regstart = REGISTER_BYTE (regnum);
+ regend = regstart + REGISTER_RAW_SIZE (regnum);
/* Is this register completely outside the range the user is writing? */
if (myregend <= regstart || regend <= myregstart)
/* Is this register completely within the range the user is writing? */
else if (myregstart <= regstart && regend <= myregend)
- write_register_gen (regno, myaddr + (regstart - myregstart));
+ write_register_gen (regnum, myaddr + (regstart - myregstart));
/* The register partially overlaps the range being written. */
else
/* We may be doing a partial update of an invalid register.
Update it from the target before scribbling on it. */
- read_register_gen (regno, regbuf);
+ read_register_gen (regnum, regbuf);
memcpy (registers + overlapstart,
myaddr + (overlapstart - myregstart),
overlapend - overlapstart);
- target_store_registers (regno);
+ store_register (regnum);
}
}
}
-/* Return the raw contents of register REGNO, regarding it as an
- integer. This probably should be returning LONGEST rather than
- CORE_ADDR. */
+/* Return the contents of register REGNUM as an unsigned integer. */
-CORE_ADDR
-read_register (int regno)
+ULONGEST
+read_register (int regnum)
{
if (registers_pid != inferior_pid)
{
registers_pid = inferior_pid;
}
- if (!register_valid[regno])
- target_fetch_registers (regno);
+ if (!register_cached (regnum))
+ fetch_register (regnum);
- return ((CORE_ADDR)
- extract_unsigned_integer (®isters[REGISTER_BYTE (regno)],
- REGISTER_RAW_SIZE (regno)));
+ return (extract_unsigned_integer (register_buffer (regnum),
+ REGISTER_RAW_SIZE (regnum)));
}
-CORE_ADDR
-read_register_pid (int regno, int pid)
+ULONGEST
+read_register_pid (int regnum, int pid)
{
int save_pid;
CORE_ADDR retval;
if (pid == inferior_pid)
- return read_register (regno);
+ return read_register (regnum);
save_pid = inferior_pid;
inferior_pid = pid;
- retval = read_register (regno);
+ retval = read_register (regnum);
inferior_pid = save_pid;
return retval;
}
-/* Store VALUE, into the raw contents of register number REGNO. */
+/* Return the contents of register REGNUM as a signed integer. */
+
+LONGEST
+read_signed_register (int regnum)
+{
+ if (registers_pid != inferior_pid)
+ {
+ registers_changed ();
+ registers_pid = inferior_pid;
+ }
+
+ if (!register_cached (regnum))
+ fetch_register (regnum);
+
+ return (extract_signed_integer (register_buffer (regnum),
+ REGISTER_RAW_SIZE (regnum)));
+}
+
+LONGEST
+read_signed_register_pid (int regnum, int pid)
+{
+ int save_pid;
+ LONGEST retval;
+
+ if (pid == inferior_pid)
+ return read_signed_register (regnum);
+
+ save_pid = inferior_pid;
+
+ inferior_pid = pid;
+
+ retval = read_signed_register (regnum);
+
+ inferior_pid = save_pid;
+
+ return retval;
+}
+
+/* Store VALUE into the raw contents of register number REGNUM. */
void
-write_register (int regno, LONGEST val)
+write_register (int regnum, LONGEST val)
{
PTR buf;
int size;
/* On the sparc, writing %g0 is a no-op, so we don't even want to
change the registers array if something writes to this register. */
- if (CANNOT_STORE_REGISTER (regno))
+ if (CANNOT_STORE_REGISTER (regnum))
return;
if (registers_pid != inferior_pid)
registers_pid = inferior_pid;
}
- size = REGISTER_RAW_SIZE (regno);
+ size = REGISTER_RAW_SIZE (regnum);
buf = alloca (size);
store_signed_integer (buf, size, (LONGEST) val);
/* If we have a valid copy of the register, and new value == old value,
then don't bother doing the actual store. */
- if (register_valid[regno]
- && memcmp (®isters[REGISTER_BYTE (regno)], buf, size) == 0)
+ if (register_cached (regnum)
+ && memcmp (register_buffer (regnum), buf, size) == 0)
return;
- target_prepare_to_store ();
-
- memcpy (®isters[REGISTER_BYTE (regno)], buf, size);
+ if (real_register (regnum))
+ target_prepare_to_store ();
- register_valid[regno] = 1;
+ memcpy (register_buffer (regnum), buf, size);
- target_store_registers (regno);
+ set_register_cached (regnum, 1);
+ store_register (regnum);
}
void
-write_register_pid (int regno, CORE_ADDR val, int pid)
+write_register_pid (int regnum, CORE_ADDR val, int pid)
{
int save_pid;
if (pid == inferior_pid)
{
- write_register (regno, val);
+ write_register (regnum, val);
return;
}
inferior_pid = pid;
- write_register (regno, val);
+ write_register (regnum, val);
inferior_pid = save_pid;
}
/* SUPPLY_REGISTER()
- Record that register REGNO contains VAL. This is used when the
+ Record that register REGNUM contains VAL. This is used when the
value is obtained from the inferior or core dump, so there is no
need to store the value there.
If VAL is a NULL pointer, then it's probably an unsupported register.
- We just set it's value to all zeros. We might want to record this
+ We just set its value to all zeros. We might want to record this
fact, and report it to the users of read_register and friends. */
void
-supply_register (int regno, char *val)
+supply_register (int regnum, char *val)
{
#if 1
if (registers_pid != inferior_pid)
}
#endif
- register_valid[regno] = 1;
+ set_register_cached (regnum, 1);
if (val)
- memcpy (®isters[REGISTER_BYTE (regno)], val,
- REGISTER_RAW_SIZE (regno));
+ memcpy (register_buffer (regnum), val,
+ REGISTER_RAW_SIZE (regnum));
else
- memset (®isters[REGISTER_BYTE (regno)], '\000',
- REGISTER_RAW_SIZE (regno));
+ memset (register_buffer (regnum), '\000',
+ REGISTER_RAW_SIZE (regnum));
/* On some architectures, e.g. HPPA, there are a few stray bits in
some registers, that the rest of the code would like to ignore. */
#ifdef CLEAN_UP_REGISTER_VALUE
- CLEAN_UP_REGISTER_VALUE (regno, ®isters[REGISTER_BYTE (regno)]);
+ CLEAN_UP_REGISTER_VALUE (regnum, register_buffer (regnum));
#endif
}
Ditto for write_pc.
1999-06-08: The following were re-written so that it assumes the
- existance of a TARGET_READ_PC et.al. macro. A default generic
+ existence of a TARGET_READ_PC et.al. macro. A default generic
version of that macro is made available where needed.
Since the ``TARGET_READ_PC'' et.al. macro is going to be controlled
eliminate the intermediate read_pc_pid(). The client would call
TARGET_READ_PC directly. (cagney). */
-#ifndef TARGET_READ_PC
-#define TARGET_READ_PC generic_target_read_pc
-#endif
-
CORE_ADDR
generic_target_read_pc (int pid)
{
return read_pc_pid (inferior_pid);
}
-#ifndef TARGET_WRITE_PC
-#define TARGET_WRITE_PC generic_target_write_pc
-#endif
-
void
generic_target_write_pc (CORE_ADDR pc, int pid)
{
/* Cope with strage ways of getting to the stack and frame pointers */
-#ifndef TARGET_READ_SP
-#define TARGET_READ_SP generic_target_read_sp
-#endif
-
CORE_ADDR
generic_target_read_sp (void)
{
return TARGET_READ_SP ();
}
-#ifndef TARGET_WRITE_SP
-#define TARGET_WRITE_SP generic_target_write_sp
-#endif
-
void
generic_target_write_sp (CORE_ADDR val)
{
TARGET_WRITE_SP (val);
}
-#ifndef TARGET_READ_FP
-#define TARGET_READ_FP generic_target_read_fp
-#endif
-
CORE_ADDR
generic_target_read_fp (void)
{
return TARGET_READ_FP ();
}
-#ifndef TARGET_WRITE_FP
-#define TARGET_WRITE_FP generic_target_write_fp
-#endif
-
void
generic_target_write_fp (CORE_ADDR val)
{
TARGET_WRITE_FP (val);
}
+/* ARGSUSED */
+static void
+reg_flush_command (char *command, int from_tty)
+{
+ /* Force-flush the register cache. */
+ registers_changed ();
+ if (from_tty)
+ printf_filtered ("Register cache flushed.\n");
+}
+
+
static void
build_regcache (void)
{
/* We allocate some extra slop since we do a lot of memcpy's around
`registers', and failing-soft is better than failing hard. */
int sizeof_registers = REGISTER_BYTES + /* SLOP */ 256;
- int sizeof_register_valid = NUM_REGS * sizeof (*register_valid);
+ int sizeof_register_valid =
+ (NUM_REGS + NUM_PSEUDO_REGS) * sizeof (*register_valid);
registers = xmalloc (sizeof_registers);
memset (registers, 0, sizeof_registers);
register_valid = xmalloc (sizeof_register_valid);
register_gdbarch_swap (®isters, sizeof (registers), NULL);
register_gdbarch_swap (®ister_valid, sizeof (register_valid), NULL);
register_gdbarch_swap (NULL, 0, build_regcache);
+
+ add_com ("flushregs", class_maintenance, reg_flush_command,
+ "Force gdb to flush its register cache (maintainer command)");
}