/* Local functions */
-int
+void
java_value_print (struct value *val, struct ui_file *stream,
const struct value_print_options *options)
{
struct type *type;
CORE_ADDR address;
int i;
- char *name;
+ const char *name;
struct value_print_options opts;
type = value_type (val);
if (is_object_type (type))
{
CORE_ADDR obj_addr;
+ struct value *tem = val;
/* Get the run-time type, and cast the object into that. */
+ while (TYPE_CODE (value_type (tem)) == TYPE_CODE_PTR)
+ tem = value_ind (tem);
- obj_addr = unpack_pointer (type, value_contents (val));
+ obj_addr = value_address (tem);
if (obj_addr != 0)
{
fprintf_filtered (stream, "}");
- return 0;
+ return;
}
/* If it's type String, print it. */
val_print_string (char_type, NULL, data + boffset, count, stream,
options);
- return 0;
+ return;
}
opts = *options;
opts.deref_ref = 1;
- return common_val_print (val, stream, 0, &opts, current_language);
+ common_val_print (val, stream, 0, &opts, current_language);
}
/* TYPE, VALADDR, ADDRESS, STREAM, RECURSE, and OPTIONS have the
{
int boffset;
struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i));
- char *basename = TYPE_NAME (baseclass);
+ const char *basename = TYPE_NAME (baseclass);
const gdb_byte *base_valaddr;
if (BASETYPE_VIA_VIRTUAL (type, i))
/* If requested, skip printing of static fields. */
if (field_is_static (&TYPE_FIELD (type, i)))
{
- char *name = TYPE_FIELD_NAME (type, i);
+ const char *name = TYPE_FIELD_NAME (type, i);
if (!options->static_field_print)
continue;
}
/* 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
java_val_print (struct type *type, const gdb_byte *valaddr,
int embedded_offset, CORE_ADDR address,
struct ui_file *stream, int recurse,
val, options, 0, stream);
break;
}
-#if 0
- if (options->vtblprint && cp_is_vtbl_ptr_type (type))
- {
- /* Print the unmangled name if desired. */
- /* Print vtable entry - we only get here if we ARE using
- -fvtable_thunks. (Otherwise, look under TYPE_CODE_STRUCT.) */
- /* Extract an address, assume that it is unsigned. */
- print_address_demangle
- (gdbarch,
- extract_unsigned_integer (valaddr + embedded_offset,
- TYPE_LENGTH (type)),
- stream, demangle);
- break;
- }
-#endif
addr = unpack_pointer (type, valaddr + embedded_offset);
if (addr == 0)
{
fputs_filtered ("null", stream);
- return i;
+ return;
}
target_type = check_typedef (TYPE_TARGET_TYPE (type));
{
/* Try to print what function it points to. */
print_address_demangle (gdbarch, addr, stream, demangle);
- /* Return value is irrelevant except for string pointers. */
- return (0);
+ return;
}
if (options->addressprint && options->format != 's')
print_longest (stream, 'x', 0, (ULONGEST) addr);
}
- return i;
+ return;
case TYPE_CODE_CHAR:
case TYPE_CODE_INT:
break;
default:
- return c_val_print (type, valaddr, embedded_offset, address, stream,
- recurse, val, options);
+ c_val_print (type, valaddr, embedded_offset, address, stream,
+ recurse, val, options);
+ break;
}
-
- return 0;
}