2004-01-17 Andrew Cagney <cagney@redhat.com>

	* core-sol2.c (fetch_core_registers): Replace
	DEPRECATED_NPC_REGNUM with equivalent tdep value.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 29a428deba0ee579bad4e13c4d1c49b672231cbf..fc965f2127fcb7d2e9b534bbf13d2fa886d40ed4 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 2004-01-17  Andrew Cagney  <cagney@redhat.com>
 
+       * core-sol2.c (fetch_core_registers): Replace
+       DEPRECATED_NPC_REGNUM with equivalent tdep value.
+
        * hppa-tdep.c: Update copyright year.
        (hppa_target_write_pc): Use PCOQ_TAIL_REGNUM instead of
        NPC_REGNUM.

diff --git a/gdb/core-sol2.c b/gdb/core-sol2.c
index 456eebc8f621c72f6c638a70c92d8183e2afef90..db602c32e43f8efd81258ec31a0a642957ccc243 100644 (file)
--- a/gdb/core-sol2.c
+++ b/gdb/core-sol2.c
@@ -103,7 +103,7 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, int which,
            = gregs->r_ps;
          *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)]
            = gregs->r_pc;
-         *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (DEPRECATED_NPC_REGNUM)]
+         *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (gdbarch_tdep (current_gdbarch)->npc_regnum)]
            = gregs->r_npc;
          *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (Y_REGNUM)]
            = gregs->r_y;