/* prdbg.c -- Print out generic debugging information.
- Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+ Copyright 1995, 1996, 2002 Free Software Foundation, Inc.
Written by Ian Lance Taylor <ian@cygnus.com>.
This file is part of GNU Binutils.
const char *method;
};
-static void indent PARAMS ((struct pr_handle *));
-static boolean push_type PARAMS ((struct pr_handle *, const char *));
-static boolean prepend_type PARAMS ((struct pr_handle *, const char *));
-static boolean append_type PARAMS ((struct pr_handle *, const char *));
-static boolean substitute_type PARAMS ((struct pr_handle *, const char *));
-static boolean indent_type PARAMS ((struct pr_handle *));
-static char *pop_type PARAMS ((struct pr_handle *));
-static void print_vma PARAMS ((bfd_vma, char *, boolean, boolean));
-static boolean pr_fix_visibility
+static void indent
+ PARAMS ((struct pr_handle *));
+static bfd_boolean push_type
+ PARAMS ((struct pr_handle *, const char *));
+static bfd_boolean prepend_type
+ PARAMS ((struct pr_handle *, const char *));
+static bfd_boolean append_type
+ PARAMS ((struct pr_handle *, const char *));
+static bfd_boolean substitute_type
+ PARAMS ((struct pr_handle *, const char *));
+static bfd_boolean indent_type
+ PARAMS ((struct pr_handle *));
+static char *pop_type
+ PARAMS ((struct pr_handle *));
+static void print_vma
+ PARAMS ((bfd_vma, char *, bfd_boolean, bfd_boolean));
+static bfd_boolean pr_fix_visibility
PARAMS ((struct pr_handle *, enum debug_visibility));
-
-static boolean pr_start_compilation_unit PARAMS ((PTR, const char *));
-static boolean pr_start_source PARAMS ((PTR, const char *));
-static boolean pr_empty_type PARAMS ((PTR));
-static boolean pr_void_type PARAMS ((PTR));
-static boolean pr_int_type PARAMS ((PTR, unsigned int, boolean));
-static boolean pr_float_type PARAMS ((PTR, unsigned int));
-static boolean pr_complex_type PARAMS ((PTR, unsigned int));
-static boolean pr_bool_type PARAMS ((PTR, unsigned int));
-static boolean pr_enum_type
+static bfd_boolean pr_start_compilation_unit
+ PARAMS ((PTR, const char *));
+static bfd_boolean pr_start_source
+ PARAMS ((PTR, const char *));
+static bfd_boolean pr_empty_type
+ PARAMS ((PTR));
+static bfd_boolean pr_void_type
+ PARAMS ((PTR));
+static bfd_boolean pr_int_type
+ PARAMS ((PTR, unsigned int, bfd_boolean));
+static bfd_boolean pr_float_type
+ PARAMS ((PTR, unsigned int));
+static bfd_boolean pr_complex_type
+ PARAMS ((PTR, unsigned int));
+static bfd_boolean pr_bool_type
+ PARAMS ((PTR, unsigned int));
+static bfd_boolean pr_enum_type
PARAMS ((PTR, const char *, const char **, bfd_signed_vma *));
-static boolean pr_pointer_type PARAMS ((PTR));
-static boolean pr_function_type PARAMS ((PTR));
-static boolean pr_reference_type PARAMS ((PTR));
-static boolean pr_range_type PARAMS ((PTR, bfd_signed_vma, bfd_signed_vma));
-static boolean pr_array_type
- PARAMS ((PTR, bfd_signed_vma, bfd_signed_vma, boolean));
-static boolean pr_set_type PARAMS ((PTR, boolean));
-static boolean pr_offset_type PARAMS ((PTR));
-static boolean pr_method_type PARAMS ((PTR, boolean, int));
-static boolean pr_const_type PARAMS ((PTR));
-static boolean pr_volatile_type PARAMS ((PTR));
-static boolean pr_start_struct_type
- PARAMS ((PTR, const char *, boolean, unsigned int));
-static boolean pr_struct_field
+static bfd_boolean pr_pointer_type
+ PARAMS ((PTR));
+static bfd_boolean pr_function_type
+ PARAMS ((PTR, int, bfd_boolean));
+static bfd_boolean pr_reference_type
+ PARAMS ((PTR));
+static bfd_boolean pr_range_type
+ PARAMS ((PTR, bfd_signed_vma, bfd_signed_vma));
+static bfd_boolean pr_array_type
+ PARAMS ((PTR, bfd_signed_vma, bfd_signed_vma, bfd_boolean));
+static bfd_boolean pr_set_type
+ PARAMS ((PTR, bfd_boolean));
+static bfd_boolean pr_offset_type
+ PARAMS ((PTR));
+static bfd_boolean pr_method_type
+ PARAMS ((PTR, bfd_boolean, int, bfd_boolean));
+static bfd_boolean pr_const_type
+ PARAMS ((PTR));
+static bfd_boolean pr_volatile_type
+ PARAMS ((PTR));
+static bfd_boolean pr_start_struct_type
+ PARAMS ((PTR, const char *, unsigned int, bfd_boolean, unsigned int));
+static bfd_boolean pr_struct_field
PARAMS ((PTR, const char *, bfd_vma, bfd_vma, enum debug_visibility));
-static boolean pr_end_struct_type PARAMS ((PTR));
-static boolean pr_start_class_type
- PARAMS ((PTR, const char *, boolean, unsigned int, boolean, boolean));
-static boolean pr_class_static_member
+static bfd_boolean pr_end_struct_type
+ PARAMS ((PTR));
+static bfd_boolean pr_start_class_type
+ PARAMS ((PTR, const char *, unsigned int, bfd_boolean, unsigned int,
+ bfd_boolean, bfd_boolean));
+static bfd_boolean pr_class_static_member
PARAMS ((PTR, const char *, const char *, enum debug_visibility));
-static boolean pr_class_baseclass
- PARAMS ((PTR, bfd_vma, boolean, enum debug_visibility));
-static boolean pr_class_start_method PARAMS ((PTR, const char *));
-static boolean pr_class_method_variant
- PARAMS ((PTR, const char *, enum debug_visibility, boolean, boolean,
- bfd_vma, boolean));
-static boolean pr_class_static_method_variant
- PARAMS ((PTR, const char *, enum debug_visibility, boolean, boolean));
-static boolean pr_class_end_method PARAMS ((PTR));
-static boolean pr_end_class_type PARAMS ((PTR));
-static boolean pr_typedef_type PARAMS ((PTR, const char *));
-static boolean pr_tag_type PARAMS ((PTR, const char *, enum debug_type_kind));
-static boolean pr_typdef PARAMS ((PTR, const char *));
-static boolean pr_tag PARAMS ((PTR, const char *));
-static boolean pr_int_constant PARAMS ((PTR, const char *, bfd_vma));
-static boolean pr_float_constant PARAMS ((PTR, const char *, double));
-static boolean pr_typed_constant PARAMS ((PTR, const char *, bfd_vma));
-static boolean pr_variable
+static bfd_boolean pr_class_baseclass
+ PARAMS ((PTR, bfd_vma, bfd_boolean, enum debug_visibility));
+static bfd_boolean pr_class_start_method
+ PARAMS ((PTR, const char *));
+static bfd_boolean pr_class_method_variant
+ PARAMS ((PTR, const char *, enum debug_visibility, bfd_boolean, bfd_boolean,
+ bfd_vma, bfd_boolean));
+static bfd_boolean pr_class_static_method_variant
+ PARAMS ((PTR, const char *, enum debug_visibility, bfd_boolean,
+ bfd_boolean));
+static bfd_boolean pr_class_end_method
+ PARAMS ((PTR));
+static bfd_boolean pr_end_class_type
+ PARAMS ((PTR));
+static bfd_boolean pr_typedef_type
+ PARAMS ((PTR, const char *));
+static bfd_boolean pr_tag_type
+ PARAMS ((PTR, const char *, unsigned int, enum debug_type_kind));
+static bfd_boolean pr_typdef
+ PARAMS ((PTR, const char *));
+static bfd_boolean pr_tag
+ PARAMS ((PTR, const char *));
+static bfd_boolean pr_int_constant
+ PARAMS ((PTR, const char *, bfd_vma));
+static bfd_boolean pr_float_constant
+ PARAMS ((PTR, const char *, double));
+static bfd_boolean pr_typed_constant
+ PARAMS ((PTR, const char *, bfd_vma));
+static bfd_boolean pr_variable
PARAMS ((PTR, const char *, enum debug_var_kind, bfd_vma));
-static boolean pr_start_function PARAMS ((PTR, const char *, boolean));
-static boolean pr_function_parameter
+static bfd_boolean pr_start_function
+ PARAMS ((PTR, const char *, bfd_boolean));
+static bfd_boolean pr_function_parameter
PARAMS ((PTR, const char *, enum debug_parm_kind, bfd_vma));
-static boolean pr_start_block PARAMS ((PTR, bfd_vma));
-static boolean pr_end_block PARAMS ((PTR, bfd_vma));
-static boolean pr_end_function PARAMS ((PTR));
-static boolean pr_lineno PARAMS ((PTR, const char *, unsigned long, bfd_vma));
+static bfd_boolean pr_start_block
+ PARAMS ((PTR, bfd_vma));
+static bfd_boolean pr_end_block
+ PARAMS ((PTR, bfd_vma));
+static bfd_boolean pr_end_function
+ PARAMS ((PTR));
+static bfd_boolean pr_lineno
+ PARAMS ((PTR, const char *, unsigned long, bfd_vma));
static const struct debug_write_fns pr_fns =
{
\f
/* Print out the generic debugging information recorded in dhandle. */
-boolean
+bfd_boolean
print_debugging_info (f, dhandle)
FILE *f;
PTR dhandle;
/* Push a type on the type stack. */
-static boolean
+static bfd_boolean
push_type (info, type)
struct pr_handle *info;
const char *type;
struct pr_stack *n;
if (type == NULL)
- return false;
+ return FALSE;
n = (struct pr_stack *) xmalloc (sizeof *n);
memset (n, 0, sizeof *n);
n->next = info->stack;
info->stack = n;
- return true;
+ return TRUE;
}
/* Prepend a string onto the type on the top of the type stack. */
-static boolean
+static bfd_boolean
prepend_type (info, s)
struct pr_handle *info;
const char *s;
free (info->stack->type);
info->stack->type = n;
- return true;
+ return TRUE;
}
/* Append a string to the type on the top of the type stack. */
-static boolean
+static bfd_boolean
append_type (info, s)
struct pr_handle *info;
const char *s;
unsigned int len;
if (s == NULL)
- return false;
+ return FALSE;
assert (info->stack != NULL);
len + strlen (s) + 1);
strcpy (info->stack->type + len, s);
- return true;
+ return TRUE;
}
/* We use an underscore to indicate where the name should go in a type
string. This function substitutes a string for the underscore. If
there is no underscore, the name follows the type. */
-static boolean
+static bfd_boolean
substitute_type (info, s)
struct pr_handle *info;
const char *s;
free (info->stack->type);
info->stack->type = n;
- return true;
+ return TRUE;
}
if (strchr (s, '|') != NULL
{
if (! prepend_type (info, "(")
|| ! append_type (info, ")"))
- return false;
+ return FALSE;
}
if (*s == '\0')
- return true;
+ return TRUE;
return (append_type (info, " ")
&& append_type (info, s));
/* Indent the type at the top of the stack by appending spaces. */
-static boolean
+static bfd_boolean
indent_type (info)
struct pr_handle *info;
{
for (i = 0; i < info->indent; i++)
{
if (! append_type (info, " "))
- return false;
+ return FALSE;
}
- return true;
+ return TRUE;
}
/* Pop a type from the type stack. */
print_vma (vma, buf, unsignedp, hexp)
bfd_vma vma;
char *buf;
- boolean unsignedp;
- boolean hexp;
+ bfd_boolean unsignedp;
+ bfd_boolean hexp;
{
if (sizeof (vma) <= sizeof (unsigned long))
{
\f
/* Start a new compilation unit. */
-static boolean
+static bfd_boolean
pr_start_compilation_unit (p, filename)
PTR p;
const char *filename;
fprintf (info->f, "%s:\n", filename);
- return true;
+ return TRUE;
}
/* Start a source file within a compilation unit. */
-static boolean
+static bfd_boolean
pr_start_source (p, filename)
PTR p;
const char *filename;
fprintf (info->f, " %s:\n", filename);
- return true;
+ return TRUE;
}
/* Push an empty type onto the type stack. */
-static boolean
+static bfd_boolean
pr_empty_type (p)
PTR p;
{
/* Push a void type onto the type stack. */
-static boolean
+static bfd_boolean
pr_void_type (p)
PTR p;
{
/* Push an integer type onto the type stack. */
-static boolean
+static bfd_boolean
pr_int_type (p, size, unsignedp)
PTR p;
unsigned int size;
- boolean unsignedp;
+ bfd_boolean unsignedp;
{
struct pr_handle *info = (struct pr_handle *) p;
char ab[10];
/* Push a floating type onto the type stack. */
-static boolean
+static bfd_boolean
pr_float_type (p, size)
PTR p;
unsigned int size;
/* Push a complex type onto the type stack. */
-static boolean
+static bfd_boolean
pr_complex_type (p, size)
PTR p;
unsigned int size;
struct pr_handle *info = (struct pr_handle *) p;
if (! pr_float_type (p, size))
- return false;
+ return FALSE;
return prepend_type (info, "complex ");
}
-/* Push a boolean type onto the type stack. */
+/* Push a bfd_boolean type onto the type stack. */
-static boolean
+static bfd_boolean
pr_bool_type (p, size)
PTR p;
unsigned int size;
/* Push an enum type onto the type stack. */
-static boolean
+static bfd_boolean
pr_enum_type (p, tag, names, values)
PTR p;
const char *tag;
bfd_signed_vma val;
if (! push_type (info, "enum "))
- return false;
+ return FALSE;
if (tag != NULL)
{
if (! append_type (info, tag)
|| ! append_type (info, " "))
- return false;
+ return FALSE;
}
if (! append_type (info, "{ "))
- return false;
+ return FALSE;
- val = 0;
- for (i = 0; names[i] != NULL; i++)
+ if (names == NULL)
{
- if (i > 0)
+ if (! append_type (info, "/* undefined */"))
+ return FALSE;
+ }
+ else
+ {
+ val = 0;
+ for (i = 0; names[i] != NULL; i++)
{
- if (! append_type (info, ", "))
- return false;
- }
+ if (i > 0)
+ {
+ if (! append_type (info, ", "))
+ return FALSE;
+ }
- if (! append_type (info, names[i]))
- return false;
+ if (! append_type (info, names[i]))
+ return FALSE;
- if (values[i] != val)
- {
- char ab[20];
+ if (values[i] != val)
+ {
+ char ab[20];
- print_vma (values[i], ab, false, false);
- if (! append_type (info, " = ")
- || ! append_type (info, ab))
- return false;
- val = values[i];
- }
+ print_vma (values[i], ab, FALSE, FALSE);
+ if (! append_type (info, " = ")
+ || ! append_type (info, ab))
+ return FALSE;
+ val = values[i];
+ }
- ++val;
+ ++val;
+ }
}
return append_type (info, " }");
/* Turn the top type on the stack into a pointer. */
-static boolean
+static bfd_boolean
pr_pointer_type (p)
PTR p;
{
struct pr_handle *info = (struct pr_handle *) p;
+ char *s;
assert (info->stack != NULL);
+ s = strchr (info->stack->type, '|');
+ if (s != NULL && s[1] == '[')
+ return substitute_type (info, "(*|)");
return substitute_type (info, "*|");
}
/* Turn the top type on the stack into a function returning that type. */
-static boolean
-pr_function_type (p)
+static bfd_boolean
+pr_function_type (p, argcount, varargs)
PTR p;
+ int argcount;
+ bfd_boolean varargs;
{
struct pr_handle *info = (struct pr_handle *) p;
+ char **arg_types;
+ unsigned int len;
+ char *s;
assert (info->stack != NULL);
- return substitute_type (info, "(|) ()");
+ len = 10;
+
+ if (argcount <= 0)
+ {
+ arg_types = NULL;
+ len += 15;
+ }
+ else
+ {
+ int i;
+
+ arg_types = (char **) xmalloc (argcount * sizeof *arg_types);
+ for (i = argcount - 1; i >= 0; i--)
+ {
+ if (! substitute_type (info, ""))
+ return FALSE;
+ arg_types[i] = pop_type (info);
+ if (arg_types[i] == NULL)
+ return FALSE;
+ len += strlen (arg_types[i]) + 2;
+ }
+ if (varargs)
+ len += 5;
+ }
+
+ /* Now the return type is on the top of the stack. */
+
+ s = (char *) xmalloc (len);
+ strcpy (s, "(|) (");
+
+ if (argcount < 0)
+ strcat (s, "/* unknown */");
+ else
+ {
+ int i;
+
+ for (i = 0; i < argcount; i++)
+ {
+ if (i > 0)
+ strcat (s, ", ");
+ strcat (s, arg_types[i]);
+ }
+ if (varargs)
+ {
+ if (i > 0)
+ strcat (s, ", ");
+ strcat (s, "...");
+ }
+ if (argcount > 0)
+ free (arg_types);
+ }
+
+ strcat (s, ")");
+
+ if (! substitute_type (info, s))
+ return FALSE;
+
+ free (s);
+
+ return TRUE;
}
/* Turn the top type on the stack into a reference to that type. */
-static boolean
+static bfd_boolean
pr_reference_type (p)
PTR p;
{
/* Make a range type. */
-static boolean
+static bfd_boolean
pr_range_type (p, lower, upper)
PTR p;
bfd_signed_vma lower;
assert (info->stack != NULL);
if (! substitute_type (info, ""))
- return false;
+ return FALSE;
- print_vma (lower, abl, false, false);
- print_vma (upper, abu, false, false);
+ print_vma (lower, abl, FALSE, FALSE);
+ print_vma (upper, abu, FALSE, FALSE);
return (prepend_type (info, "range (")
&& append_type (info, "):")
/* Make an array type. */
-/*ARGSUSED*/
-static boolean
+static bfd_boolean
pr_array_type (p, lower, upper, stringp)
PTR p;
bfd_signed_vma lower;
bfd_signed_vma upper;
- boolean stringp;
+ bfd_boolean stringp;
{
struct pr_handle *info = (struct pr_handle *) p;
char *range_type;
range_type = pop_type (info);
if (range_type == NULL)
- return false;
+ return FALSE;
if (lower == 0)
{
sprintf (ab, "|[]");
else
{
- print_vma (upper + 1, abu, false, false);
+ print_vma (upper + 1, abu, FALSE, FALSE);
sprintf (ab, "|[%s]", abu);
}
}
else
{
- print_vma (lower, abl, false, false);
- print_vma (upper, abu, false, false);
+ print_vma (lower, abl, FALSE, FALSE);
+ print_vma (upper, abu, FALSE, FALSE);
sprintf (ab, "|[%s:%s]", abl, abu);
}
if (! substitute_type (info, ab))
- return false;
+ return FALSE;
if (strcmp (range_type, "int") != 0)
{
if (! append_type (info, ":")
|| ! append_type (info, range_type))
- return false;
+ return FALSE;
}
if (stringp)
{
if (! append_type (info, " /* string */"))
- return false;
+ return FALSE;
}
- return true;
+ return TRUE;
}
/* Make a set type. */
-/*ARGSUSED*/
-static boolean
+static bfd_boolean
pr_set_type (p, bitstringp)
PTR p;
- boolean bitstringp;
+ bfd_boolean bitstringp;
{
struct pr_handle *info = (struct pr_handle *) p;
if (! substitute_type (info, ""))
- return false;
+ return FALSE;
if (! prepend_type (info, "set { ")
|| ! append_type (info, " }"))
- return false;
+ return FALSE;
if (bitstringp)
{
if (! append_type (info, "/* bitstring */"))
- return false;
+ return FALSE;
}
- return true;
+ return TRUE;
}
/* Make an offset type. */
-static boolean
+static bfd_boolean
pr_offset_type (p)
PTR p;
{
char *t;
if (! substitute_type (info, ""))
- return false;
+ return FALSE;
t = pop_type (info);
if (t == NULL)
- return false;
+ return FALSE;
return (substitute_type (info, "")
&& prepend_type (info, " ")
/* Make a method type. */
-static boolean
-pr_method_type (p, domain, argcount)
+static bfd_boolean
+pr_method_type (p, domain, argcount, varargs)
PTR p;
- boolean domain;
+ bfd_boolean domain;
int argcount;
+ bfd_boolean varargs;
{
struct pr_handle *info = (struct pr_handle *) p;
unsigned int len;
else
{
if (! substitute_type (info, ""))
- return false;
+ return FALSE;
domain_type = pop_type (info);
if (domain_type == NULL)
- return false;
+ return FALSE;
if (strncmp (domain_type, "class ", sizeof "class " - 1) == 0
&& strchr (domain_type + sizeof "class " - 1, ' ') == NULL)
domain_type += sizeof "class " - 1;
for (i = argcount - 1; i >= 0; i--)
{
if (! substitute_type (info, ""))
- return false;
+ return FALSE;
arg_types[i] = pop_type (info);
if (arg_types[i] == NULL)
- return false;
+ return FALSE;
len += strlen (arg_types[i]) + 2;
}
+ if (varargs)
+ len += 5;
}
/* Now the return type is on the top of the stack. */
strcat (s, ", ");
strcat (s, arg_types[i]);
}
+ if (varargs)
+ {
+ if (i > 0)
+ strcat (s, ", ");
+ strcat (s, "...");
+ }
+ if (argcount > 0)
+ free (arg_types);
}
strcat (s, ")");
if (! substitute_type (info, s))
- return false;
+ return FALSE;
free (s);
- return true;
+ return TRUE;
}
/* Make a const qualified type. */
-static boolean
+static bfd_boolean
pr_const_type (p)
PTR p;
{
/* Make a volatile qualified type. */
-static boolean
+static bfd_boolean
pr_volatile_type (p)
PTR p;
{
/* Start accumulating a struct type. */
-static boolean
-pr_start_struct_type (p, tag, structp, size)
+static bfd_boolean
+pr_start_struct_type (p, tag, id, structp, size)
PTR p;
const char *tag;
- boolean structp;
+ unsigned int id;
+ bfd_boolean structp;
unsigned int size;
{
struct pr_handle *info = (struct pr_handle *) p;
- char ab[30];
info->indent += 2;
if (! push_type (info, structp ? "struct " : "union "))
- return false;
+ return FALSE;
if (tag != NULL)
{
- if (! append_type (info, tag)
- || ! append_type (info, " "))
- return false;
+ if (! append_type (info, tag))
+ return FALSE;
}
- if (size != 0)
- sprintf (ab, "{ /* size %u */\n", size);
else
- strcpy (ab, "{\n");
- if (! append_type (info, ab))
- return false;
+ {
+ char idbuf[20];
+
+ sprintf (idbuf, "%%anon%u", id);
+ if (! append_type (info, idbuf))
+ return FALSE;
+ }
+
+ if (! append_type (info, " {"))
+ return FALSE;
+ if (size != 0 || tag != NULL)
+ {
+ char ab[30];
+
+ if (! append_type (info, " /*"))
+ return FALSE;
+
+ if (size != 0)
+ {
+ sprintf (ab, " size %u", size);
+ if (! append_type (info, ab))
+ return FALSE;
+ }
+ if (tag != NULL)
+ {
+ sprintf (ab, " id %u", id);
+ if (! append_type (info, ab))
+ return FALSE;
+ }
+ if (! append_type (info, " */"))
+ return FALSE;
+ }
+ if (! append_type (info, "\n"))
+ return FALSE;
+
info->stack->visibility = DEBUG_VISIBILITY_PUBLIC;
+
return indent_type (info);
}
/* Output the visibility of a field in a struct. */
-static boolean
+static bfd_boolean
pr_fix_visibility (info, visibility)
struct pr_handle *info;
enum debug_visibility visibility;
{
- const char *s;
- struct pr_stack *top;
+ const char *s = NULL;
char *t;
unsigned int len;
- assert (info->stack != NULL && info->stack->next != NULL);
-
- if (info->stack->next->visibility == visibility)
- return true;
+ assert (info->stack != NULL);
- assert (info->stack->next->visibility != DEBUG_VISIBILITY_IGNORE);
+ if (info->stack->visibility == visibility)
+ return TRUE;
switch (visibility)
{
case DEBUG_VISIBILITY_PROTECTED:
s = "protected";
break;
+ case DEBUG_VISIBILITY_IGNORE:
+ s = "/* ignore */";
+ break;
default:
abort ();
- return false;
+ return FALSE;
}
/* Trim off a trailing space in the struct string, to make the
- output look a bit better, then stick on the visibility string.
- Pop the stack temporarily to make the string manipulation
- simpler. */
-
- top = info->stack;
- info->stack = top->next;
+ output look a bit better, then stick on the visibility string. */
t = info->stack->type;
len = strlen (t);
if (! append_type (info, s)
|| ! append_type (info, ":\n")
|| ! indent_type (info))
- return false;
+ return FALSE;
info->stack->visibility = visibility;
- info->stack = top;
-
- return true;
+ return TRUE;
}
/* Add a field to a struct type. */
-static boolean
+static bfd_boolean
pr_struct_field (p, name, bitpos, bitsize, visibility)
PTR p;
const char *name;
{
struct pr_handle *info = (struct pr_handle *) p;
char ab[20];
-
- if (! pr_fix_visibility (info, visibility))
- return false;
+ char *t;
if (! substitute_type (info, name))
- return false;
+ return FALSE;
if (! append_type (info, "; /* "))
- return false;
+ return FALSE;
if (bitsize != 0)
{
- print_vma (bitsize, ab, true, false);
+ print_vma (bitsize, ab, TRUE, FALSE);
if (! append_type (info, "bitsize ")
|| ! append_type (info, ab)
|| ! append_type (info, ", "))
- return false;
+ return FALSE;
}
- print_vma (bitpos, ab, true, false);
+ print_vma (bitpos, ab, TRUE, FALSE);
if (! append_type (info, "bitpos ")
|| ! append_type (info, ab)
|| ! append_type (info, " */\n")
|| ! indent_type (info))
- return false;
+ return FALSE;
- return append_type (info, pop_type (info));
+ t = pop_type (info);
+ if (t == NULL)
+ return FALSE;
+
+ if (! pr_fix_visibility (info, visibility))
+ return FALSE;
+
+ return append_type (info, t);
}
/* Finish a struct type. */
-static boolean
+static bfd_boolean
pr_end_struct_type (p)
PTR p;
{
/* Change the trailing indentation to have a close brace. */
s = info->stack->type + strlen (info->stack->type) - 2;
- assert (strcmp (s, " ") == 0);
+ assert (s[0] == ' ' && s[1] == ' ' && s[2] == '\0');
*s++ = '}';
*s = '\0';
- return true;
+ return TRUE;
}
/* Start a class type. */
-static boolean
-pr_start_class_type (p, tag, structp, size, vptr, ownvptr)
+static bfd_boolean
+pr_start_class_type (p, tag, id, structp, size, vptr, ownvptr)
PTR p;
const char *tag;
- boolean structp;
+ unsigned int id;
+ bfd_boolean structp;
unsigned int size;
- boolean vptr;
- boolean ownvptr;
+ bfd_boolean vptr;
+ bfd_boolean ownvptr;
{
struct pr_handle *info = (struct pr_handle *) p;
char *tv = NULL;
{
tv = pop_type (info);
if (tv == NULL)
- return false;
+ return FALSE;
}
if (! push_type (info, structp ? "class " : "union class "))
- return false;
+ return FALSE;
if (tag != NULL)
{
- if (! append_type (info, tag)
- || ! append_type (info, " "))
- return false;
+ if (! append_type (info, tag))
+ return FALSE;
+ }
+ else
+ {
+ char idbuf[20];
+
+ sprintf (idbuf, "%%anon%u", id);
+ if (! append_type (info, idbuf))
+ return FALSE;
}
- if (! append_type (info, "{"))
- return false;
- if (size != 0 || vptr || ownvptr)
+
+ if (! append_type (info, " {"))
+ return FALSE;
+ if (size != 0 || vptr || ownvptr || tag != NULL)
{
if (! append_type (info, " /*"))
- return false;
+ return FALSE;
if (size != 0)
{
sprintf (ab, "%u", size);
if (! append_type (info, " size ")
|| ! append_type (info, ab))
- return false;
+ return FALSE;
}
if (vptr)
{
if (! append_type (info, " vtable "))
- return false;
+ return FALSE;
if (ownvptr)
{
if (! append_type (info, "self "))
- return false;
+ return FALSE;
}
else
{
if (! append_type (info, tv)
|| ! append_type (info, " "))
- return false;
+ return FALSE;
}
}
+ if (tag != NULL)
+ {
+ char ab[30];
+
+ sprintf (ab, " id %u", id);
+ if (! append_type (info, ab))
+ return FALSE;
+ }
+
if (! append_type (info, " */"))
- return false;
+ return FALSE;
}
info->stack->visibility = DEBUG_VISIBILITY_PRIVATE;
/* Add a static member to a class. */
-static boolean
+static bfd_boolean
pr_class_static_member (p, name, physname, visibility)
PTR p;
const char *name;
enum debug_visibility visibility;
{
struct pr_handle *info = (struct pr_handle *) p;
-
- if (! pr_fix_visibility (info, visibility))
- return false;
+ char *t;
if (! substitute_type (info, name))
- return false;
+ return FALSE;
- return (prepend_type (info, "static ")
- && append_type (info, "; /* physname ")
- && append_type (info, physname)
- && append_type (info, " */\n")
- && indent_type (info)
- && append_type (info, pop_type (info)));
+ if (! prepend_type (info, "static ")
+ || ! append_type (info, "; /* ")
+ || ! append_type (info, physname)
+ || ! append_type (info, " */\n")
+ || ! indent_type (info))
+ return FALSE;
+
+ t = pop_type (info);
+ if (t == NULL)
+ return FALSE;
+
+ if (! pr_fix_visibility (info, visibility))
+ return FALSE;
+
+ return append_type (info, t);
}
/* Add a base class to a class. */
-static boolean
+static bfd_boolean
pr_class_baseclass (p, bitpos, virtual, visibility)
PTR p;
bfd_vma bitpos;
- boolean virtual;
+ bfd_boolean virtual;
enum debug_visibility visibility;
{
struct pr_handle *info = (struct pr_handle *) p;
assert (info->stack != NULL && info->stack->next != NULL);
if (! substitute_type (info, ""))
- return false;
+ return FALSE;
t = pop_type (info);
if (t == NULL)
- return false;
+ return FALSE;
if (strncmp (t, "class ", sizeof "class " - 1) == 0)
t += sizeof "class " - 1;
/* Push it back on to take advantage of the prepend_type and
append_type routines. */
if (! push_type (info, t))
- return false;
+ return FALSE;
if (virtual)
{
if (! prepend_type (info, "virtual "))
- return false;
+ return FALSE;
}
switch (visibility)
}
if (! prepend_type (info, prefix))
- return false;
+ return FALSE;
if (bitpos != 0)
{
- print_vma (bitpos, ab, true, false);
+ print_vma (bitpos, ab, TRUE, FALSE);
if (! append_type (info, " /* bitpos ")
|| ! append_type (info, ab)
|| ! append_type (info, " */"))
- return false;
+ return FALSE;
}
/* Now the top of the stack is something like "public A / * bitpos
if (*l == ':')
break;
if (! prepend_type (info, l == s ? " : " : ", "))
- return false;
+ return FALSE;
t = pop_type (info);
if (t == NULL)
- return false;
+ return FALSE;
n = (char *) xmalloc (strlen (info->stack->type) + strlen (t) + 1);
memcpy (n, info->stack->type, s - info->stack->type);
free (t);
- return true;
+ return TRUE;
}
/* Start adding a method to a class. */
-static boolean
+static bfd_boolean
pr_class_start_method (p, name)
PTR p;
const char *name;
{
struct pr_handle *info = (struct pr_handle *) p;
- if (! push_type (info, ""))
- return false;
+ assert (info->stack != NULL);
info->stack->method = name;
- return true;
+ return TRUE;
}
/* Add a variant to a method. */
-static boolean
-pr_class_method_variant (p, argtypes, visibility, constp, volatilep, voffset,
+static bfd_boolean
+pr_class_method_variant (p, physname, visibility, constp, volatilep, voffset,
context)
PTR p;
- const char *argtypes;
+ const char *physname;
enum debug_visibility visibility;
- boolean constp;
- boolean volatilep;
+ bfd_boolean constp;
+ bfd_boolean volatilep;
bfd_vma voffset;
- boolean context;
+ bfd_boolean context;
{
struct pr_handle *info = (struct pr_handle *) p;
char *method_type;
/* Put the const and volatile qualifiers on the type. */
if (volatilep)
{
- if (! prepend_type (info, "volatile "))
- return false;
+ if (! append_type (info, " volatile"))
+ return FALSE;
}
if (constp)
{
- if (! prepend_type (info, "const "))
- return false;
+ if (! append_type (info, " const"))
+ return FALSE;
}
/* Stick the name of the method into its type. */
(context
? info->stack->next->next->method
: info->stack->next->method)))
- return false;
+ return FALSE;
/* Get the type. */
method_type = pop_type (info);
if (method_type == NULL)
- return false;
+ return FALSE;
/* Pull off the context type if there is one. */
if (! context)
{
context_type = pop_type (info);
if (context_type == NULL)
- return false;
+ return FALSE;
}
- /* Now the top of the stack is the holder for the method, and the
- second element on the stack is the class. */
+ /* Now the top of the stack is the class. */
if (! pr_fix_visibility (info, visibility))
- return false;
+ return FALSE;
if (! append_type (info, method_type)
|| ! append_type (info, " /* ")
- || ! append_type (info, argtypes))
- return false;
+ || ! append_type (info, physname)
+ || ! append_type (info, " "))
+ return FALSE;
if (context || voffset != 0)
{
char ab[20];
if (! append_type (info, "context ")
|| ! append_type (info, context_type)
|| ! append_type (info, " "))
- return false;
+ return FALSE;
}
- print_vma (voffset, ab, true, false);
+ print_vma (voffset, ab, TRUE, FALSE);
if (! append_type (info, "voffset ")
|| ! append_type (info, ab))
- return false;
+ return FALSE;
}
return (append_type (info, " */;\n")
/* Add a static variant to a method. */
-static boolean
-pr_class_static_method_variant (p, argtypes, visibility, constp, volatilep)
+static bfd_boolean
+pr_class_static_method_variant (p, physname, visibility, constp, volatilep)
PTR p;
- const char *argtypes;
+ const char *physname;
enum debug_visibility visibility;
- boolean constp;
- boolean volatilep;
+ bfd_boolean constp;
+ bfd_boolean volatilep;
{
struct pr_handle *info = (struct pr_handle *) p;
char *method_type;
/* Put the const and volatile qualifiers on the type. */
if (volatilep)
{
- if (! prepend_type (info, "volatile "))
- return false;
+ if (! append_type (info, " volatile"))
+ return FALSE;
}
if (constp)
{
- if (! prepend_type (info, "const "))
- return false;
+ if (! append_type (info, " const"))
+ return FALSE;
}
/* Mark it as static. */
if (! prepend_type (info, "static "))
- return false;
+ return FALSE;
/* Stick the name of the method into its type. */
if (! substitute_type (info, info->stack->next->method))
- return false;
+ return FALSE;
/* Get the type. */
method_type = pop_type (info);
if (method_type == NULL)
- return false;
+ return FALSE;
- /* Now the top of the stack is the holder for the method, and the
- second element on the stack is the class. */
+ /* Now the top of the stack is the class. */
if (! pr_fix_visibility (info, visibility))
- return false;
+ return FALSE;
return (append_type (info, method_type)
&& append_type (info, " /* ")
- && append_type (info, argtypes)
+ && append_type (info, physname)
&& append_type (info, " */;\n")
&& indent_type (info));
}
/* Finish up a method. */
-static boolean
+static bfd_boolean
pr_class_end_method (p)
PTR p;
{
struct pr_handle *info = (struct pr_handle *) p;
- /* The method variants have been appended to the string on top of
- the stack with the correct indentation. We just need the append
- the string on top of the stack to the class string that is second
- on the stack. */
- return append_type (info, pop_type (info));
+ info->stack->method = NULL;
+ return TRUE;
}
/* Finish up a class. */
-static boolean
+static bfd_boolean
pr_end_class_type (p)
PTR p;
{
/* Push a type on the stack using a typedef name. */
-static boolean
+static bfd_boolean
pr_typedef_type (p, name)
PTR p;
const char *name;
/* Push a type on the stack using a tag name. */
-static boolean
-pr_tag_type (p, name, kind)
+static bfd_boolean
+pr_tag_type (p, name, id, kind)
PTR p;
const char *name;
+ unsigned int id;
enum debug_type_kind kind;
{
struct pr_handle *info = (struct pr_handle *) p;
- const char *t;
+ const char *t, *tag;
+ char idbuf[20];
switch (kind)
{
break;
default:
abort ();
- return false;
+ return FALSE;
+ }
+
+ if (! push_type (info, t))
+ return FALSE;
+ if (name != NULL)
+ tag = name;
+ else
+ {
+ sprintf (idbuf, "%%anon%u", id);
+ tag = idbuf;
+ }
+
+ if (! append_type (info, tag))
+ return FALSE;
+ if (name != NULL && kind != DEBUG_KIND_ENUM)
+ {
+ sprintf (idbuf, " /* id %u */", id);
+ if (! append_type (info, idbuf))
+ return FALSE;
}
- return (push_type (info, t)
- && append_type (info, name));
+ return TRUE;
}
/* Output a typedef. */
-static boolean
+static bfd_boolean
pr_typdef (p, name)
PTR p;
const char *name;
char *s;
if (! substitute_type (info, name))
- return false;
+ return FALSE;
s = pop_type (info);
if (s == NULL)
- return false;
+ return FALSE;
indent (info);
fprintf (info->f, "typedef %s;\n", s);
free (s);
- return true;
+ return TRUE;
}
/* Output a tag. The tag should already be in the string on the
stack, so all we have to do here is print it out. */
-/*ARGSUSED*/
-static boolean
+static bfd_boolean
pr_tag (p, name)
PTR p;
- const char *name;
+ const char *name ATTRIBUTE_UNUSED;
{
struct pr_handle *info = (struct pr_handle *) p;
char *t;
t = pop_type (info);
if (t == NULL)
- return false;
+ return FALSE;
indent (info);
fprintf (info->f, "%s;\n", t);
free (t);
- return true;
+ return TRUE;
}
/* Output an integer constant. */
-static boolean
+static bfd_boolean
pr_int_constant (p, name, val)
PTR p;
const char *name;
bfd_vma val;
{
- struct pr_handle *info = (struct pr_handle *) info;
+ struct pr_handle *info = (struct pr_handle *) p;
char ab[20];
indent (info);
- print_vma (val, ab, false, false);
+ print_vma (val, ab, FALSE, FALSE);
fprintf (info->f, "const int %s = %s;\n", name, ab);
- return true;
+ return TRUE;
}
/* Output a floating point constant. */
-static boolean
+static bfd_boolean
pr_float_constant (p, name, val)
PTR p;
const char *name;
double val;
{
- struct pr_handle *info = (struct pr_handle *) info;
+ struct pr_handle *info = (struct pr_handle *) p;
indent (info);
fprintf (info->f, "const double %s = %g;\n", name, val);
- return true;
+ return TRUE;
}
/* Output a typed constant. */
-static boolean
+static bfd_boolean
pr_typed_constant (p, name, val)
PTR p;
const char *name;
t = pop_type (info);
if (t == NULL)
- return false;
+ return FALSE;
indent (info);
- print_vma (val, ab, false, false);
+ print_vma (val, ab, FALSE, FALSE);
fprintf (info->f, "const %s %s = %s;\n", t, name, ab);
free (t);
- return true;
+ return TRUE;
}
/* Output a variable. */
-static boolean
+static bfd_boolean
pr_variable (p, name, kind, val)
PTR p;
const char *name;
char ab[20];
if (! substitute_type (info, name))
- return false;
+ return FALSE;
t = pop_type (info);
if (t == NULL)
- return false;
+ return FALSE;
indent (info);
switch (kind)
default:
break;
}
- print_vma (val, ab, true, true);
+ print_vma (val, ab, TRUE, TRUE);
fprintf (info->f, "%s /* %s */;\n", t, ab);
free (t);
- return true;
+ return TRUE;
}
/* Start outputting a function. */
-static boolean
+static bfd_boolean
pr_start_function (p, name, global)
PTR p;
const char *name;
- boolean global;
+ bfd_boolean global;
{
struct pr_handle *info = (struct pr_handle *) p;
char *t;
if (! substitute_type (info, name))
- return false;
+ return FALSE;
t = pop_type (info);
if (t == NULL)
- return false;
+ return FALSE;
indent (info);
if (! global)
info->parameter = 1;
- return true;
+ return TRUE;
}
/* Output a function parameter. */
-static boolean
+static bfd_boolean
pr_function_parameter (p, name, kind, val)
PTR p;
const char *name;
|| kind == DEBUG_PARM_REF_REG)
{
if (! pr_reference_type (p))
- return false;
+ return FALSE;
}
if (! substitute_type (info, name))
- return false;
+ return FALSE;
t = pop_type (info);
if (t == NULL)
- return false;
+ return FALSE;
if (info->parameter != 1)
fprintf (info->f, ", ");
if (kind == DEBUG_PARM_REG || kind == DEBUG_PARM_REF_REG)
fprintf (info->f, "register ");
- print_vma (val, ab, true, true);
+ print_vma (val, ab, TRUE, TRUE);
fprintf (info->f, "%s /* %s */", t, ab);
free (t);
++info->parameter;
- return true;
+ return TRUE;
}
/* Start writing out a block. */
-static boolean
+static bfd_boolean
pr_start_block (p, addr)
PTR p;
bfd_vma addr;
}
indent (info);
- print_vma (addr, ab, true, true);
+ print_vma (addr, ab, TRUE, TRUE);
fprintf (info->f, "{ /* %s */\n", ab);
info->indent += 2;
- return true;
+ return TRUE;
}
/* Write out line number information. */
-static boolean
+static bfd_boolean
pr_lineno (p, filename, lineno, addr)
PTR p;
const char *filename;
char ab[20];
indent (info);
- print_vma (addr, ab, true, true);
+ print_vma (addr, ab, TRUE, TRUE);
fprintf (info->f, "/* file %s line %lu addr %s */\n", filename, lineno, ab);
- return true;
+ return TRUE;
}
/* Finish writing out a block. */
-static boolean
+static bfd_boolean
pr_end_block (p, addr)
PTR p;
bfd_vma addr;
info->indent -= 2;
indent (info);
- print_vma (addr, ab, true, true);
+ print_vma (addr, ab, TRUE, TRUE);
fprintf (info->f, "} /* %s */\n", ab);
- return true;
+ return TRUE;
}
/* Finish writing out a function. */
-/*ARGSUSED*/
-static boolean
+static bfd_boolean
pr_end_function (p)
- PTR p;
+ PTR p ATTRIBUTE_UNUSED;
{
- return true;
+ return TRUE;
}
projects / binutils-gdb.git / blobdiff