FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2003-09-17 Andrew Cagney <cagney@redhat.com>

Browse source 
* gdbarch.sh (DEPRECATED_NPC_REGNUM): Deprecate NPC_REGNUM.
	* gdbarch.h, gdbarch.c: Regenerate.
	* core-sol2.c, hppa-tdep.c, lynx-nat.c, procfs.c: Update.
	* regcache.c, remote-vxsparc.c, sparc-linux-nat.c: Update.
	* sparc-nat.c, sparc-tdep.c, sparc64-tdep.c: Update.
	* sparcnbsd-tdep.c: Update.
This commit is contained in:
Andrew Cagney 2003-09-17 15:42:21 +00:00
parent 627003499d
commit efe59759d8
15 changed files with 79 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gdb/ChangeLog
View file

@ -1,3 +1,12 @@
2003-09-17 Andrew Cagney <cagney@redhat.com>
* gdbarch.sh (DEPRECATED_NPC_REGNUM): Deprecate NPC_REGNUM.
* gdbarch.h, gdbarch.c: Regenerate.
* core-sol2.c, hppa-tdep.c, lynx-nat.c, procfs.c: Update.
* regcache.c, remote-vxsparc.c, sparc-linux-nat.c: Update.
* sparc-nat.c, sparc-tdep.c, sparc64-tdep.c: Update.
* sparcnbsd-tdep.c: Update.
2003-09-17 Andrew Cagney <cagney@redhat.com> 2003-09-17 Andrew Cagney <cagney@redhat.com>
* gdbarch.sh (DEPRECATED_REGISTER_BYTE): Rename REGISTER_BYTE. * gdbarch.sh (DEPRECATED_REGISTER_BYTE): Rename REGISTER_BYTE.

2
gdb/core-sol2.c
View file

@ -103,7 +103,7 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, int which,
= gregs->r_ps; = gregs->r_ps;
*(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)] *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)]
= gregs->r_pc; = gregs->r_pc;
*(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (NPC_REGNUM)] *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (DEPRECATED_NPC_REGNUM)]
= gregs->r_npc; = gregs->r_npc;
*(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (Y_REGNUM)] *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (Y_REGNUM)]
= gregs->r_y; = gregs->r_y;

38
gdb/gdbarch.c
View file

@ -142,7 +142,7 @@ struct gdbarch
int pc_regnum; int pc_regnum;
int ps_regnum; int ps_regnum;
int fp0_regnum; int fp0_regnum;
int npc_regnum; int deprecated_npc_regnum;
gdbarch_stab_reg_to_regnum_ftype *stab_reg_to_regnum; gdbarch_stab_reg_to_regnum_ftype *stab_reg_to_regnum;
gdbarch_ecoff_reg_to_regnum_ftype *ecoff_reg_to_regnum; gdbarch_ecoff_reg_to_regnum_ftype *ecoff_reg_to_regnum;
gdbarch_dwarf_reg_to_regnum_ftype *dwarf_reg_to_regnum; gdbarch_dwarf_reg_to_regnum_ftype *dwarf_reg_to_regnum;
@ -310,7 +310,7 @@ struct gdbarch startup_gdbarch =
-1, /* pc_regnum */ -1, /* pc_regnum */
-1, /* ps_regnum */ -1, /* ps_regnum */
0, /* fp0_regnum */ 0, /* fp0_regnum */
0, /* npc_regnum */ 0, /* deprecated_npc_regnum */
0, /* stab_reg_to_regnum */ 0, /* stab_reg_to_regnum */
0, /* ecoff_reg_to_regnum */ 0, /* ecoff_reg_to_regnum */
0, /* dwarf_reg_to_regnum */ 0, /* dwarf_reg_to_regnum */
@ -501,7 +501,7 @@ gdbarch_alloc (const struct gdbarch_info *info,
current_gdbarch->pc_regnum = -1; current_gdbarch->pc_regnum = -1;
current_gdbarch->ps_regnum = -1; current_gdbarch->ps_regnum = -1;
current_gdbarch->fp0_regnum = -1; current_gdbarch->fp0_regnum = -1;
current_gdbarch->npc_regnum = -1; current_gdbarch->deprecated_npc_regnum = -1;
current_gdbarch->stab_reg_to_regnum = no_op_reg_to_regnum; current_gdbarch->stab_reg_to_regnum = no_op_reg_to_regnum;
current_gdbarch->ecoff_reg_to_regnum = no_op_reg_to_regnum; current_gdbarch->ecoff_reg_to_regnum = no_op_reg_to_regnum;
current_gdbarch->dwarf_reg_to_regnum = no_op_reg_to_regnum; current_gdbarch->dwarf_reg_to_regnum = no_op_reg_to_regnum;
@ -632,7 +632,7 @@ verify_gdbarch (struct gdbarch *gdbarch)
/* Skip verify of pc_regnum, invalid_p == 0 */ /* Skip verify of pc_regnum, invalid_p == 0 */
/* Skip verify of ps_regnum, invalid_p == 0 */ /* Skip verify of ps_regnum, invalid_p == 0 */
/* Skip verify of fp0_regnum, invalid_p == 0 */ /* Skip verify of fp0_regnum, invalid_p == 0 */
/* Skip verify of npc_regnum, invalid_p == 0 */ /* Skip verify of deprecated_npc_regnum, invalid_p == 0 */
/* Skip verify of stab_reg_to_regnum, invalid_p == 0 */ /* Skip verify of stab_reg_to_regnum, invalid_p == 0 */
/* Skip verify of ecoff_reg_to_regnum, invalid_p == 0 */ /* Skip verify of ecoff_reg_to_regnum, invalid_p == 0 */
/* Skip verify of dwarf_reg_to_regnum, invalid_p == 0 */ /* Skip verify of dwarf_reg_to_regnum, invalid_p == 0 */
@ -1357,6 +1357,14 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file)
"gdbarch_dump: DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE = %d\n", "gdbarch_dump: DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE = %d\n",
DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE); DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE);
#endif #endif
#ifdef DEPRECATED_NPC_REGNUM
fprintf_unfiltered (file,
"gdbarch_dump: DEPRECATED_NPC_REGNUM # %s\n",
XSTRING (DEPRECATED_NPC_REGNUM));
fprintf_unfiltered (file,
"gdbarch_dump: DEPRECATED_NPC_REGNUM = %d\n",
DEPRECATED_NPC_REGNUM);
#endif
#ifdef DEPRECATED_PC_IN_CALL_DUMMY_P #ifdef DEPRECATED_PC_IN_CALL_DUMMY_P
fprintf_unfiltered (file, fprintf_unfiltered (file,
"gdbarch_dump: %s # %s\n", "gdbarch_dump: %s # %s\n",
@ -1910,14 +1918,6 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file)
"gdbarch_dump: NAME_OF_MALLOC = %s\n", "gdbarch_dump: NAME_OF_MALLOC = %s\n",
NAME_OF_MALLOC); NAME_OF_MALLOC);
#endif #endif
#ifdef NPC_REGNUM
fprintf_unfiltered (file,
"gdbarch_dump: NPC_REGNUM # %s\n",
XSTRING (NPC_REGNUM));
fprintf_unfiltered (file,
"gdbarch_dump: NPC_REGNUM = %d\n",
NPC_REGNUM);
#endif
#ifdef NUM_PSEUDO_REGS #ifdef NUM_PSEUDO_REGS
fprintf_unfiltered (file, fprintf_unfiltered (file,
"gdbarch_dump: NUM_PSEUDO_REGS # %s\n", "gdbarch_dump: NUM_PSEUDO_REGS # %s\n",
@ -2971,20 +2971,20 @@ set_gdbarch_fp0_regnum (struct gdbarch *gdbarch,
} }
int int
gdbarch_npc_regnum (struct gdbarch *gdbarch) gdbarch_deprecated_npc_regnum (struct gdbarch *gdbarch)
{ {
gdb_assert (gdbarch != NULL); gdb_assert (gdbarch != NULL);
/* Skip verify of npc_regnum, invalid_p == 0 */ /* Skip verify of deprecated_npc_regnum, invalid_p == 0 */
if (gdbarch_debug >= 2) if (gdbarch_debug >= 2)
fprintf_unfiltered (gdb_stdlog, "gdbarch_npc_regnum called\n"); fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_npc_regnum called\n");
return gdbarch->npc_regnum; return gdbarch->deprecated_npc_regnum;
} }
void void
set_gdbarch_npc_regnum (struct gdbarch *gdbarch, set_gdbarch_deprecated_npc_regnum (struct gdbarch *gdbarch,
int npc_regnum) int deprecated_npc_regnum)
{ {
gdbarch->npc_regnum = npc_regnum; gdbarch->deprecated_npc_regnum = deprecated_npc_regnum;
} }
int int

15
gdb/gdbarch.h
View file

@ -374,13 +374,16 @@ extern void set_gdbarch_fp0_regnum (struct gdbarch *gdbarch, int fp0_regnum);
#define FP0_REGNUM (gdbarch_fp0_regnum (current_gdbarch)) #define FP0_REGNUM (gdbarch_fp0_regnum (current_gdbarch))
#endif #endif
extern int gdbarch_npc_regnum (struct gdbarch *gdbarch); /* Replace DEPRECATED_NPC_REGNUM with an implementation of WRITE_PC
extern void set_gdbarch_npc_regnum (struct gdbarch *gdbarch, int npc_regnum); that updates PC, NPC and even NNPC. */
#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (NPC_REGNUM)
#error "Non multi-arch definition of NPC_REGNUM" extern int gdbarch_deprecated_npc_regnum (struct gdbarch *gdbarch);
extern void set_gdbarch_deprecated_npc_regnum (struct gdbarch *gdbarch, int deprecated_npc_regnum);
#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_NPC_REGNUM)
#error "Non multi-arch definition of DEPRECATED_NPC_REGNUM"
#endif #endif
#if !defined (NPC_REGNUM) #if !defined (DEPRECATED_NPC_REGNUM)
#define NPC_REGNUM (gdbarch_npc_regnum (current_gdbarch)) #define DEPRECATED_NPC_REGNUM (gdbarch_deprecated_npc_regnum (current_gdbarch))
#endif #endif
/* Convert stab register number (from `r' declaration) to a gdb REGNUM. */ /* Convert stab register number (from `r' declaration) to a gdb REGNUM. */

4
gdb/gdbarch.sh
View file

@ -453,7 +453,9 @@ v:2:SP_REGNUM:int:sp_regnum::::-1:-1::0
v:2:PC_REGNUM:int:pc_regnum::::-1:-1::0 v:2:PC_REGNUM:int:pc_regnum::::-1:-1::0
v:2:PS_REGNUM:int:ps_regnum::::-1:-1::0 v:2:PS_REGNUM:int:ps_regnum::::-1:-1::0
v:2:FP0_REGNUM:int:fp0_regnum::::0:-1::0 v:2:FP0_REGNUM:int:fp0_regnum::::0:-1::0
v:2:NPC_REGNUM:int:npc_regnum::::0:-1::0 # Replace DEPRECATED_NPC_REGNUM with an implementation of WRITE_PC
# that updates PC, NPC and even NNPC.
v:2:DEPRECATED_NPC_REGNUM:int:deprecated_npc_regnum::::0:-1::0
# Convert stab register number (from \`r\' declaration) to a gdb REGNUM. # Convert stab register number (from \`r\' declaration) to a gdb REGNUM.
f:2:STAB_REG_TO_REGNUM:int:stab_reg_to_regnum:int stab_regnr:stab_regnr:::no_op_reg_to_regnum::0 f:2:STAB_REG_TO_REGNUM:int:stab_reg_to_regnum:int stab_regnr:stab_regnr:::no_op_reg_to_regnum::0
# Provide a default mapping from a ecoff register number to a gdb REGNUM. # Provide a default mapping from a ecoff register number to a gdb REGNUM.

4
gdb/hppa-tdep.c
View file

@ -2630,7 +2630,7 @@ hppa_target_write_pc (CORE_ADDR v, ptid_t ptid)
write_register_pid (31, v | 0x3, ptid); write_register_pid (31, v | 0x3, ptid);
write_register_pid (PC_REGNUM, v, ptid); write_register_pid (PC_REGNUM, v, ptid);
write_register_pid (NPC_REGNUM, v + 4, ptid); write_register_pid (DEPRECATED_NPC_REGNUM, v + 4, ptid);
} }
/* return the alignment of a type in bytes. Structures have the maximum /* return the alignment of a type in bytes. Structures have the maximum
@ -5178,7 +5178,7 @@ hppa_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
set_gdbarch_sp_regnum (gdbarch, 30); set_gdbarch_sp_regnum (gdbarch, 30);
set_gdbarch_fp0_regnum (gdbarch, 64); set_gdbarch_fp0_regnum (gdbarch, 64);
set_gdbarch_pc_regnum (gdbarch, PCOQ_HEAD_REGNUM); set_gdbarch_pc_regnum (gdbarch, PCOQ_HEAD_REGNUM);
set_gdbarch_npc_regnum (gdbarch, PCOQ_TAIL_REGNUM); set_gdbarch_deprecated_npc_regnum (gdbarch, PCOQ_TAIL_REGNUM);
set_gdbarch_deprecated_register_raw_size (gdbarch, hppa_register_raw_size); set_gdbarch_deprecated_register_raw_size (gdbarch, hppa_register_raw_size);
set_gdbarch_deprecated_register_byte (gdbarch, hppa_register_byte); set_gdbarch_deprecated_register_byte (gdbarch, hppa_register_byte);
set_gdbarch_deprecated_register_virtual_size (gdbarch, hppa_register_raw_size); set_gdbarch_deprecated_register_virtual_size (gdbarch, hppa_register_raw_size);

4
gdb/lynx-nat.c
View file

@ -305,7 +305,7 @@ fetch_inferior_registers (int regno)
supply_register (PS_REGNUM, (char *) &ec.psr); supply_register (PS_REGNUM, (char *) &ec.psr);
supply_register (Y_REGNUM, (char *) &ec.y); supply_register (Y_REGNUM, (char *) &ec.y);
supply_register (PC_REGNUM, (char *) &ec.pc); supply_register (PC_REGNUM, (char *) &ec.pc);
supply_register (NPC_REGNUM, (char *) &ec.npc); supply_register (DEPRECATED_NPC_REGNUM, (char *) &ec.npc);
supply_register (WIM_REGNUM, (char *) &ec.wim); supply_register (WIM_REGNUM, (char *) &ec.wim);
memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (O0_REGNUM)], ec.o, memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (O0_REGNUM)], ec.o,
@ -390,7 +390,7 @@ store_inferior_registers (int regno)
ec.psr = read_register (PS_REGNUM); ec.psr = read_register (PS_REGNUM);
ec.y = read_register (Y_REGNUM); ec.y = read_register (Y_REGNUM);
ec.pc = read_register (PC_REGNUM); ec.pc = read_register (PC_REGNUM);
ec.npc = read_register (NPC_REGNUM); ec.npc = read_register (DEPRECATED_NPC_REGNUM);
ec.wim = read_register (WIM_REGNUM); ec.wim = read_register (WIM_REGNUM);
memcpy (ec.o, &deprecated_registers[DEPRECATED_REGISTER_BYTE (O0_REGNUM)], memcpy (ec.o, &deprecated_registers[DEPRECATED_REGISTER_BYTE (O0_REGNUM)],

4
gdb/procfs.c
View file

@ -3705,7 +3705,7 @@ procfs_fetch_registers (int regno)
{ {
if ((regno >= 0 && regno < FP0_REGNUM) || if ((regno >= 0 && regno < FP0_REGNUM) ||
regno == PC_REGNUM || regno == PC_REGNUM ||
(NPC_REGNUM >= 0 && regno == NPC_REGNUM) || (DEPRECATED_NPC_REGNUM >= 0 && regno == DEPRECATED_NPC_REGNUM) ||
regno == DEPRECATED_FP_REGNUM || regno == DEPRECATED_FP_REGNUM ||
regno == SP_REGNUM) regno == SP_REGNUM)
return; /* not a floating point register */ return; /* not a floating point register */
@ -3779,7 +3779,7 @@ procfs_store_registers (int regno)
{ {
if ((regno >= 0 && regno < FP0_REGNUM) || if ((regno >= 0 && regno < FP0_REGNUM) ||
regno == PC_REGNUM || regno == PC_REGNUM ||
(NPC_REGNUM >= 0 && regno == NPC_REGNUM) || (DEPRECATED_NPC_REGNUM >= 0 && regno == DEPRECATED_NPC_REGNUM) ||
regno == DEPRECATED_FP_REGNUM || regno == DEPRECATED_FP_REGNUM ||
regno == SP_REGNUM) regno == SP_REGNUM)
return; /* not a floating point register */ return; /* not a floating point register */

4
gdb/regcache.c
View file

@ -1345,8 +1345,8 @@ generic_target_write_pc (CORE_ADDR pc, ptid_t ptid)
#ifdef PC_REGNUM #ifdef PC_REGNUM
if (PC_REGNUM >= 0) if (PC_REGNUM >= 0)
write_register_pid (PC_REGNUM, pc, ptid); write_register_pid (PC_REGNUM, pc, ptid);
if (NPC_REGNUM >= 0) if (DEPRECATED_NPC_REGNUM >= 0)
write_register_pid (NPC_REGNUM, pc + 4, ptid); write_register_pid (DEPRECATED_NPC_REGNUM, pc + 4, ptid);
#else #else
internal_error (__FILE__, __LINE__, internal_error (__FILE__, __LINE__,
"generic_target_write_pc"); "generic_target_write_pc");

2
gdb/remote-vxsparc.c
View file

@ -157,7 +157,7 @@ vx_write_register (int regno)
if (regno >= 0) if (regno >= 0)
{ {
if ((G0_REGNUM <= regno && regno <= I7_REGNUM) if ((G0_REGNUM <= regno && regno <= I7_REGNUM)
|| (Y_REGNUM <= regno && regno <= NPC_REGNUM)) || (Y_REGNUM <= regno && regno <= DEPRECATED_NPC_REGNUM))
in_fp_regs = 0; in_fp_regs = 0;
else else
in_gp_regs = 0; in_gp_regs = 0;

6
gdb/sparc-linux-nat.c
View file

@ -40,7 +40,7 @@ supply_gregset (elf_gregset_t *gregsetp)
supply_register (PS_REGNUM, (char *) (regp + 32)); supply_register (PS_REGNUM, (char *) (regp + 32));
supply_register (PC_REGNUM, (char *) (regp + 33)); supply_register (PC_REGNUM, (char *) (regp + 33));
supply_register (NPC_REGNUM, (char *) (regp + 34)); supply_register (DEPRECATED_NPC_REGNUM, (char *) (regp + 34));
supply_register (Y_REGNUM, (char *) (regp + 35)); supply_register (Y_REGNUM, (char *) (regp + 35));
supply_register (WIM_REGNUM, (char *) (regp + 36)); supply_register (WIM_REGNUM, (char *) (regp + 36));
@ -65,8 +65,8 @@ fill_gregset (elf_gregset_t *gregsetp, int regno)
if (regno == -1 || regno == PC_REGNUM) if (regno == -1 || regno == PC_REGNUM)
regcache_collect (PC_REGNUM, regp + 33); regcache_collect (PC_REGNUM, regp + 33);
if (regno == -1 || regno == NPC_REGNUM) if (regno == -1 || regno == DEPRECATED_NPC_REGNUM)
regcache_collect (NPC_REGNUM, regp + 34); regcache_collect (DEPRECATED_NPC_REGNUM, regp + 34);
if (regno == -1 || regno == Y_REGNUM) if (regno == -1 || regno == Y_REGNUM)
regcache_collect (Y_REGNUM, regp + 35); regcache_collect (Y_REGNUM, regp + 35);

8
gdb/sparc-nat.c
View file

@ -108,7 +108,7 @@ fetch_inferior_registers (int regno)
= inferior_registers.r_ps; = inferior_registers.r_ps;
*(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)] *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)]
= inferior_registers.r_pc; = inferior_registers.r_pc;
*(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (NPC_REGNUM)] *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (DEPRECATED_NPC_REGNUM)]
= inferior_registers.r_npc; = inferior_registers.r_npc;
*(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (Y_REGNUM)] = inferior_registers.r_y; *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (Y_REGNUM)] = inferior_registers.r_y;
@ -117,7 +117,7 @@ fetch_inferior_registers (int regno)
deprecated_register_valid[Y_REGNUM] = 1; deprecated_register_valid[Y_REGNUM] = 1;
deprecated_register_valid[PS_REGNUM] = 1; deprecated_register_valid[PS_REGNUM] = 1;
deprecated_register_valid[PC_REGNUM] = 1; deprecated_register_valid[PC_REGNUM] = 1;
deprecated_register_valid[NPC_REGNUM] = 1; deprecated_register_valid[DEPRECATED_NPC_REGNUM] = 1;
/* If we don't set these valid, read_register_bytes() rereads /* If we don't set these valid, read_register_bytes() rereads
all the regs every time it is called! FIXME. */ all the regs every time it is called! FIXME. */
deprecated_register_valid[WIM_REGNUM] = 1; /* Not true yet, FIXME */ deprecated_register_valid[WIM_REGNUM] = 1; /* Not true yet, FIXME */
@ -261,7 +261,7 @@ store_inferior_registers (int regno)
inferior_registers.r_pc = inferior_registers.r_pc =
*(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)]; *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)];
inferior_registers.r_npc = inferior_registers.r_npc =
*(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (NPC_REGNUM)]; *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (DEPRECATED_NPC_REGNUM)];
inferior_registers.r_y = inferior_registers.r_y =
*(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (Y_REGNUM)]; *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (Y_REGNUM)];
@ -318,7 +318,7 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size,
15 * REGISTER_RAW_SIZE (G1_REGNUM)); 15 * REGISTER_RAW_SIZE (G1_REGNUM));
*(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PS_REGNUM)] = gregs->r_ps; *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PS_REGNUM)] = gregs->r_ps;
*(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)] = gregs->r_pc; *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)] = gregs->r_pc;
*(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (NPC_REGNUM)] = gregs->r_npc; *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (DEPRECATED_NPC_REGNUM)] = gregs->r_npc;
*(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (Y_REGNUM)] = gregs->r_y; *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (Y_REGNUM)] = gregs->r_y;
/* My best guess at where to get the locals and input /* My best guess at where to get the locals and input

26
gdb/sparc-tdep.c
View file

@ -168,7 +168,7 @@ typedef enum
Beihl (beihl@mcc.com). */ Beihl (beihl@mcc.com). */
/* npc4 and next_pc describe the situation at the time that the /* npc4 and next_pc describe the situation at the time that the
step-breakpoint was set, not necessary the current value of NPC_REGNUM. */ step-breakpoint was set, not necessary the current value of DEPRECATED_NPC_REGNUM. */
static CORE_ADDR next_pc, npc4, target; static CORE_ADDR next_pc, npc4, target;
static int brknpc4, brktrg; static int brknpc4, brktrg;
typedef char binsn_quantum[BREAKPOINT_MAX]; typedef char binsn_quantum[BREAKPOINT_MAX];
@ -195,7 +195,7 @@ sparc_software_single_step (enum target_signal ignore, /* pid, but we don't need
if (insert_breakpoints_p) if (insert_breakpoints_p)
{ {
/* Always set breakpoint for NPC. */ /* Always set breakpoint for NPC. */
next_pc = read_register (NPC_REGNUM); next_pc = read_register (DEPRECATED_NPC_REGNUM);
npc4 = next_pc + 4; /* branch not taken */ npc4 = next_pc + 4; /* branch not taken */
target_insert_breakpoint (next_pc, break_mem[0]); target_insert_breakpoint (next_pc, break_mem[0]);
@ -1320,10 +1320,10 @@ sparc_pop_frame (void)
write_register (PC_REGNUM, write_register (PC_REGNUM,
read_memory_integer (fsr[PC_REGNUM], read_memory_integer (fsr[PC_REGNUM],
REGISTER_RAW_SIZE (PC_REGNUM))); REGISTER_RAW_SIZE (PC_REGNUM)));
if (fsr[NPC_REGNUM]) if (fsr[DEPRECATED_NPC_REGNUM])
write_register (NPC_REGNUM, write_register (DEPRECATED_NPC_REGNUM,
read_memory_integer (fsr[NPC_REGNUM], read_memory_integer (fsr[DEPRECATED_NPC_REGNUM],
REGISTER_RAW_SIZE (NPC_REGNUM))); REGISTER_RAW_SIZE (DEPRECATED_NPC_REGNUM)));
} }
else if (get_frame_extra_info (frame)->flat) else if (get_frame_extra_info (frame)->flat)
{ {
@ -1342,7 +1342,7 @@ sparc_pop_frame (void)
} }
write_register (PC_REGNUM, pc); write_register (PC_REGNUM, pc);
write_register (NPC_REGNUM, pc + 4); write_register (DEPRECATED_NPC_REGNUM, pc + 4);
} }
else if (fsr[I7_REGNUM]) else if (fsr[I7_REGNUM])
{ {
@ -1350,7 +1350,7 @@ sparc_pop_frame (void)
pc = PC_ADJUST ((CORE_ADDR) read_memory_integer (fsr[I7_REGNUM], pc = PC_ADJUST ((CORE_ADDR) read_memory_integer (fsr[I7_REGNUM],
SPARC_INTREG_SIZE)); SPARC_INTREG_SIZE));
write_register (PC_REGNUM, pc); write_register (PC_REGNUM, pc);
write_register (NPC_REGNUM, pc + 4); write_register (DEPRECATED_NPC_REGNUM, pc + 4);
} }
flush_cached_frames (); flush_cached_frames ();
} }
@ -1479,7 +1479,7 @@ supply_gregset (gdb_gregset_t *gregsetp)
/* These require a bit more care. */ /* These require a bit more care. */
supply_register (PC_REGNUM, ((char *) (regp + R_PC)) + offset); supply_register (PC_REGNUM, ((char *) (regp + R_PC)) + offset);
supply_register (NPC_REGNUM, ((char *) (regp + R_nPC)) + offset); supply_register (DEPRECATED_NPC_REGNUM, ((char *) (regp + R_nPC)) + offset);
supply_register (Y_REGNUM, ((char *) (regp + R_Y)) + offset); supply_register (Y_REGNUM, ((char *) (regp + R_Y)) + offset);
if (GDB_TARGET_IS_SPARC64) if (GDB_TARGET_IS_SPARC64)
@ -1598,8 +1598,8 @@ fill_gregset (gdb_gregset_t *gregsetp, int regno)
if ((regno == -1) || (regno == PC_REGNUM)) if ((regno == -1) || (regno == PC_REGNUM))
deprecated_read_register_gen (PC_REGNUM, (char *) (regp + R_PC) + offset); deprecated_read_register_gen (PC_REGNUM, (char *) (regp + R_PC) + offset);
if ((regno == -1) || (regno == NPC_REGNUM)) if ((regno == -1) || (regno == DEPRECATED_NPC_REGNUM))
deprecated_read_register_gen (NPC_REGNUM, (char *) (regp + R_nPC) + offset); deprecated_read_register_gen (DEPRECATED_NPC_REGNUM, (char *) (regp + R_nPC) + offset);
if ((regno == -1) || (regno == Y_REGNUM)) if ((regno == -1) || (regno == Y_REGNUM))
deprecated_read_register_gen (Y_REGNUM, (char *) (regp + R_Y) + offset); deprecated_read_register_gen (Y_REGNUM, (char *) (regp + R_Y) + offset);
@ -3384,7 +3384,7 @@ sparc_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
set_gdbarch_frame_args_skip (gdbarch, 68); set_gdbarch_frame_args_skip (gdbarch, 68);
set_gdbarch_function_start_offset (gdbarch, 0); set_gdbarch_function_start_offset (gdbarch, 0);
set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT); set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT);
set_gdbarch_npc_regnum (gdbarch, SPARC32_NPC_REGNUM); set_gdbarch_deprecated_npc_regnum (gdbarch, SPARC32_NPC_REGNUM);
set_gdbarch_pc_regnum (gdbarch, SPARC32_PC_REGNUM); set_gdbarch_pc_regnum (gdbarch, SPARC32_PC_REGNUM);
set_gdbarch_ptr_bit (gdbarch, 4 * TARGET_CHAR_BIT); set_gdbarch_ptr_bit (gdbarch, 4 * TARGET_CHAR_BIT);
set_gdbarch_deprecated_push_arguments (gdbarch, sparc32_push_arguments); set_gdbarch_deprecated_push_arguments (gdbarch, sparc32_push_arguments);
@ -3433,7 +3433,7 @@ sparc_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
set_gdbarch_frame_args_skip (gdbarch, 136); set_gdbarch_frame_args_skip (gdbarch, 136);
set_gdbarch_function_start_offset (gdbarch, 0); set_gdbarch_function_start_offset (gdbarch, 0);
set_gdbarch_long_bit (gdbarch, 8 * TARGET_CHAR_BIT); set_gdbarch_long_bit (gdbarch, 8 * TARGET_CHAR_BIT);
set_gdbarch_npc_regnum (gdbarch, SPARC64_NPC_REGNUM); set_gdbarch_deprecated_npc_regnum (gdbarch, SPARC64_NPC_REGNUM);
set_gdbarch_pc_regnum (gdbarch, SPARC64_PC_REGNUM); set_gdbarch_pc_regnum (gdbarch, SPARC64_PC_REGNUM);
set_gdbarch_ptr_bit (gdbarch, 8 * TARGET_CHAR_BIT); set_gdbarch_ptr_bit (gdbarch, 8 * TARGET_CHAR_BIT);
set_gdbarch_deprecated_push_arguments (gdbarch, sparc64_push_arguments); set_gdbarch_deprecated_push_arguments (gdbarch, sparc64_push_arguments);

2
gdb/sparc64-tdep.c
View file

@ -1356,7 +1356,7 @@ sparc64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
/* Register numbers of various important registers. */ /* Register numbers of various important registers. */
set_gdbarch_sp_regnum (gdbarch, SPARC_SP_REGNUM); /* %sp */ set_gdbarch_sp_regnum (gdbarch, SPARC_SP_REGNUM); /* %sp */
set_gdbarch_pc_regnum (gdbarch, SPARC64_PC_REGNUM); /* %pc */ set_gdbarch_pc_regnum (gdbarch, SPARC64_PC_REGNUM); /* %pc */
set_gdbarch_npc_regnum (gdbarch, SPARC64_NPC_REGNUM); set_gdbarch_deprecated_npc_regnum (gdbarch, SPARC64_NPC_REGNUM);
set_gdbarch_fp0_regnum (gdbarch, SPARC_F0_REGNUM); /* %f0 */ set_gdbarch_fp0_regnum (gdbarch, SPARC_F0_REGNUM); /* %f0 */
/* Call dummy code. */ /* Call dummy code. */

16
gdb/sparcnbsd-tdep.c
View file

@ -59,8 +59,8 @@ sparcnbsd_supply_reg32 (char *regs, int regno)
if (regno == PC_REGNUM || regno == -1) if (regno == PC_REGNUM || regno == -1)
supply_register (PC_REGNUM, regs + REG32_OFFSET_PC); supply_register (PC_REGNUM, regs + REG32_OFFSET_PC);
if (regno == NPC_REGNUM || regno == -1) if (regno == DEPRECATED_NPC_REGNUM || regno == -1)
supply_register (NPC_REGNUM, regs + REG32_OFFSET_NPC); supply_register (DEPRECATED_NPC_REGNUM, regs + REG32_OFFSET_NPC);
if (regno == Y_REGNUM || regno == -1) if (regno == Y_REGNUM || regno == -1)
supply_register (Y_REGNUM, regs + REG32_OFFSET_Y); supply_register (Y_REGNUM, regs + REG32_OFFSET_Y);
@ -126,8 +126,8 @@ sparcnbsd_supply_reg64 (char *regs, int regno)
if (regno == PC_REGNUM || regno == -1) if (regno == PC_REGNUM || regno == -1)
supply_register (PC_REGNUM, regs + REG64_OFFSET_PC); supply_register (PC_REGNUM, regs + REG64_OFFSET_PC);
if (regno == NPC_REGNUM || regno == -1) if (regno == DEPRECATED_NPC_REGNUM || regno == -1)
supply_register (NPC_REGNUM, regs + REG64_OFFSET_NPC); supply_register (DEPRECATED_NPC_REGNUM, regs + REG64_OFFSET_NPC);
if (regno == Y_REGNUM || regno == -1) if (regno == Y_REGNUM || regno == -1)
{ {
@ -220,8 +220,8 @@ sparcnbsd_fill_reg32 (char *regs, int regno)
if (regno == PC_REGNUM || regno == -1) if (regno == PC_REGNUM || regno == -1)
regcache_collect (PC_REGNUM, regs + REG32_OFFSET_PC); regcache_collect (PC_REGNUM, regs + REG32_OFFSET_PC);
if (regno == NPC_REGNUM || regno == -1) if (regno == DEPRECATED_NPC_REGNUM || regno == -1)
regcache_collect (NPC_REGNUM, regs + REG32_OFFSET_NPC); regcache_collect (DEPRECATED_NPC_REGNUM, regs + REG32_OFFSET_NPC);
if (regno == Y_REGNUM || regno == -1) if (regno == Y_REGNUM || regno == -1)
regcache_collect (Y_REGNUM, regs + REG32_OFFSET_Y); regcache_collect (Y_REGNUM, regs + REG32_OFFSET_Y);
@ -261,8 +261,8 @@ sparcnbsd_fill_reg64 (char *regs, int regno)
if (regno == PC_REGNUM || regno == -1) if (regno == PC_REGNUM || regno == -1)
regcache_collect (PC_REGNUM, regs + REG64_OFFSET_PC); regcache_collect (PC_REGNUM, regs + REG64_OFFSET_PC);
if (regno == NPC_REGNUM || regno == -1) if (regno == DEPRECATED_NPC_REGNUM || regno == -1)
regcache_collect (NPC_REGNUM, regs + REG64_OFFSET_NPC); regcache_collect (DEPRECATED_NPC_REGNUM, regs + REG64_OFFSET_NPC);
if (regno == Y_REGNUM || regno == -1) if (regno == Y_REGNUM || regno == -1)
regcache_collect (Y_REGNUM, regs + REG64_OFFSET_Y); regcache_collect (Y_REGNUM, regs + REG64_OFFSET_Y);