Thanks! I took another look and I have a few
further comments. Sorry I didn't send them the first
time around.
On 12/17/2014 06:46 AM, Yao Qi wrote:
> 2. we want to simply the caller of print_float_info,
"simplify"
> +void
> +default_print_float_info (struct gdbarch *gdbarch, struct ui_file *file,
> + struct frame_info *frame, const char *args)
Could you add an "See inferior.h." comment?
> +{
> + int regnum;
> + int printed_something = 0;
> +
> + for (regnum = 0;
> + regnum < gdbarch_num_regs (gdbarch)
> + + gdbarch_num_pseudo_regs (gdbarch);
> + regnum++)
> + {
> + if (gdbarch_register_reggroup_p (gdbarch, regnum, float_reggroup))
> + {
> + printed_something = 1;
> + gdbarch_print_registers_info (gdbarch, file, frame, regnum, 1);
> + }
> + }
> + if (!printed_something)
> + fprintf_filtered (file, "No floating-point info "
> + "available for this processor.\n");
> +}
> +
> static void
> print_float_info (struct ui_file *file,
> struct frame_info *frame, const char *args)
> {
> struct gdbarch *gdbarch = get_frame_arch (frame);
>
> - if (gdbarch_print_float_info_p (gdbarch))
> - gdbarch_print_float_info (gdbarch, file, frame, args);
> - else
> - {
> - int regnum;
> - int printed_something = 0;
> + gdbarch_print_float_info (gdbarch, file, frame, args);
I think there's only one caller of print_float_info,
so we could inline this there and eliminate print_float_info.
> index eebc034..e10197a 100644
> --- a/gdb/inferior.h
> +++ b/gdb/inferior.h
> @@ -106,6 +106,11 @@ extern void default_print_registers_info (struct gdbarch *gdbarch,
> struct frame_info *frame,
> int regnum, int all);
>
> +extern void default_print_float_info (struct gdbarch *gdbarch,
> + struct ui_file *file,
> + struct frame_info *frame,
> + const char *args);
> +
Could you add an intro comment? Something like:
/* Default implementation of gdbarch_print_float_info. Prints
the values of all floating point registers. */
> extern void child_terminal_info (struct target_ops *self, const char *, int);
>
> extern void term_info (char *, int);
>
> } elseif [istarget "mips*-*-*"] then {
> - gdb_test "info float" "f0:.*flt:.*dbl:.*" "info float"
> + gdb_test_multiple "info float" "info float" {
> + -re "fpu type: none*" {
> + pass "info float (without FPU)"
> + }
> + -re "fpu type:.*cause.*mask.*flags.*round.*flush.*" {
> + pass "info float (with FPU)"
> + }
Missing "$gdb_prompt $" at the end of those regexs.
Also, with v2 we still print the register values.
So ISTM that it'd be good if the "f0:.*flt:.*dbl:.*" regex is
still part of the expected output? And if in the none case
we _shouldn't see those, then the test could make sure
that's how things work?
Thanks,
Pedro Alves
@@ -379,6 +379,7 @@ gdbarch_alloc (const struct gdbarch_info *info,
gdbarch->deprecated_fp_regnum = -1;
gdbarch->call_dummy_location = AT_ENTRY_POINT;
gdbarch->print_registers_info = default_print_registers_info;
+ gdbarch->print_float_info = default_print_float_info;
gdbarch->register_sim_regno = legacy_register_sim_regno;
gdbarch->cannot_fetch_register = cannot_register_not;
gdbarch->cannot_store_register = cannot_register_not;
@@ -531,7 +532,7 @@ verify_gdbarch (struct gdbarch *gdbarch)
/* Skip verify of call_dummy_location, invalid_p == 0 */
/* Skip verify of push_dummy_code, has predicate. */
/* Skip verify of print_registers_info, invalid_p == 0 */
- /* Skip verify of print_float_info, has predicate. */
+ /* Skip verify of print_float_info, invalid_p == 0 */
/* Skip verify of print_vector_info, has predicate. */
/* Skip verify of register_sim_regno, invalid_p == 0 */
/* Skip verify of cannot_fetch_register, invalid_p == 0 */
@@ -1089,9 +1090,6 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file)
"gdbarch_dump: pointer_to_address = <%s>\n",
host_address_to_string (gdbarch->pointer_to_address));
fprintf_unfiltered (file,
- "gdbarch_dump: gdbarch_print_float_info_p() = %d\n",
- gdbarch_print_float_info_p (gdbarch));
- fprintf_unfiltered (file,
"gdbarch_dump: print_float_info = <%s>\n",
host_address_to_string (gdbarch->print_float_info));
fprintf_unfiltered (file,
@@ -2235,13 +2233,6 @@ set_gdbarch_print_registers_info (struct gdbarch *gdbarch,
gdbarch->print_registers_info = print_registers_info;
}
-int
-gdbarch_print_float_info_p (struct gdbarch *gdbarch)
-{
- gdb_assert (gdbarch != NULL);
- return gdbarch->print_float_info != NULL;
-}
-
void
gdbarch_print_float_info (struct gdbarch *gdbarch, struct ui_file *file, struct frame_info *frame, const char *args)
{
@@ -377,8 +377,6 @@ typedef void (gdbarch_print_registers_info_ftype) (struct gdbarch *gdbarch, stru
extern void gdbarch_print_registers_info (struct gdbarch *gdbarch, struct ui_file *file, struct frame_info *frame, int regnum, int all);
extern void set_gdbarch_print_registers_info (struct gdbarch *gdbarch, gdbarch_print_registers_info_ftype *print_registers_info);
-extern int gdbarch_print_float_info_p (struct gdbarch *gdbarch);
-
typedef void (gdbarch_print_float_info_ftype) (struct gdbarch *gdbarch, struct ui_file *file, struct frame_info *frame, const char *args);
extern void gdbarch_print_float_info (struct gdbarch *gdbarch, struct ui_file *file, struct frame_info *frame, const char *args);
extern void set_gdbarch_print_float_info (struct gdbarch *gdbarch, gdbarch_print_float_info_ftype *print_float_info);
@@ -479,7 +479,7 @@ v:int:call_dummy_location::::AT_ENTRY_POINT::0
M:CORE_ADDR:push_dummy_code:CORE_ADDR sp, CORE_ADDR funaddr, struct value **args, int nargs, struct type *value_type, CORE_ADDR *real_pc, CORE_ADDR *bp_addr, struct regcache *regcache:sp, funaddr, args, nargs, value_type, real_pc, bp_addr, regcache
m:void:print_registers_info:struct ui_file *file, struct frame_info *frame, int regnum, int all:file, frame, regnum, all::default_print_registers_info::0
-M:void:print_float_info:struct ui_file *file, struct frame_info *frame, const char *args:file, frame, args
+m:void:print_float_info:struct ui_file *file, struct frame_info *frame, const char *args:file, frame, args::default_print_float_info::0
M:void:print_vector_info:struct ui_file *file, struct frame_info *frame, const char *args:file, frame, args
# MAP a GDB RAW register number onto a simulator register number. See
# also include/...-sim.h.
@@ -2864,34 +2864,37 @@ interrupt_command (char *args, int from_tty)
}
}
+void
+default_print_float_info (struct gdbarch *gdbarch, struct ui_file *file,
+ struct frame_info *frame, const char *args)
+{
+ int regnum;
+ int printed_something = 0;
+
+ for (regnum = 0;
+ regnum < gdbarch_num_regs (gdbarch)
+ + gdbarch_num_pseudo_regs (gdbarch);
+ regnum++)
+ {
+ if (gdbarch_register_reggroup_p (gdbarch, regnum, float_reggroup))
+ {
+ printed_something = 1;
+ gdbarch_print_registers_info (gdbarch, file, frame, regnum, 1);
+ }
+ }
+ if (!printed_something)
+ fprintf_filtered (file, "No floating-point info "
+ "available for this processor.\n");
+}
+
static void
print_float_info (struct ui_file *file,
struct frame_info *frame, const char *args)
{
struct gdbarch *gdbarch = get_frame_arch (frame);
- if (gdbarch_print_float_info_p (gdbarch))
- gdbarch_print_float_info (gdbarch, file, frame, args);
- else
- {
- int regnum;
- int printed_something = 0;
+ gdbarch_print_float_info (gdbarch, file, frame, args);
- for (regnum = 0;
- regnum < gdbarch_num_regs (gdbarch)
- + gdbarch_num_pseudo_regs (gdbarch);
- regnum++)
- {
- if (gdbarch_register_reggroup_p (gdbarch, regnum, float_reggroup))
- {
- printed_something = 1;
- gdbarch_print_registers_info (gdbarch, file, frame, regnum, 1);
- }
- }
- if (!printed_something)
- fprintf_filtered (file, "No floating-point info "
- "available for this processor.\n");
- }
}
static void
@@ -106,6 +106,11 @@ extern void default_print_registers_info (struct gdbarch *gdbarch,
struct frame_info *frame,
int regnum, int all);
+extern void default_print_float_info (struct gdbarch *gdbarch,
+ struct ui_file *file,
+ struct frame_info *frame,
+ const char *args);
+
extern void child_terminal_info (struct target_ops *self, const char *, int);
extern void term_info (char *, int);