Re: [PATCH v4 2/5] target/riscv: Remove misa_mxl validation

[LIU Zhiwei]

On 2023/10/18 2:53, Akihiko Odaki wrote:

It is initialized with a simple assignment and there is little room for
error. In fact, the validation is even more complex.

Signed-off-by: Akihiko Odaki <akihiko.od...@daynix.com>
---
  target/riscv/tcg/tcg-cpu.c | 13 ++-----------
  1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c
index a28918ab30..7f45e42000 100644
--- a/target/riscv/tcg/tcg-cpu.c
+++ b/target/riscv/tcg/tcg-cpu.c
@@ -148,7 +148,7 @@ static void riscv_cpu_validate_misa_priv(CPURISCVState 
*env, Error **errp)
      }
  }

-static void riscv_cpu_validate_misa_mxl(RISCVCPU *cpu, Error **errp)

+static void riscv_cpu_validate_misa_mxl(RISCVCPU *cpu)
  {
      RISCVCPUClass *mcc = RISCV_CPU_GET_CLASS(cpu);
      CPUClass *cc = CPU_CLASS(mcc);
@@ -168,11 +168,6 @@ static void riscv_cpu_validate_misa_mxl(RISCVCPU *cpu, 
Error **errp)
      default:
          g_assert_not_reached();
      }
-
-    if (env->misa_mxl_max != env->misa_mxl) {
-        error_setg(errp, "misa_mxl_max must be equal to misa_mxl");
-        return;
-    }
  }

static void riscv_cpu_validate_priv_spec(RISCVCPU *cpu, Error **errp)

@@ -573,11 +568,7 @@ static bool tcg_cpu_realize(CPUState *cs, Error **errp)
          return false;
      }

- riscv_cpu_validate_misa_mxl(cpu, &local_err);

-    if (local_err != NULL) {
-        error_propagate(errp, local_err);
-        return false;
-    }
+    riscv_cpu_validate_misa_mxl(cpu);

Acked-by: LIU Zhiwei <zhiwei_...@linux.alibaba.com>

Zhiwei

riscv_cpu_validate_priv_spec(cpu, &local_err);

      if (local_err != NULL) {