this file is more machine-specific. */
#include "defs.h"
-#include "param.h"
+#include <sys/types.h>
+#include <sys/param.h>
#include "gdbcore.h"
-/* Some of these are needed on various systems, perhaps, to expand
- REGISTER_U_ADDR appropriately? */
-/* #include <sys/core.h> */
-#include <sys/param.h>
+/* These are needed on various systems to expand REGISTER_U_ADDR. */
+#ifndef USG
#include <sys/dir.h>
#include <sys/file.h>
#include <sys/stat.h>
#include <sys/user.h>
-
+#ifndef NO_PTRACE_H
+# ifdef PTRACE_IN_WRONG_PLACE
+# include <ptrace.h>
+# else /* !PTRACE_IN_WRONG_PLACE */
+# include <sys/ptrace.h>
+# endif /* !PTRACE_IN_WRONG_PLACE */
+#endif /* NO_PTRACE_H */
+#endif
+
+#ifdef NEED_SYS_CORE_H
+#include <sys/core.h>
+#endif
/* Extract the register values out of the core file and store
- them where `read_register' will find them. */
+ them where `read_register' will find them.
+
+ CORE_REG_SECT points to the register values themselves, read into memory.
+ CORE_REG_SIZE is the size of that area.
+ WHICH says which set of registers we are handling (0 = int, 2 = float
+ on machines where they are discontiguous).
+ REG_ADDR is the offset from u.u_ar0 to the register values relative to
+ core_reg_sect. This is used with old-fashioned core files to
+ locate the registers in a large upage-plus-stack ".reg" section.
+ Original upage address X is at location core_reg_sect+x+reg_addr.
+ */
void
-fetch_core_registers (core_reg_sect, core_reg_size)
+fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr)
char *core_reg_sect;
unsigned core_reg_size;
+ int which;
+ unsigned reg_addr;
{
register int regno;
register unsigned int addr;
int bad_reg = -1;
+ register reg_ptr = -reg_addr; /* Original u.u_ar0 is -reg_addr. */
+
+ /* 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,
+ "register 0" will be at core_reg_sect+reg_ptr, and we can use
+ register_addr to offset to the other registers. If this is a modern
+ core file without a upage, reg_ptr will be zero and this is all a big
+ NOP. */
+ if (reg_ptr > core_reg_size)
+ reg_ptr -= KERNEL_U_ADDR;
for (regno = 0; regno < NUM_REGS; regno++)
{
- addr = register_addr (regno, core_reg_size);
+ addr = register_addr (regno, reg_ptr);
if (addr >= core_reg_size) {
if (bad_reg < 0)
bad_reg = regno;
supply_register (regno, core_reg_sect + addr);
}
}
- if (bad_reg > 0)
+ if (bad_reg >= 0)
{
error ("Register %s not found in core file.", reg_names[bad_reg]);
}