Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(742)

Unified Diff: gdb/m2-valprint.c

Issue 11969036: Merge GDB 7.5.1 (Closed) Base URL: http://git.chromium.org/native_client/nacl-gdb.git@master
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gdb/m2-typeprint.c ('k') | gdb/m32c-tdep.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gdb/m2-valprint.c
diff --git a/gdb/m2-valprint.c b/gdb/m2-valprint.c
index 4378b00ff9a80ca2426757f59027ebd0f7c295bd..e92679faa1461758dfdb90d54f954700f49d31f9 100644
--- a/gdb/m2-valprint.c
+++ b/gdb/m2-valprint.c
@@ -43,27 +43,6 @@ m2_print_array_contents (struct type *type, const gdb_byte *valaddr,
int len);
-/* Print function pointer with inferior address ADDRESS onto stdio
- stream STREAM. */
-
-static void
-print_function_pointer_address (struct gdbarch *gdbarch, CORE_ADDR address,
- struct ui_file *stream, int addressprint)
-{
- CORE_ADDR func_addr = gdbarch_convert_from_func_ptr_addr (gdbarch, address,
- &current_target);
-
- /* If the function pointer is represented by a description, print the
- address of the description. */
- if (addressprint && func_addr != address)
- {
- fputs_filtered ("@", stream);
- fputs_filtered (paddress (gdbarch, address), stream);
- fputs_filtered (": ", stream);
- }
- print_address_demangle (gdbarch, func_addr, stream, demangle);
-}
-
/* get_long_set_bounds - assigns the bounds of the long set to low and
high. */
@@ -216,18 +195,21 @@ print_unpacked_pointer (struct type *type,
{
struct gdbarch *gdbarch = get_type_arch (type);
struct type *elttype = check_typedef (TYPE_TARGET_TYPE (type));
+ int want_space = 0;
if (TYPE_CODE (elttype) == TYPE_CODE_FUNC)
{
/* Try to print what function it points to. */
- print_function_pointer_address (gdbarch, addr, stream,
- options->addressprint);
+ print_function_pointer_address (options, gdbarch, addr, stream);
/* Return value is irrelevant except for string pointers. */
return 0;
}
if (options->addressprint && options->format != 's')
- fputs_filtered (paddress (gdbarch, address), stream);
+ {
+ fputs_filtered (paddress (gdbarch, address), stream);
+ want_space = 1;
+ }
/* For a pointer to char or unsigned char, also print the string
pointed to, unless pointer is null. */
@@ -236,8 +218,12 @@ print_unpacked_pointer (struct type *type,
&& TYPE_CODE (elttype) == TYPE_CODE_INT
&& (options->format == 0 || options->format == 's')
&& addr != 0)
- return val_print_string (TYPE_TARGET_TYPE (type), NULL, addr, -1,
- stream, options);
+ {
+ if (want_space)
+ fputs_filtered (" ", stream);
+ return val_print_string (TYPE_TARGET_TYPE (type), NULL, addr, -1,
+ stream, options);
+ }
return 0;
}
@@ -309,12 +295,22 @@ m2_print_array_contents (struct type *type, const gdb_byte *valaddr,
}
}
+/* Decorations for Modula 2. */
+
+static const struct generic_val_print_decorations m2_decorations =
+{
+ "",
+ " + ",
+ " * I",
+ "TRUE",
+ "FALSE",
+ "void"
+};
/* See val_print for a description of the various parameters of this
- function; they are identical. The semantics of the return value is
- also identical to val_print. */
+ function; they are identical. */
-int
+void
m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
CORE_ADDR address, struct ui_file *stream, int recurse,
const struct value *original_value,
@@ -325,7 +321,6 @@ m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
unsigned len;
struct type *elttype;
unsigned eltlen;
- LONGEST val;
CORE_ADDR addr;
CHECK_TYPEDEF (type);
@@ -394,36 +389,6 @@ m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
}
break;
- case TYPE_CODE_REF:
- elttype = check_typedef (TYPE_TARGET_TYPE (type));
- if (options->addressprint)
- {
- CORE_ADDR addr
- = extract_typed_address (valaddr + embedded_offset, type);
-
- fprintf_filtered (stream, "@");
- fputs_filtered (paddress (gdbarch, addr), stream);
- if (options->deref_ref)
- fputs_filtered (": ", stream);
- }
- /* De-reference the reference. */
- if (options->deref_ref)
- {
- if (TYPE_CODE (elttype) != TYPE_CODE_UNDEF)
- {
- struct value *deref_val =
- value_at
- (TYPE_TARGET_TYPE (type),
- unpack_pointer (type, valaddr + embedded_offset));
-
- common_val_print (deref_val, stream, recurse, options,
- current_language);
- }
- else
- fputs_filtered ("???", stream);
- }
- break;
-
case TYPE_CODE_UNION:
if (recurse && !options->unionprint)
{
@@ -444,134 +409,6 @@ m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
options, NULL, 0);
break;
- case TYPE_CODE_ENUM:
- if (options->format)
- {
- 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_BITPOS (type, i))
- {
- break;
- }
- }
- if (i < len)
- {
- fputs_filtered (TYPE_FIELD_NAME (type, i), stream);
- }
- else
- {
- print_longest (stream, 'd', 0, val);
- }
- break;
-
- case TYPE_CODE_FUNC:
- if (options->format)
- {
- val_print_scalar_formatted (type, valaddr, embedded_offset,
- original_value, options, 0, stream);
- break;
- }
- /* FIXME, we should consider, at least for ANSI C language, eliminating
- the distinction made between FUNCs and POINTERs to FUNCs. */
- fprintf_filtered (stream, "{");
- type_print (type, "", stream, -1);
- fprintf_filtered (stream, "} ");
- /* Try to print what function it points to, and its address. */
- print_address_demangle (gdbarch, address, stream, demangle);
- break;
-
- case TYPE_CODE_BOOL:
- if (options->format || options->output_format)
- {
- struct value_print_options opts = *options;
-
- opts.format = (options->format ? options->format
- : options->output_format);
- val_print_scalar_formatted (type, valaddr, embedded_offset,
- original_value, &opts, 0, stream);
- }
- else
- {
- val = unpack_long (type, valaddr + embedded_offset);
- if (val == 0)
- fputs_filtered ("FALSE", stream);
- else if (val == 1)
- fputs_filtered ("TRUE", stream);
- else
- fprintf_filtered (stream, "%ld)", (long int) val);
- }
- break;
-
- case TYPE_CODE_RANGE:
- if (TYPE_LENGTH (type) == TYPE_LENGTH (TYPE_TARGET_TYPE (type)))
- {
- m2_val_print (TYPE_TARGET_TYPE (type), valaddr, embedded_offset,
- address, stream, recurse, original_value, options);
- break;
- }
- /* FIXME: create_range_type does not set the unsigned bit in a
- range type (I think it probably should copy it from the target
- type), so we won't print values which are too large to
- fit in a signed integer correctly. */
- /* FIXME: Doesn't handle ranges of enums correctly. (Can't just
- print with the target type, though, because the size of our type
- and the target type might differ). */
- /* FALLTHROUGH */
-
- case TYPE_CODE_INT:
- if (options->format || options->output_format)
- {
- struct value_print_options opts = *options;
-
- opts.format = (options->format ? options->format
- : options->output_format);
- val_print_scalar_formatted (type, valaddr, embedded_offset,
- original_value, &opts, 0, stream);
- }
- else
- val_print_type_code_int (type, valaddr + embedded_offset, stream);
- break;
-
- case TYPE_CODE_CHAR:
- if (options->format || options->output_format)
- {
- struct value_print_options opts = *options;
-
- opts.format = (options->format ? options->format
- : options->output_format);
- val_print_scalar_formatted (type, valaddr, embedded_offset,
- original_value, &opts, 0, stream);
- }
- else
- {
- val = unpack_long (type, valaddr + embedded_offset);
- if (TYPE_UNSIGNED (type))
- fprintf_filtered (stream, "%u", (unsigned int) val);
- else
- fprintf_filtered (stream, "%d", (int) val);
- fputs_filtered (" ", stream);
- LA_PRINT_CHAR ((unsigned char) val, type, stream);
- }
- break;
-
- case TYPE_CODE_FLT:
- if (options->format)
- val_print_scalar_formatted (type, valaddr, embedded_offset,
- original_value, options, 0, stream);
- else
- print_floating (valaddr + embedded_offset, type, stream);
- break;
-
- case TYPE_CODE_METHOD:
- break;
-
case TYPE_CODE_BITSTRING:
case TYPE_CODE_SET:
elttype = TYPE_INDEX_TYPE (type);
@@ -646,24 +483,38 @@ m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
}
break;
- case TYPE_CODE_VOID:
- fprintf_filtered (stream, "void");
- break;
+ case TYPE_CODE_RANGE:
+ if (TYPE_LENGTH (type) == TYPE_LENGTH (TYPE_TARGET_TYPE (type)))
+ {
+ m2_val_print (TYPE_TARGET_TYPE (type), valaddr, embedded_offset,
+ address, stream, recurse, original_value, options);
+ break;
+ }
+ /* FIXME: create_range_type does not set the unsigned bit in a
+ range type (I think it probably should copy it from the target
+ type), so we won't print values which are too large to
+ fit in a signed integer correctly. */
+ /* FIXME: Doesn't handle ranges of enums correctly. (Can't just
+ print with the target type, though, because the size of our type
+ and the target type might differ). */
+ /* FALLTHROUGH */
+ case TYPE_CODE_REF:
+ case TYPE_CODE_ENUM:
+ case TYPE_CODE_FUNC:
+ case TYPE_CODE_INT:
+ case TYPE_CODE_FLT:
+ case TYPE_CODE_METHOD:
+ case TYPE_CODE_VOID:
case TYPE_CODE_ERROR:
- fprintf_filtered (stream, "%s", TYPE_ERROR_NAME (type));
- break;
-
case TYPE_CODE_UNDEF:
- /* This happens (without TYPE_FLAG_STUB set) on systems which don't use
- dbx xrefs (NO_DBX_XREFS in gcc) if a file has a "struct foo *bar"
- and no complete type for struct foo in that file. */
- fprintf_filtered (stream, _("<incomplete type>"));
- break;
-
+ case TYPE_CODE_BOOL:
+ case TYPE_CODE_CHAR:
default:
- error (_("Invalid m2 type code %d in symbol table."), TYPE_CODE (type));
+ generic_val_print (type, valaddr, embedded_offset, address,
+ stream, recurse, original_value, options,
+ &m2_decorations);
+ break;
}
gdb_flush (stream);
- return (0);
}
« no previous file with comments | « gdb/m2-typeprint.c ('k') | gdb/m32c-tdep.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698