diff options
| author | Eric Anholt <[email protected]> | 2018-06-25 15:37:51 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2018-07-27 17:56:36 -0700 |
| commit | 95bafeeabfeb1d8348191fa66ed2e5c3b730c54b (patch) | |
| tree | a8e9cf8e2dd4c0b4b4cd9ef74831c641328fc603 /src/broadcom/cle/v3d_decoder.c | |
| parent | 3c02838d2956692101ae205f1aff362fa3a93c76 (diff) | |
v3d: Print addresses in CLIFs as references to buffers.
With CLIFs, the parser will choose an address for the buffer being
created, so we need to use effectively relocations to buffers instead of
the addresses that the driver uses. This is also a whole lot more
intelligible for console output than raw addresses!
Diffstat (limited to 'src/broadcom/cle/v3d_decoder.c')
| -rw-r--r-- | src/broadcom/cle/v3d_decoder.c | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/src/broadcom/cle/v3d_decoder.c b/src/broadcom/cle/v3d_decoder.c index f97aa6604cb..725561cef85 100644 --- a/src/broadcom/cle/v3d_decoder.c +++ b/src/broadcom/cle/v3d_decoder.c @@ -827,7 +827,7 @@ iter_advance_field(struct v3d_field_iterator *iter) } bool -v3d_field_iterator_next(struct v3d_field_iterator *iter) +v3d_field_iterator_next(struct clif_dump *clif, struct v3d_field_iterator *iter) { if (!iter_advance_field(iter)) return false; @@ -872,7 +872,26 @@ v3d_field_iterator_next(struct v3d_field_iterator *iter) snprintf(iter->value, sizeof(iter->value), "%f", __gen_unpack_float(iter->p, s, e)); break; - case V3D_TYPE_ADDRESS: + + case V3D_TYPE_ADDRESS: { + uint32_t addr = + __gen_unpack_uint(iter->p, s, e) << (31 - (e - s)); + struct clif_bo *bo = clif_lookup_bo(clif, addr); + if (bo) { + snprintf(iter->value, sizeof(iter->value), + "[%s+0x%08x] /* 0x%08x */", + bo->name, addr - bo->offset, addr); + } else if (addr) { + snprintf(iter->value, sizeof(iter->value), + "/* XXX: BO unknown */ 0x%08x", addr); + } else { + snprintf(iter->value, sizeof(iter->value), + "[null]"); + } + + break; + } + case V3D_TYPE_OFFSET: snprintf(iter->value, sizeof(iter->value), "0x%08"PRIx64, __gen_unpack_uint(iter->p, s, e) << (31 - (e - s))); @@ -926,7 +945,7 @@ v3d_print_group(struct clif_dump *clif, struct v3d_group *group, struct v3d_field_iterator iter; v3d_field_iterator_init(&iter, group, p); - while (v3d_field_iterator_next(&iter)) { + while (v3d_field_iterator_next(clif, &iter)) { fprintf(clif->out, " %s: %s\n", iter.name, iter.value); if (iter.struct_desc) { uint64_t struct_offset = offset + iter.offset; |