OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdb/

Browse Source 
* infcmd.c (default_print_registers_info): Allocate values so to
	never pass a NULL value to val_print.
This commit is contained in:
Pedro Alves 2011-01-25 15:47:58 +00:00
parent de4127a3b2
commit 29ec526351
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2011-01-25 Pedro Alves <pedro@codesourcery.com>
* infcmd.c (default_print_registers_info): Allocate values so to
never pass a NULL value to val_print.
2011-01-25 Pedro Alves <pedro@codesourcery.com> 2011-01-25 Pedro Alves <pedro@codesourcery.com>
* cp-valprint.c (cp_print_value): Treat the 'skip' local as * cp-valprint.c (cp_print_value): Treat the 'skip' local as

37
gdb/infcmd.c
View File

@ -1942,10 +1942,12 @@ default_print_registers_info (struct gdbarch *gdbarch,
int i; int i;
const int numregs = gdbarch_num_regs (gdbarch) const int numregs = gdbarch_num_regs (gdbarch)
+ gdbarch_num_pseudo_regs (gdbarch); + gdbarch_num_pseudo_regs (gdbarch);
gdb_byte buffer[MAX_REGISTER_SIZE];
for (i = 0; i < numregs; i++) for (i = 0; i < numregs; i++)
{ {
struct type *regtype;
struct value *val;
/* Decide between printing all regs, non-float / vector regs, or /* Decide between printing all regs, non-float / vector regs, or
specific reg. */ specific reg. */
if (regnum == -1) if (regnum == -1)
@ -1977,8 +1979,11 @@ default_print_registers_info (struct gdbarch *gdbarch,
print_spaces_filtered (15 - strlen (gdbarch_register_name print_spaces_filtered (15 - strlen (gdbarch_register_name
(gdbarch, i)), file); (gdbarch, i)), file);
regtype = register_type (gdbarch, i);
val = allocate_value (regtype);
/* Get the data in raw format. */ /* Get the data in raw format. */
if (! frame_register_read (frame, i, buffer)) if (! frame_register_read (frame, i, value_contents_raw (val)))
{ {
fprintf_filtered (file, "*value not available*\n"); fprintf_filtered (file, "*value not available*\n");
continue; continue;
@ -1986,16 +1991,20 @@ default_print_registers_info (struct gdbarch *gdbarch,
/* If virtual format is floating, print it that way, and in raw /* If virtual format is floating, print it that way, and in raw
hex. */ hex. */
if (TYPE_CODE (register_type (gdbarch, i)) == TYPE_CODE_FLT if (TYPE_CODE (regtype) == TYPE_CODE_FLT
|| TYPE_CODE (register_type (gdbarch, i)) == TYPE_CODE_DECFLOAT) || TYPE_CODE (regtype) == TYPE_CODE_DECFLOAT)
{ {
int j; int j;
struct value_print_options opts; struct value_print_options opts;
const gdb_byte *valaddr = value_contents_for_printing (val);
get_user_print_options (&opts); get_user_print_options (&opts);
opts.deref_ref = 1; opts.deref_ref = 1;
val_print (register_type (gdbarch, i), buffer, 0, 0,
file, 0, NULL, &opts, current_language); val_print (regtype,
value_contents_for_printing (val),
value_embedded_offset (val), 0,
file, 0, val, &opts, current_language);
fprintf_filtered (file, "\t(raw 0x"); fprintf_filtered (file, "\t(raw 0x");
for (j = 0; j < register_size (gdbarch, i); j++) for (j = 0; j < register_size (gdbarch, i); j++)
@ -2006,7 +2015,7 @@ default_print_registers_info (struct gdbarch *gdbarch,
idx = j; idx = j;
else else
idx = register_size (gdbarch, i) - 1 - j; idx = register_size (gdbarch, i) - 1 - j;
fprintf_filtered (file, "%02x", (unsigned char) buffer[idx]); fprintf_filtered (file, "%02x", (unsigned char) valaddr[idx]);
} }
fprintf_filtered (file, ")"); fprintf_filtered (file, ")");
} }
@ -2017,17 +2026,21 @@ default_print_registers_info (struct gdbarch *gdbarch,
/* Print the register in hex. */ /* Print the register in hex. */
get_formatted_print_options (&opts, 'x'); get_formatted_print_options (&opts, 'x');
opts.deref_ref = 1; opts.deref_ref = 1;
val_print (register_type (gdbarch, i), buffer, 0, 0, val_print (regtype,
file, 0, NULL, &opts, current_language); value_contents_for_printing (val),
value_embedded_offset (val), 0,
file, 0, val, &opts, current_language);
/* If not a vector register, print it also according to its /* If not a vector register, print it also according to its
natural format. */ natural format. */
if (TYPE_VECTOR (register_type (gdbarch, i)) == 0) if (TYPE_VECTOR (regtype) == 0)
{ {
get_user_print_options (&opts); get_user_print_options (&opts);
opts.deref_ref = 1; opts.deref_ref = 1;
fprintf_filtered (file, "\t"); fprintf_filtered (file, "\t");
val_print (register_type (gdbarch, i), buffer, 0, 0, val_print (regtype,
file, 0, NULL, &opts, current_language); value_contents_for_printing (val),
value_embedded_offset (val), 0,
file, 0, val, &opts, current_language);
} }
} }