From 42c466d75aa4b4d7b98085dad722077784690595 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Sun, 15 Jun 2003 00:27:54 +0000 Subject: [PATCH] 2003-06-14 Andrew Cagney * mips-tdep.c (mips_register_to_value): Make static. (mips_value_to_register): Make static. * i386-tdep.c (i386_fetch_pointer_argument): Make static. * ia64-tdep.c (ia64_register_raw_size): Make static. (ia64_register_virtual_size): Make static. (ia64_register_byte): Make static. * i387-tdep.c: Include "i387-tdep.h". (print_387_control_word): Delete function. (print_387_status_word): Delete function. (print_387_status_bits): Delete function. (print_387_control_bits): Delete function. * Makefile.in (i387-tdep.o): Update dependencies. * rdi-share/host.h (Fail): Declare. * remote-rdi.c (Fail): Update to match declaration. --- gdb/ChangeLog | 17 ++++++ gdb/Makefile.in | 3 +- gdb/config/i386/tm-i386.h | 4 -- gdb/i386-tdep.c | 2 +- gdb/i387-tdep.c | 106 +------------------------------------- gdb/ia64-tdep.c | 6 +-- gdb/mips-tdep.c | 4 +- gdb/rdi-share/host.h | 3 ++ gdb/remote-rdi.c | 6 +-- 9 files changed, 32 insertions(+), 119 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f8978618642..04d406eca7d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,20 @@ +2003-06-14 Andrew Cagney + + * mips-tdep.c (mips_register_to_value): Make static. + (mips_value_to_register): Make static. + * i386-tdep.c (i386_fetch_pointer_argument): Make static. + * ia64-tdep.c (ia64_register_raw_size): Make static. + (ia64_register_virtual_size): Make static. + (ia64_register_byte): Make static. + * i387-tdep.c: Include "i387-tdep.h". + (print_387_control_word): Delete function. + (print_387_status_word): Delete function. + (print_387_status_bits): Delete function. + (print_387_control_bits): Delete function. + * Makefile.in (i387-tdep.o): Update dependencies. + * rdi-share/host.h (Fail): Declare. + * remote-rdi.c (Fail): Update to match declaration. + 2003-06-14 Andrew Cagney * config/mips/embedl64.mt (TDEPFILES): Delete "remote-array.o". diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 14a4ee0e30c..a0342e3690b 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1851,7 +1851,8 @@ i386v4-nat.o: i386v4-nat.c $(defs_h) $(value_h) $(inferior_h) $(regcache_h) \ $(i386_tdep_h) $(i387_tdep_h) $(gregset_h) i387-tdep.o: i387-tdep.c $(defs_h) $(frame_h) $(inferior_h) $(language_h) \ $(value_h) $(gdbcore_h) $(floatformat_h) $(regcache_h) \ - $(gdb_assert_h) $(gdb_string_h) $(doublest_h) $(i386_tdep_h) + $(gdb_assert_h) $(gdb_string_h) $(doublest_h) $(i386_tdep_h) \ + $(i387_tdep_h) ia64-aix-nat.o: ia64-aix-nat.c $(defs_h) $(inferior_h) $(target_h) \ $(gdbcore_h) $(regcache_h) $(symtab_h) $(bfd_h) $(symfile_h) \ $(objfiles_h) $(gdb_stat_h) diff --git a/gdb/config/i386/tm-i386.h b/gdb/config/i386/tm-i386.h index e80b258e7d8..395c9b259b1 100644 --- a/gdb/config/i386/tm-i386.h +++ b/gdb/config/i386/tm-i386.h @@ -24,8 +24,4 @@ #define GDB_MULTI_ARCH GDB_MULTI_ARCH_PARTIAL -/* FIXME: kettenis/2000-06-12: These do not belong here. */ -extern void print_387_control_word (unsigned int); -extern void print_387_status_word (unsigned int); - #endif /* ifndef TM_I386_H */ diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c index 8309ef5c028..4a814c10d2a 100644 --- a/gdb/i386-tdep.c +++ b/gdb/i386-tdep.c @@ -1695,7 +1695,7 @@ i386_register_reggroup_p (struct gdbarch *gdbarch, int regnum, /* Get the ith function argument for the current function. */ -CORE_ADDR +static CORE_ADDR i386_fetch_pointer_argument (struct frame_info *frame, int argi, struct type *type) { diff --git a/gdb/i387-tdep.c b/gdb/i387-tdep.c index c6a2d5dac84..c28420704fc 100644 --- a/gdb/i387-tdep.c +++ b/gdb/i387-tdep.c @@ -33,112 +33,8 @@ #include "doublest.h" #include "i386-tdep.h" +#include "i387-tdep.h" - -/* FIXME: The functions on this page are used by the old `info float' - implementations that a few of the i386 targets provide. These - functions should be removed if all of these have been converted to - use the generic implementation based on the new register file - layout. */ - -static void print_387_control_bits (unsigned int control); -static void print_387_status_bits (unsigned int status); - -static void -print_387_control_bits (unsigned int control) -{ - switch ((control >> 8) & 3) - { - case 0: - puts_unfiltered (" 24 bit; "); - break; - case 1: - puts_unfiltered (" (bad); "); - break; - case 2: - puts_unfiltered (" 53 bit; "); - break; - case 3: - puts_unfiltered (" 64 bit; "); - break; - } - switch ((control >> 10) & 3) - { - case 0: - puts_unfiltered ("NEAR; "); - break; - case 1: - puts_unfiltered ("DOWN; "); - break; - case 2: - puts_unfiltered ("UP; "); - break; - case 3: - puts_unfiltered ("CHOP; "); - break; - } - if (control & 0x3f) - { - puts_unfiltered ("mask"); - if (control & 0x0001) - puts_unfiltered (" INVAL"); - if (control & 0x0002) - puts_unfiltered (" DENOR"); - if (control & 0x0004) - puts_unfiltered (" DIVZ"); - if (control & 0x0008) - puts_unfiltered (" OVERF"); - if (control & 0x0010) - puts_unfiltered (" UNDER"); - if (control & 0x0020) - puts_unfiltered (" LOS"); - puts_unfiltered (";"); - } - - if (control & 0xe080) - warning ("\nreserved bits on: %s", - local_hex_string (control & 0xe080)); -} - -void -print_387_control_word (unsigned int control) -{ - printf_filtered ("control %s:", local_hex_string(control & 0xffff)); - print_387_control_bits (control); - puts_unfiltered ("\n"); -} - -static void -print_387_status_bits (unsigned int status) -{ - printf_unfiltered (" flags %d%d%d%d; ", - (status & 0x4000) != 0, - (status & 0x0400) != 0, - (status & 0x0200) != 0, - (status & 0x0100) != 0); - printf_unfiltered ("top %d; ", (status >> 11) & 7); - if (status & 0xff) - { - puts_unfiltered ("excep"); - if (status & 0x0001) puts_unfiltered (" INVAL"); - if (status & 0x0002) puts_unfiltered (" DENOR"); - if (status & 0x0004) puts_unfiltered (" DIVZ"); - if (status & 0x0008) puts_unfiltered (" OVERF"); - if (status & 0x0010) puts_unfiltered (" UNDER"); - if (status & 0x0020) puts_unfiltered (" LOS"); - if (status & 0x0040) puts_unfiltered (" STACK"); - } -} - -void -print_387_status_word (unsigned int status) -{ - printf_filtered ("status %s:", local_hex_string (status & 0xffff)); - print_387_status_bits (status); - puts_unfiltered ("\n"); -} - - /* Implement the `info float' layout based on the register definitions in `tm-i386.h'. */ diff --git a/gdb/ia64-tdep.c b/gdb/ia64-tdep.c index b3290da1767..8dc786c3797 100644 --- a/gdb/ia64-tdep.c +++ b/gdb/ia64-tdep.c @@ -235,13 +235,13 @@ ia64_register_name (int reg) return ia64_register_names[reg]; } -int +static int ia64_register_raw_size (int reg) { return (IA64_FR0_REGNUM <= reg && reg <= IA64_FR127_REGNUM) ? 16 : 8; } -int +static int ia64_register_virtual_size (int reg) { return (IA64_FR0_REGNUM <= reg && reg <= IA64_FR127_REGNUM) ? 16 : 8; @@ -297,7 +297,7 @@ ia64_register_virtual_type (int reg) return builtin_type_long; } -int +static int ia64_register_byte (int reg) { return (8 * reg) + diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index dd0b176fe83..3561c5facbf 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -644,7 +644,7 @@ mips_convert_register_p (int regnum, struct type *type) && TYPE_LENGTH(type) == 8); } -void +static void mips_register_to_value (struct frame_info *frame, int regnum, struct type *type, void *to) { @@ -652,7 +652,7 @@ mips_register_to_value (struct frame_info *frame, int regnum, frame_read_register (frame, regnum + 1, (char *) to + 0); } -void +static void mips_value_to_register (struct frame_info *frame, int regnum, struct type *type, const void *from) { diff --git a/gdb/rdi-share/host.h b/gdb/rdi-share/host.h index 9944c15b714..21010722758 100644 --- a/gdb/rdi-share/host.h +++ b/gdb/rdi-share/host.h @@ -214,4 +214,7 @@ extern double strtod(const char *str, char **ptr); #endif +/* Needs to be supplied by the host. */ +extern void Fail (const char *); + /* end of host.h */ diff --git a/gdb/remote-rdi.c b/gdb/remote-rdi.c index 94cb676a5f6..c42de2f356b 100644 --- a/gdb/remote-rdi.c +++ b/gdb/remote-rdi.c @@ -1065,8 +1065,8 @@ _initialize_remote_rdi (void) /* A little dummy to make linking with the library succeed. */ -int -Fail (void) +void +Fail (const char *ignored) { - return 0; + } -- 2.30.2