Factor out enum printing code from generic_val_print
gdb/ChangeLog: * valprint.c (generic_val_print): Factor out enum printing code to ... (generic_val_print_enum): ... this new function.
This commit is contained in:
parent
fe43fede47
commit
ef0bc0dd96
|
@ -1,3 +1,9 @@
|
||||||
|
2015-07-27 Simon Marchi <simon.marchi@ericsson.com>
|
||||||
|
|
||||||
|
* valprint.c (generic_val_print): Factor out enum
|
||||||
|
printing code to ...
|
||||||
|
(generic_val_print_enum): ... this new function.
|
||||||
|
|
||||||
2015-07-27 Simon Marchi <simon.marchi@ericsson.com>
|
2015-07-27 Simon Marchi <simon.marchi@ericsson.com>
|
||||||
|
|
||||||
* valprint.c (generic_val_print): Factor out reference
|
* valprint.c (generic_val_print): Factor out reference
|
||||||
|
|
128
gdb/valprint.c
128
gdb/valprint.c
|
@ -509,6 +509,75 @@ generic_val_print_ref (struct type *type, const gdb_byte *valaddr,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* generic_val_print helper for TYPE_CODE_ENUM. */
|
||||||
|
|
||||||
|
static void
|
||||||
|
generic_val_print_enum (struct type *type, const gdb_byte *valaddr,
|
||||||
|
int embedded_offset, struct ui_file *stream,
|
||||||
|
const struct value *original_value,
|
||||||
|
const struct value_print_options *options)
|
||||||
|
{
|
||||||
|
unsigned int i;
|
||||||
|
unsigned int len;
|
||||||
|
LONGEST val;
|
||||||
|
|
||||||
|
if (options->format)
|
||||||
|
{
|
||||||
|
val_print_scalar_formatted (type, valaddr, embedded_offset,
|
||||||
|
original_value, options, 0, stream);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
len = TYPE_NFIELDS (type);
|
||||||
|
val = unpack_long (type, valaddr + embedded_offset);
|
||||||
|
for (i = 0; i < len; i++)
|
||||||
|
{
|
||||||
|
QUIT;
|
||||||
|
if (val == TYPE_FIELD_ENUMVAL (type, i))
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (i < len)
|
||||||
|
{
|
||||||
|
fputs_filtered (TYPE_FIELD_NAME (type, i), stream);
|
||||||
|
}
|
||||||
|
else if (TYPE_FLAG_ENUM (type))
|
||||||
|
{
|
||||||
|
int first = 1;
|
||||||
|
|
||||||
|
/* We have a "flag" enum, so we try to decompose it into
|
||||||
|
pieces as appropriate. A flag enum has disjoint
|
||||||
|
constants by definition. */
|
||||||
|
fputs_filtered ("(", stream);
|
||||||
|
for (i = 0; i < len; ++i)
|
||||||
|
{
|
||||||
|
QUIT;
|
||||||
|
|
||||||
|
if ((val & TYPE_FIELD_ENUMVAL (type, i)) != 0)
|
||||||
|
{
|
||||||
|
if (!first)
|
||||||
|
fputs_filtered (" | ", stream);
|
||||||
|
first = 0;
|
||||||
|
|
||||||
|
val &= ~TYPE_FIELD_ENUMVAL (type, i);
|
||||||
|
fputs_filtered (TYPE_FIELD_NAME (type, i), stream);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (first || val != 0)
|
||||||
|
{
|
||||||
|
if (!first)
|
||||||
|
fputs_filtered (" | ", stream);
|
||||||
|
fputs_filtered ("unknown: ", stream);
|
||||||
|
print_longest (stream, 'd', 0, val);
|
||||||
|
}
|
||||||
|
|
||||||
|
fputs_filtered (")", stream);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
print_longest (stream, 'd', 0, val);
|
||||||
|
}
|
||||||
|
|
||||||
/* A generic val_print that is suitable for use by language
|
/* A generic val_print that is suitable for use by language
|
||||||
implementations of the la_val_print method. This function can
|
implementations of the la_val_print method. This function can
|
||||||
handle most type codes, though not all, notably exception
|
handle most type codes, though not all, notably exception
|
||||||
|
@ -529,8 +598,6 @@ generic_val_print (struct type *type, const gdb_byte *valaddr,
|
||||||
const struct generic_val_print_decorations *decorations)
|
const struct generic_val_print_decorations *decorations)
|
||||||
{
|
{
|
||||||
struct gdbarch *gdbarch = get_type_arch (type);
|
struct gdbarch *gdbarch = get_type_arch (type);
|
||||||
unsigned int i = 0; /* Number of characters printed. */
|
|
||||||
unsigned len;
|
|
||||||
struct type *unresolved_type = type;
|
struct type *unresolved_type = type;
|
||||||
LONGEST val;
|
LONGEST val;
|
||||||
|
|
||||||
|
@ -558,61 +625,8 @@ generic_val_print (struct type *type, const gdb_byte *valaddr,
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case TYPE_CODE_ENUM:
|
case TYPE_CODE_ENUM:
|
||||||
if (options->format)
|
generic_val_print_enum (type, valaddr, embedded_offset, stream,
|
||||||
{
|
original_value, options);
|
||||||
val_print_scalar_formatted (type, valaddr, embedded_offset,
|
|
||||||
original_value, options, 0, stream);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
len = TYPE_NFIELDS (type);
|
|
||||||
val = unpack_long (type, valaddr + embedded_offset);
|
|
||||||
for (i = 0; i < len; i++)
|
|
||||||
{
|
|
||||||
QUIT;
|
|
||||||
if (val == TYPE_FIELD_ENUMVAL (type, i))
|
|
||||||
{
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (i < len)
|
|
||||||
{
|
|
||||||
fputs_filtered (TYPE_FIELD_NAME (type, i), stream);
|
|
||||||
}
|
|
||||||
else if (TYPE_FLAG_ENUM (type))
|
|
||||||
{
|
|
||||||
int first = 1;
|
|
||||||
|
|
||||||
/* We have a "flag" enum, so we try to decompose it into
|
|
||||||
pieces as appropriate. A flag enum has disjoint
|
|
||||||
constants by definition. */
|
|
||||||
fputs_filtered ("(", stream);
|
|
||||||
for (i = 0; i < len; ++i)
|
|
||||||
{
|
|
||||||
QUIT;
|
|
||||||
|
|
||||||
if ((val & TYPE_FIELD_ENUMVAL (type, i)) != 0)
|
|
||||||
{
|
|
||||||
if (!first)
|
|
||||||
fputs_filtered (" | ", stream);
|
|
||||||
first = 0;
|
|
||||||
|
|
||||||
val &= ~TYPE_FIELD_ENUMVAL (type, i);
|
|
||||||
fputs_filtered (TYPE_FIELD_NAME (type, i), stream);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (first || val != 0)
|
|
||||||
{
|
|
||||||
if (!first)
|
|
||||||
fputs_filtered (" | ", stream);
|
|
||||||
fputs_filtered ("unknown: ", stream);
|
|
||||||
print_longest (stream, 'd', 0, val);
|
|
||||||
}
|
|
||||||
|
|
||||||
fputs_filtered (")", stream);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
print_longest (stream, 'd', 0, val);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case TYPE_CODE_FLAGS:
|
case TYPE_CODE_FLAGS:
|
||||||
|
|
Loading…
Reference in New Issue