}
else
{
- if (asprintf (&bit, " %lx: %s (size %lx)", id, buf[0] == '\0' ?
- "(nameless)" : buf, ctf_type_size (fp, id)) < 0)
+ if (asprintf (&bit, " %lx: %s (size 0x%lx)", id, buf[0] == '\0' ?
+ "(nameless)" : buf,
+ (unsigned long) ctf_type_size (fp, id)) < 0)
goto oom;
}
free (buf);
return NULL;
}
+/* Dump one string field from the file header into the cds_items. */
+static int
+ctf_dump_header_strfield (ctf_file_t *fp, ctf_dump_state_t *state,
+ const char *name, uint32_t value)
+{
+ char *str;
+ if (value)
+ {
+ if (asprintf (&str, "%s: %s\n", name, ctf_strptr (fp, value)) < 0)
+ goto err;
+ ctf_dump_append (state, str);
+ }
+ return 0;
+
+ err:
+ return (ctf_set_errno (fp, -ENOMEM));
+}
+
+/* Dump one section-offset field from the file header into the cds_items. */
+static int
+ctf_dump_header_sectfield (ctf_file_t *fp, ctf_dump_state_t *state,
+ const char *sect, uint32_t off, uint32_t nextoff)
+{
+ char *str;
+ if (nextoff - off)
+ {
+ if (asprintf (&str, "%s:\t0x%lx -- 0x%lx (0x%lx bytes)\n", sect,
+ (unsigned long) off, (unsigned long) (nextoff - 1),
+ (unsigned long) (nextoff - off)) < 0)
+ goto err;
+ ctf_dump_append (state, str);
+ }
+ return 0;
+
+ err:
+ return (ctf_set_errno (fp, -ENOMEM));
+}
+
+/* Dump the file header into the cds_items. */
+static int
+ctf_dump_header (ctf_file_t *fp, ctf_dump_state_t *state)
+{
+ char *str;
+ const ctf_header_t *hp = fp->ctf_header;
+ const char *vertab[] =
+ {
+ NULL, "CTF_VERSION_1",
+ "CTF_VERSION_1_UPGRADED_3 (latest format, version 1 type "
+ "boundaries)",
+ "CTF_VERSION_2",
+ "CTF_VERSION_3", NULL
+ };
+ const char *verstr = NULL;
+
+ if (asprintf (&str, "Magic number: %x\n", hp->cth_magic) < 0)
+ goto err;
+ ctf_dump_append (state, str);
+
+ if (hp->cth_version <= CTF_VERSION)
+ verstr = vertab[hp->cth_version];
+
+ if (verstr == NULL)
+ verstr = "(not a valid version)";
+
+ if (asprintf (&str, "Version: %i (%s)\n", hp->cth_version,
+ verstr) < 0)
+ goto err;
+ ctf_dump_append (state, str);
+
+ /* Everything else is only printed if present. */
+
+ /* The flags are unusual in that they represent the ctf_file_t *in memory*:
+ flags representing compression, etc, are turned off as the file is
+ decompressed. So we store a copy of the flags before they are changed, for
+ the dumper. */
+
+ if (fp->ctf_openflags > 0)
+ {
+ if (fp->ctf_openflags)
+ if (asprintf (&str, "Flags: 0x%x (%s)", fp->ctf_openflags,
+ fp->ctf_openflags & CTF_F_COMPRESS ? "CTF_F_COMPRESS"
+ : "") < 0)
+ goto err;
+ ctf_dump_append (state, str);
+ }
+
+ if (ctf_dump_header_strfield (fp, state, "Parent label",
+ hp->cth_parlabel) < 0)
+ goto err;
+
+ if (ctf_dump_header_strfield (fp, state, "Parent name", hp->cth_parname) < 0)
+ goto err;
+
+ if (ctf_dump_header_strfield (fp, state, "Compilation unit name",
+ hp->cth_cuname) < 0)
+ goto err;
+
+ if (ctf_dump_header_sectfield (fp, state, "Label section", hp->cth_lbloff,
+ hp->cth_objtoff) < 0)
+ goto err;
+
+ if (ctf_dump_header_sectfield (fp, state, "Data object section",
+ hp->cth_objtoff, hp->cth_funcoff) < 0)
+ goto err;
+
+ if (ctf_dump_header_sectfield (fp, state, "Function info section",
+ hp->cth_funcoff, hp->cth_varoff) < 0)
+ goto err;
+
+ if (ctf_dump_header_sectfield (fp, state, "Variable section",
+ hp->cth_varoff, hp->cth_typeoff) < 0)
+ goto err;
+
+ if (ctf_dump_header_sectfield (fp, state, "Type section",
+ hp->cth_typeoff, hp->cth_stroff) < 0)
+ goto err;
+
+ if (ctf_dump_header_sectfield (fp, state, "String section", hp->cth_stroff,
+ hp->cth_stroff + hp->cth_strlen + 1) < 0)
+ goto err;
+
+ return 0;
+ err:
+ return (ctf_set_errno (fp, -ENOMEM));
+}
+
/* Dump a single label into the cds_items. */
static int
sym_name = ctf_lookup_symbol_name (fp, i);
if (sym_name[0] == '\0')
{
- if (asprintf (&str, "%lx -> ", i) < 0)
+ if (asprintf (&str, "%lx -> ", (unsigned long) i) < 0)
return (ctf_set_errno (fp, ENOMEM));
}
else
{
- if (asprintf (&str, "%s (%lx) -> ", sym_name, i) < 0)
+ if (asprintf (&str, "%s (%lx) -> ", sym_name, (unsigned long) i) < 0)
return (ctf_set_errno (fp, ENOMEM));
}
sym_name = ctf_lookup_symbol_name (fp, i);
if (sym_name[0] == '\0')
{
- if (asprintf (&bit, "%lx ", i) < 0)
+ if (asprintf (&bit, "0x%lx ", (unsigned long) i) < 0)
goto oom;
}
else
{
- if (asprintf (&bit, "%s (%lx) ", sym_name, i) < 0)
+ if (asprintf (&bit, "%s (0x%lx) ", sym_name, (unsigned long) i) < 0)
goto oom;
}
str = ctf_str_append (str, bit);
if (asprintf (&bit, " [0x%lx] (ID 0x%lx) (kind %i) %s %s (aligned at 0x%lx",
offset, id, ctf_type_kind (state->cdm_fp, id), typestr, name,
- ctf_type_align (state->cdm_fp, id)) < 0)
+ (unsigned long) ctf_type_align (state->cdm_fp, id)) < 0)
goto oom;
*state->cdm_str = ctf_str_append (*state->cdm_str, bit);
free (typestr);
fp->ctf_str[CTF_STRTAB_0].cts_len;)
{
char *str;
- if (asprintf (&str, "%lx: %s", s - fp->ctf_str[CTF_STRTAB_0].cts_strs,
+ if (asprintf (&str, "%lx: %s",
+ (unsigned long) (s - fp->ctf_str[CTF_STRTAB_0].cts_strs),
s) < 0)
return (ctf_set_errno (fp, ENOMEM));
ctf_dump_append (state, str);
switch (sect)
{
case CTF_SECT_HEADER:
- /* Nothing doable (yet): entire header is discarded after read-phase. */
- str = strdup ("");
+ ctf_dump_header (fp, state);
break;
case CTF_SECT_LABEL:
if (ctf_label_iter (fp, ctf_dump_label, state) < 0)
projects / deliverable / binutils-gdb.git / blobdiff