[commit] cleanup use of DEPRECATED_REGISTER_BYTE in hppah-nat.c

[Randolph Chung]

Small cleanup while i was looking at the hpux code.... committed as
obvious.

randolph

2004-12-05  Randolph Chung  <tausq@debian.org>

	* hppah-nat.c (store_inferior_registers): Rewrite logic to not use
	DEPRECATED_REGISTER_BYTE.

Index: hppah-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/hppah-nat.c,v
retrieving revision 1.35
diff -u -p -r1.35 hppah-nat.c
--- hppah-nat.c	20 Nov 2004 23:56:18 -0000	1.35
+++ hppah-nat.c	6 Dec 2004 03:33:26 -0000
@@ -114,8 +114,9 @@ store_inferior_registers (int regno)
 
       /* Floating-point registers come from the ss_fpblock area.  */
       else if (regno >= HPPA_FP0_REGNUM)
-	addr = (HPPAH_OFFSETOF (save_state_t, ss_fpblock) 
-		+ (DEPRECATED_REGISTER_BYTE (regno) - DEPRECATED_REGISTER_BYTE (HPPA_FP0_REGNUM)));
+	addr = HPPAH_OFFSETOF (save_state_t, ss_fpblock) 
+	       + ((regno - HPPA_FP0_REGNUM) 
+	          * register_size (current_gdbarch, regno));
 
       /* Wide registers come from the ss_wide area.
 	 I think it's more PC to test (ss_flags & SS_WIDEREGS) to select
@@ -123,14 +124,14 @@ store_inferior_registers (int regno)
 	 But checking ss_flags would require an extra ptrace call for
 	 every register reference.  Bleah.  */
       else if (len == 8)
-	addr = (HPPAH_OFFSETOF (save_state_t, ss_wide) 
-		+ DEPRECATED_REGISTER_BYTE (regno));
+	addr = HPPAH_OFFSETOF (save_state_t, ss_wide) 
+	       + regno * 8;
 
       /* Narrow registers come from the ss_narrow area.  Note that
 	 ss_narrow starts with gr1, not gr0.  */
       else if (len == 4)
-	addr = (HPPAH_OFFSETOF (save_state_t, ss_narrow)
-		+ (DEPRECATED_REGISTER_BYTE (regno) - DEPRECATED_REGISTER_BYTE (1)));
+	addr = HPPAH_OFFSETOF (save_state_t, ss_narrow)
+	       + (regno - 1) * 4;
       else
 	internal_error (__FILE__, __LINE__,
 			"hppah-nat.c (write_register): unexpected register size");
-- 
Randolph Chung
Debian GNU/Linux Developer, hppa/ia64 ports
http://www.tausq.org/