From 98216c5d0266a049874cef93f7892ad2364b695b Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Mon, 12 Aug 2002 19:05:33 +0000 Subject: [PATCH] 2002-08-12 Andrew Cagney * i386-tdep.h (i386_register_byte, i386_register_raw_size): Delete declarations. * i386-linux-tdep.c (i386_linux_register_byte): Delete function. (i386_linux_register_raw_size): Delete function. i386_linux_init_abi): Update. * i386-tdep.c (i386_register_raw_size): Delete function. (i386_register_byte): Delete function. (i386_gdbarch_init): Update. (i386_register_size): Delete array. (i386_register_offset): Delete array. * config/i386/tm-symmetry.h (REGISTER_BYTE): Delete macro. (REGISTER_RAW_SIZE): Delete macro. * config/i386/tm-ptx.h (REGISTER_RAW_SIZE): Delete macro. (REGISTER_BYTE): Delete macro. --- gdb/ChangeLog | 19 ++++++++++++- gdb/config/i386/tm-ptx.h | 18 ------------ gdb/config/i386/tm-symmetry.h | 24 ---------------- gdb/i386-linux-tdep.c | 23 --------------- gdb/i386-tdep.c | 53 ----------------------------------- gdb/i386-tdep.h | 8 ------ 6 files changed, 18 insertions(+), 127 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c3a8b7c39f5..21c8a944bcd 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,21 @@ +2002-08-12 Andrew Cagney + + * i386-tdep.h (i386_register_byte, i386_register_raw_size): Delete + declarations. + * i386-linux-tdep.c (i386_linux_register_byte): Delete function. + (i386_linux_register_raw_size): Delete function. + (i386_linux_init_abi): Update. + * i386-tdep.c (i386_register_raw_size): Delete function. + (i386_register_byte): Delete function. + (i386_gdbarch_init): Update. + (i386_register_size): Delete array. + (i386_register_offset): Delete array. + + * config/i386/tm-symmetry.h (REGISTER_BYTE): Delete macro. + (REGISTER_RAW_SIZE): Delete macro. + * config/i386/tm-ptx.h (REGISTER_RAW_SIZE): Delete macro. + (REGISTER_BYTE): Delete macro. + 2002-08-11 Aidan Skinner * ada-lang.c (ada_lookup_partial_symbol) @@ -10,7 +28,6 @@ * ada-valprint.c (val_print_packed_array_elements) (ada_val_print_1): Fix prototype names so that grep ^func works properly. - 2002-08-10 Andrew Cagney Elena Zannoni Martin M. Hunt diff --git a/gdb/config/i386/tm-ptx.h b/gdb/config/i386/tm-ptx.h index ff0d56e6174..0f7dcabf83f 100644 --- a/gdb/config/i386/tm-ptx.h +++ b/gdb/config/i386/tm-ptx.h @@ -149,24 +149,6 @@ extern int ptx_register_u_addr (int, int); #undef REGISTER_BYTES #define REGISTER_BYTES ((10 * 4) + (8 * 10) + (31 * 4)) -/* Index within `registers' of the first byte of the space for register N. */ - -#undef REGISTER_BYTE -#define REGISTER_BYTE(N) \ -(((N) < ST0_REGNUM) ? ((N) * 4) : \ - ((N) < FP1_REGNUM) ? (40 + (((N) - ST0_REGNUM) * 10)) : \ - (40 + 80 + (((N) - FP1_REGNUM) * 4))) - -/* Number of bytes of storage in the actual machine representation for - register N. All registers are 4 bytes, except 387 st(0) - st(7), - which are 80 bits each. */ - -#undef REGISTER_RAW_SIZE -#define REGISTER_RAW_SIZE(N) \ -(((N) < ST0_REGNUM) ? 4 : \ - ((N) < FP1_REGNUM) ? 10 : \ - 4) - /* Largest value REGISTER_RAW_SIZE can have. */ #undef MAX_REGISTER_RAW_SIZE diff --git a/gdb/config/i386/tm-symmetry.h b/gdb/config/i386/tm-symmetry.h index e7a989b19c2..331006aae3d 100644 --- a/gdb/config/i386/tm-symmetry.h +++ b/gdb/config/i386/tm-symmetry.h @@ -225,30 +225,6 @@ switch (regno) { \ #undef REGISTER_BYTES #define REGISTER_BYTES ((10 * 4) + (8 * 10) + (31 * 4)) -/* Index within `registers' of the first byte of the space for - register N. */ - -#undef REGISTER_BYTE -#define REGISTER_BYTE(N) \ -(((N) < 3) ? ((N) * 4) : \ -((N) < 5) ? ((((N) - 2) * 10) + 2) : \ -((N) < 8) ? ((((N) - 5) * 4) + 32) : \ -((N) < 14) ? ((((N) - 8) * 10) + 44) : \ - ((((N) - 14) * 4) + 104)) - -/* Number of bytes of storage in the actual machine representation - * for register N. All registers are 4 bytes, except 387 st(0) - st(7), - * which are 80 bits each. - */ - -#undef REGISTER_RAW_SIZE -#define REGISTER_RAW_SIZE(N) \ -(((N) < 3) ? 4 : \ -((N) < 5) ? 10 : \ -((N) < 8) ? 4 : \ -((N) < 14) ? 10 : \ - 4) - /* Nonzero if register N requires conversion from raw format to virtual format. */ diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c index 394699f1168..a833fb59838 100644 --- a/gdb/i386-linux-tdep.c +++ b/gdb/i386-linux-tdep.c @@ -47,27 +47,6 @@ i386_linux_register_name (int reg) return i386_register_name (reg); } - -static int -i386_linux_register_byte (int reg) -{ - /* Deal with the extra "orig_eax" pseudo register. */ - if (reg == I386_LINUX_ORIG_EAX_REGNUM) - return (i386_register_byte (I386_LINUX_ORIG_EAX_REGNUM - 1) - + i386_register_raw_size (I386_LINUX_ORIG_EAX_REGNUM - 1)); - - return i386_register_byte (reg); -} - -static int -i386_linux_register_raw_size (int reg) -{ - /* Deal with the extra "orig_eax" pseudo register. */ - if (reg == I386_LINUX_ORIG_EAX_REGNUM) - return 4; - - return i386_register_raw_size (reg); -} /* Recognizing signal handler frames. */ @@ -458,8 +437,6 @@ i386_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) set_gdbarch_num_regs (gdbarch, I386_SSE_NUM_REGS + 1); set_gdbarch_register_name (gdbarch, i386_linux_register_name); set_gdbarch_register_bytes (gdbarch, I386_SSE_SIZEOF_REGS + 4); - set_gdbarch_register_byte (gdbarch, i386_linux_register_byte); - set_gdbarch_register_raw_size (gdbarch, i386_linux_register_raw_size); tdep->jb_pc_offset = 20; /* From . */ diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c index efdea9e3369..2968c318c01 100644 --- a/gdb/i386-tdep.c +++ b/gdb/i386-tdep.c @@ -56,27 +56,6 @@ static char *i386_register_names[] = "mxcsr" }; -/* i386_register_offset[i] is the offset into the register file of the - start of register number i. We initialize this from - i386_register_size. */ -static int i386_register_offset[I386_SSE_NUM_REGS]; - -/* i386_register_size[i] is the number of bytes of storage in GDB's - register array occupied by register i. */ -static int i386_register_size[I386_SSE_NUM_REGS] = { - 4, 4, 4, 4, - 4, 4, 4, 4, - 4, 4, 4, 4, - 4, 4, 4, 4, - 10, 10, 10, 10, - 10, 10, 10, 10, - 4, 4, 4, 4, - 4, 4, 4, 4, - 16, 16, 16, 16, - 16, 16, 16, 16, - 4 -}; - /* Return the name of register REG. */ const char * @@ -90,23 +69,6 @@ i386_register_name (int reg) return i386_register_names[reg]; } -/* Return the offset into the register array of the start of register - number REG. */ -int -i386_register_byte (int reg) -{ - return i386_register_offset[reg]; -} - -/* Return the number of bytes of storage in GDB's register array - occupied by register REG. */ - -int -i386_register_raw_size (int reg) -{ - return i386_register_size[reg]; -} - /* Convert stabs register number REG to the appropriate register number used by GDB. */ @@ -1439,8 +1401,6 @@ i386_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_register_name (gdbarch, i386_register_name); set_gdbarch_register_size (gdbarch, 4); set_gdbarch_register_bytes (gdbarch, I386_SIZEOF_GREGS + I386_SIZEOF_FREGS); - set_gdbarch_register_byte (gdbarch, i386_register_byte); - set_gdbarch_register_raw_size (gdbarch, i386_register_raw_size); set_gdbarch_max_register_raw_size (gdbarch, I386_MAX_REGISTER_SIZE); set_gdbarch_max_register_virtual_size (gdbarch, I386_MAX_REGISTER_SIZE); set_gdbarch_register_virtual_type (gdbarch, i386_register_virtual_type); @@ -1546,19 +1506,6 @@ _initialize_i386_tdep (void) { register_gdbarch_init (bfd_arch_i386, i386_gdbarch_init); - /* Initialize the table saying where each register starts in the - register file. */ - { - int i, offset; - - offset = 0; - for (i = 0; i < I386_SSE_NUM_REGS; i++) - { - i386_register_offset[i] = offset; - offset += i386_register_size[i]; - } - } - tm_print_insn = gdb_print_insn_i386; tm_print_insn_info.mach = bfd_lookup_arch (bfd_arch_i386, 0)->mach; diff --git a/gdb/i386-tdep.h b/gdb/i386-tdep.h index bd5213fee37..1fa64133012 100644 --- a/gdb/i386-tdep.h +++ b/gdb/i386-tdep.h @@ -163,14 +163,6 @@ struct gdbarch_tdep /* Return the name of register REG. */ extern char const *i386_register_name (int reg); -/* Return the offset into the register array of the start of register - number REG. */ -extern int i386_register_byte (int reg); - -/* Return the number of bytes of storage in GDB's register array - occupied by register REG. */ -extern int i386_register_raw_size (int reg); - /* Initialize a basic ELF architecture variant. */ extern void i386_elf_init_abi (struct gdbarch_info, struct gdbarch *); -- 2.30.2