|
@@ -55,6 +55,17 @@ struct isa_ext_data {
|
|
|
#define ISA_EXT_DATA_ENTRY(_name, _min_ver, _prop) \
|
|
|
{#_name, _min_ver, offsetof(struct RISCVCPUConfig, _prop)}
|
|
|
|
|
|
+/*
|
|
|
+ * From vector_helper.c
|
|
|
+ * Note that vector data is stored in host-endian 64-bit chunks,
|
|
|
+ * so addressing bytes needs a host-endian fixup.
|
|
|
+ */
|
|
|
+#if HOST_BIG_ENDIAN
|
|
|
+#define BYTE(x) ((x) ^ 7)
|
|
|
+#else
|
|
|
+#define BYTE(x) (x)
|
|
|
+#endif
|
|
|
+
|
|
|
/*
|
|
|
* Here are the ordering rules of extension naming defined by RISC-V
|
|
|
* specification :
|
|
@@ -183,6 +194,14 @@ const char * const riscv_fpr_regnames[] = {
|
|
|
"f30/ft10", "f31/ft11"
|
|
|
};
|
|
|
|
|
|
+const char * const riscv_rvv_regnames[] = {
|
|
|
+ "v0", "v1", "v2", "v3", "v4", "v5", "v6",
|
|
|
+ "v7", "v8", "v9", "v10", "v11", "v12", "v13",
|
|
|
+ "v14", "v15", "v16", "v17", "v18", "v19", "v20",
|
|
|
+ "v21", "v22", "v23", "v24", "v25", "v26", "v27",
|
|
|
+ "v28", "v29", "v30", "v31"
|
|
|
+};
|
|
|
+
|
|
|
static const char * const riscv_excp_names[] = {
|
|
|
"misaligned_fetch",
|
|
|
"fault_fetch",
|
|
@@ -611,7 +630,8 @@ static void riscv_cpu_dump_state(CPUState *cs, FILE *f, int flags)
|
|
|
{
|
|
|
RISCVCPU *cpu = RISCV_CPU(cs);
|
|
|
CPURISCVState *env = &cpu->env;
|
|
|
- int i;
|
|
|
+ int i, j;
|
|
|
+ uint8_t *p;
|
|
|
|
|
|
#if !defined(CONFIG_USER_ONLY)
|
|
|
if (riscv_has_ext(env, RVH)) {
|
|
@@ -695,6 +715,41 @@ static void riscv_cpu_dump_state(CPUState *cs, FILE *f, int flags)
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ if (riscv_has_ext(env, RVV) && (flags & CPU_DUMP_VPU)) {
|
|
|
+ static const int dump_rvv_csrs[] = {
|
|
|
+ CSR_VSTART,
|
|
|
+ CSR_VXSAT,
|
|
|
+ CSR_VXRM,
|
|
|
+ CSR_VCSR,
|
|
|
+ CSR_VL,
|
|
|
+ CSR_VTYPE,
|
|
|
+ CSR_VLENB,
|
|
|
+ };
|
|
|
+ for (int i = 0; i < ARRAY_SIZE(dump_rvv_csrs); ++i) {
|
|
|
+ int csrno = dump_rvv_csrs[i];
|
|
|
+ target_ulong val = 0;
|
|
|
+ RISCVException res = riscv_csrrw_debug(env, csrno, &val, 0, 0);
|
|
|
+
|
|
|
+ /*
|
|
|
+ * Rely on the smode, hmode, etc, predicates within csr.c
|
|
|
+ * to do the filtering of the registers that are present.
|
|
|
+ */
|
|
|
+ if (res == RISCV_EXCP_NONE) {
|
|
|
+ qemu_fprintf(f, " %-8s " TARGET_FMT_lx "\n",
|
|
|
+ csr_ops[csrno].name, val);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ uint16_t vlenb = cpu->cfg.vlen >> 3;
|
|
|
+
|
|
|
+ for (i = 0; i < 32; i++) {
|
|
|
+ qemu_fprintf(f, " %-8s ", riscv_rvv_regnames[i]);
|
|
|
+ p = (uint8_t *)env->vreg;
|
|
|
+ for (j = vlenb - 1 ; j >= 0; j--) {
|
|
|
+ qemu_fprintf(f, "%02x", *(p + i * vlenb + BYTE(j)));
|
|
|
+ }
|
|
|
+ qemu_fprintf(f, "\n");
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
static void riscv_cpu_set_pc(CPUState *cs, vaddr value)
|