aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2018-06-22 15:12:01 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-07-02 13:08:21 +0100
commitd1e859d75bc9dacc831346fd1b2da5eb3e686477 (patch)
tree62a35a2ce388e19bec72b394342313f5bdf200c4
parent576fc6e1dfbc46c191168bba5fa32b6310c548ea (diff)
risu_reginfo_aarch64: left justify regnums and drop masks
Left justification is more pleasing to the eye than the default. We also drop the masking which isn't needed as we are casting to a smaller size anyway. This was split out of Richard's re-factoring work for SVE. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20180622141205.16306-19-alex.bennee@linaro.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--risu_reginfo_aarch64.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/risu_reginfo_aarch64.c b/risu_reginfo_aarch64.c
index 5da9e39..3ccaf0e 100644
--- a/risu_reginfo_aarch64.c
+++ b/risu_reginfo_aarch64.c
@@ -90,7 +90,7 @@ int reginfo_dump(struct reginfo *ri, FILE * f)
fprintf(f, " faulting insn %08x\n", ri->faulting_insn);
for (i = 0; i < 31; i++) {
- fprintf(f, " X%2d : %016" PRIx64 "\n", i, ri->regs[i]);
+ fprintf(f, " X%-2d : %016" PRIx64 "\n", i, ri->regs[i]);
}
fprintf(f, " sp : %016" PRIx64 "\n", ri->sp);
@@ -100,9 +100,9 @@ int reginfo_dump(struct reginfo *ri, FILE * f)
fprintf(f, " fpcr : %08x\n", ri->fpcr);
for (i = 0; i < 32; i++) {
- fprintf(f, " V%2d : %016" PRIx64 "%016" PRIx64 "\n", i,
+ fprintf(f, " V%-2d : %016" PRIx64 "%016" PRIx64 "\n", i,
(uint64_t) (ri->simd.vregs[i] >> 64),
- (uint64_t) (ri->simd.vregs[i] & 0xffffffffffffffff));
+ (uint64_t) (ri->simd.vregs[i]));
}
return !ferror(f);
@@ -119,7 +119,7 @@ int reginfo_dump_mismatch(struct reginfo *m, struct reginfo *a, FILE * f)
}
for (i = 0; i < 31; i++) {
if (m->regs[i] != a->regs[i]) {
- fprintf(f, " X%2d : %016" PRIx64 " vs %016" PRIx64 "\n",
+ fprintf(f, " X%-2d : %016" PRIx64 " vs %016" PRIx64 "\n",
i, m->regs[i], a->regs[i]);
}
}
@@ -148,13 +148,13 @@ int reginfo_dump_mismatch(struct reginfo *m, struct reginfo *a, FILE * f)
for (i = 0; i < 32; i++) {
if (m->simd.vregs[i] != a->simd.vregs[i]) {
- fprintf(f, " V%2d : "
+ fprintf(f, " V%-2d : "
"%016" PRIx64 "%016" PRIx64 " vs "
"%016" PRIx64 "%016" PRIx64 "\n", i,
(uint64_t) (m->simd.vregs[i] >> 64),
- (uint64_t) (m->simd.vregs[i] & 0xffffffffffffffff),
+ (uint64_t) m->simd.vregs[i],
(uint64_t) (a->simd.vregs[i] >> 64),
- (uint64_t) (a->simd.vregs[i] & 0xffffffffffffffff));
+ (uint64_t) a->simd.vregs[i]);
}
}