mirror of
https://github.com/qemu/qemu.git
synced 2026-07-08 17:46:10 +00:00
target/riscv: Use the tb->cs_base as the extend tb flags
We have more than 32-bits worth of state per TB, so use the tb->cs_base, which is otherwise unused for RISC-V, as the extend flag. Reviewed-by: Daniel Henrique Barboza <daniel.barboza@oss.qualcomm.com> Reviewed-by: Chao Liu <chao.liu.zevorn@gmail.com> Signed-off-by: Max Chou <max.chou@sifive.com> Message-ID: <20260402125234.1371897-6-max.chou@sifive.com> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
committed by
Alistair Francis
parent
8a9da8305e
commit
1c88ab9e77
@@ -65,6 +65,7 @@ struct TranslationBlock {
|
||||
* arm: an extension of tb->flags,
|
||||
* s390x: instruction data for EXECUTE,
|
||||
* sparc: the next pc of the instruction queue (for delay slots).
|
||||
* riscv: an extension of tb->flags,
|
||||
*/
|
||||
uint64_t cs_base;
|
||||
|
||||
|
||||
@@ -703,6 +703,9 @@ FIELD(TB_FLAGS, BCFI_ENABLED, 28, 1)
|
||||
FIELD(TB_FLAGS, PM_PMM, 29, 2)
|
||||
FIELD(TB_FLAGS, PM_SIGNEXTEND, 31, 1)
|
||||
|
||||
FIELD(EXT_TB_FLAGS, MISA_EXT, 0, 32)
|
||||
FIELD(EXT_TB_FLAGS, ALTFMT, 32, 1)
|
||||
|
||||
#ifdef TARGET_RISCV32
|
||||
#define riscv_cpu_mxl(env) ((void)(env), MXL_RV32)
|
||||
#else
|
||||
|
||||
@@ -104,6 +104,7 @@ static TCGTBCPUState riscv_get_tb_cpu_state(CPUState *cs)
|
||||
RISCVCPU *cpu = env_archcpu(env);
|
||||
RISCVExtStatus fs, vs;
|
||||
uint32_t flags = 0;
|
||||
uint64_t ext_flags = 0;
|
||||
bool pm_signext = riscv_cpu_virt_mem_enabled(env);
|
||||
|
||||
if (cpu->cfg.ext_zve32x) {
|
||||
@@ -118,6 +119,7 @@ static TCGTBCPUState riscv_get_tb_cpu_state(CPUState *cs)
|
||||
|
||||
/* lmul encoded as in DisasContext::lmul */
|
||||
int8_t lmul = sextract32(FIELD_EX64(env->vtype, VTYPE, VLMUL), 0, 3);
|
||||
uint8_t altfmt = FIELD_EX64(env->vtype, VTYPE, ALTFMT);
|
||||
uint32_t vsew = FIELD_EX64(env->vtype, VTYPE, VSEW);
|
||||
uint32_t vlmax = vext_get_vlmax(cpu->cfg.vlenb, vsew, lmul);
|
||||
uint32_t maxsz = vlmax << vsew;
|
||||
@@ -133,6 +135,7 @@ static TCGTBCPUState riscv_get_tb_cpu_state(CPUState *cs)
|
||||
flags = FIELD_DP32(flags, TB_FLAGS, VMA,
|
||||
FIELD_EX64(env->vtype, VTYPE, VMA));
|
||||
flags = FIELD_DP32(flags, TB_FLAGS, VSTART_EQ_ZERO, env->vstart == 0);
|
||||
ext_flags = FIELD_DP64(ext_flags, EXT_TB_FLAGS, ALTFMT, altfmt);
|
||||
} else {
|
||||
flags = FIELD_DP32(flags, TB_FLAGS, VILL, 1);
|
||||
}
|
||||
@@ -189,10 +192,12 @@ static TCGTBCPUState riscv_get_tb_cpu_state(CPUState *cs)
|
||||
flags = FIELD_DP32(flags, TB_FLAGS, PM_PMM, riscv_pm_get_pmm(env));
|
||||
flags = FIELD_DP32(flags, TB_FLAGS, PM_SIGNEXTEND, pm_signext);
|
||||
|
||||
ext_flags = FIELD_DP64(ext_flags, EXT_TB_FLAGS, MISA_EXT, env->misa_ext);
|
||||
|
||||
return (TCGTBCPUState){
|
||||
.pc = env->xl == MXL_RV32 ? env->pc & UINT32_MAX : env->pc,
|
||||
.flags = flags,
|
||||
.cs_base = env->misa_ext,
|
||||
.cs_base = ext_flags,
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user