aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gdb/ChangeLog10
-rw-r--r--gdb/arch-utils.c6
-rw-r--r--gdb/arch-utils.h4
-rw-r--r--gdb/arm-tdep.c3
-rw-r--r--gdb/gdbarch.c20
-rw-r--r--gdb/gdbarch.h17
-rwxr-xr-xgdb/gdbarch.sh2
-rw-r--r--gdb/infcmd.c2
8 files changed, 28 insertions, 36 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ad2d6e7..9c920e3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,15 @@
2002-06-10 Andrew Cagney <ac131313@redhat.com>
+ * gdbarch.sh (PRINT_FLOAT_INFO): Add frame and ui_file parameters.
+ Make multi-arch pure.
+ * gdbarch.h, gdbarch.c: Re-generate.
+ * arm-tdep.c (arm_print_float_info): Update.
+ * arch-utils.h (default_print_float_info): Update.
+ * arch-utils.c (default_print_float_info): Update.
+ * infcmd.c (float_info): Update call.
+
+2002-06-10 Andrew Cagney <ac131313@redhat.com>
+
* Makefile.in (init.c): Move the call to _initialize_gdbtypes to
the front of the initialize list.
diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
index 8e69a61..887aa9d 100644
--- a/gdb/arch-utils.c
+++ b/gdb/arch-utils.c
@@ -241,7 +241,8 @@ default_double_format (struct gdbarch *gdbarch)
}
void
-default_print_float_info (void)
+default_print_float_info (struct gdbarch *gdbarch, struct ui_file *file,
+ struct frame_info *frame)
{
#ifdef FLOAT_INFO
#if GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL
@@ -249,7 +250,8 @@ default_print_float_info (void)
#endif
FLOAT_INFO;
#else
- printf_filtered ("No floating point info available for this processor.\n");
+ fprintf_filtered (file, "\
+No floating point info available for this processor.\n");
#endif
}
diff --git a/gdb/arch-utils.h b/gdb/arch-utils.h
index 3b3e615..0b397af 100644
--- a/gdb/arch-utils.h
+++ b/gdb/arch-utils.h
@@ -142,7 +142,9 @@ extern int generic_in_solib_call_trampoline (CORE_ADDR pc, char *name);
extern int generic_in_function_epilogue_p (struct gdbarch *gdbarch, CORE_ADDR pc);
-extern void default_print_float_info (void);
+extern void default_print_float_info (struct gdbarch *gdbarch,
+ struct ui_file *file,
+ struct frame_info *frame);
/* Assume that the world is sane, a registers raw and virtual size
both match its type. */
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 04fca2e..1ce0a5b 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -1558,7 +1558,8 @@ print_fpu_flags (int flags)
/* Print interesting information about the floating point processor
(if present) or emulator. */
static void
-arm_print_float_info (void)
+arm_print_float_info (struct gdbarch *gdbarch, struct ui_file *file,
+ struct frame_info *frame)
{
register unsigned long status = read_register (ARM_FPS_REGNUM);
int type;
diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index bbf25f2..db66cd8 100644
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -321,7 +321,7 @@ struct gdbarch startup_gdbarch =
0,
0,
0,
- 0,
+ default_print_float_info,
0,
0,
0,
@@ -1533,20 +1533,10 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file)
(long) current_gdbarch->prepare_to_proceed
/*PREPARE_TO_PROCEED ()*/);
#endif
-#ifdef PRINT_FLOAT_INFO
-#if GDB_MULTI_ARCH
- /* Macro might contain `[{}]' when not multi-arch */
- fprintf_unfiltered (file,
- "gdbarch_dump: %s # %s\n",
- "PRINT_FLOAT_INFO()",
- XSTRING (PRINT_FLOAT_INFO ()));
-#endif
if (GDB_MULTI_ARCH)
fprintf_unfiltered (file,
- "gdbarch_dump: PRINT_FLOAT_INFO = 0x%08lx\n",
- (long) current_gdbarch->print_float_info
- /*PRINT_FLOAT_INFO ()*/);
-#endif
+ "gdbarch_dump: print_float_info = 0x%08lx\n",
+ (long) current_gdbarch->print_float_info);
#ifdef PROLOGUE_FRAMELESS_P
fprintf_unfiltered (file,
"gdbarch_dump: %s # %s\n",
@@ -3007,7 +2997,7 @@ set_gdbarch_do_registers_info (struct gdbarch *gdbarch,
}
void
-gdbarch_print_float_info (struct gdbarch *gdbarch)
+gdbarch_print_float_info (struct gdbarch *gdbarch, struct ui_file *file, struct frame_info *frame)
{
gdb_assert (gdbarch != NULL);
if (gdbarch->print_float_info == 0)
@@ -3015,7 +3005,7 @@ gdbarch_print_float_info (struct gdbarch *gdbarch)
"gdbarch: gdbarch_print_float_info invalid");
if (gdbarch_debug >= 2)
fprintf_unfiltered (gdb_stdlog, "gdbarch_print_float_info called\n");
- gdbarch->print_float_info ();
+ gdbarch->print_float_info (gdbarch, file, frame);
}
void
diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index 7d77cf9..db8c3e1 100644
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -789,22 +789,9 @@ extern void set_gdbarch_do_registers_info (struct gdbarch *gdbarch, gdbarch_do_r
#endif
#endif
-/* Default (function) for non- multi-arch platforms. */
-#if (!GDB_MULTI_ARCH) && !defined (PRINT_FLOAT_INFO)
-#define PRINT_FLOAT_INFO() (default_print_float_info ())
-#endif
-
-typedef void (gdbarch_print_float_info_ftype) (void);
-extern void gdbarch_print_float_info (struct gdbarch *gdbarch);
+typedef void (gdbarch_print_float_info_ftype) (struct gdbarch *gdbarch, struct ui_file *file, struct frame_info *frame);
+extern void gdbarch_print_float_info (struct gdbarch *gdbarch, struct ui_file *file, struct frame_info *frame);
extern void set_gdbarch_print_float_info (struct gdbarch *gdbarch, gdbarch_print_float_info_ftype *print_float_info);
-#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (PRINT_FLOAT_INFO)
-#error "Non multi-arch definition of PRINT_FLOAT_INFO"
-#endif
-#if GDB_MULTI_ARCH
-#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (PRINT_FLOAT_INFO)
-#define PRINT_FLOAT_INFO() (gdbarch_print_float_info (current_gdbarch))
-#endif
-#endif
/* MAP a GDB RAW register number onto a simulator register number. See
also include/...-sim.h. */
diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index 52dfd1c..c0e9586 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -468,7 +468,7 @@ f:2:REGISTER_VIRTUAL_SIZE:int:register_virtual_size:int reg_nr:reg_nr::generic_r
v:2:MAX_REGISTER_VIRTUAL_SIZE:int:max_register_virtual_size::::0:-1
f:2:REGISTER_VIRTUAL_TYPE:struct type *:register_virtual_type:int reg_nr:reg_nr::0:0
f:2:DO_REGISTERS_INFO:void:do_registers_info:int reg_nr, int fpregs:reg_nr, fpregs:::do_registers_info::0
-f:2:PRINT_FLOAT_INFO:void:print_float_info:void::::default_print_float_info::0
+m:2:PRINT_FLOAT_INFO:void:print_float_info:struct ui_file *file, struct frame_info *frame:file, frame:::default_print_float_info::0
# MAP a GDB RAW register number onto a simulator register number. See
# also include/...-sim.h.
f:2:REGISTER_SIM_REGNO:int:register_sim_regno:int reg_nr:reg_nr:::legacy_register_sim_regno::0
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 400ac55..6d3f792 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -1847,7 +1847,7 @@ interrupt_target_command (char *args, int from_tty)
static void
float_info (char *addr_exp, int from_tty)
{
- PRINT_FLOAT_INFO ();
+ gdbarch_print_float_info (current_gdbarch, gdb_stdout, selected_frame);
}
/* ARGSUSED */
generated by cgit v1.1 at 2024-08-14 05:20:01 +0000