Based-on: https://patchew.org/QEMU/[email protected]/
v5 cover Based-on: https://patchew.org/QEMU/[email protected]/
(all series reviewed, for Song Gao to pick whichever v4/v5 is preferred)
Hi,
This series adds some checks before translating instructions
This includes:
CPUCFG[1].IOCSR
CPUCFG[2].FP
CPUCFG[2].FP_SP
CPUCFG[2].FP_DP
CPUCFG[2].LSPW
CPUCFG[2].LAM
CPUCFG[2].LSX
V5:
- Split 2 patches, extracting helpers
- R-b
V4:
- Rebase;
- Split patch 'Add LoongArch32 cpu la132' in two patch; (PMD)
- Remove unrelated cpucfgX;(PMD)
- R-b.
V3:
- Rebase;
- The la32 instructions following Table 2 at [2].
V2:
- Add a check parameter to the TRANS macro.
- remove TRANS_64.
- Add avail_ALL/64/FP/FP_SP/FP_DP/LSPW/LAM/LSX/IOCSR to check instructions.
[1]: https://patchew.org/QEMU/[email protected]/
[2]: https://loongson.github.io/LoongArch-Documentation/LoongArch-Vol1-EN.html#overview-of-basic-integer-instructions
Jiajie Chen (11):
target/loongarch: Support LoongArch32 TLB entry target/loongarch: Support LoongArch32 DMW target/loongarch: Support LoongArch32 VPPN target/loongarch: Add LA64 & VA32 to DisasContext target/loongarch: Extract make_address_x() helper target/loongarch: Extract make_address_i() helper target/loongarch: Extract make_address_pc() helper target/loongarch: Extract set_pc() helper target/loongarch: Truncate high 32 bits of address in VA32 mode target/loongarch: Sign extend results in VA32 mode target/loongarch: Add LoongArch32 cpu la132
Song Gao (8):
target/loongarch: Add a check parameter to the TRANS macro target/loongarch: Add avail_64 to check la64-only instructions hw/loongarch: Remove restriction of la464 cores in the virt machine target/loongarch: Add avail_FP/FP_SP/FP_DP to check fpu instructions target/loongarch: Add avail_LSPW to check LSPW instructions target/loongarch: Add avail_LAM to check atomic instructions target/loongarch: Add avail_LSX to check LSX instructions target/loongarch: Add avail_IOCSR to check iocsr instructions
target/loongarch/cpu-csr.h | 22 +- target/loongarch/cpu.h | 22 + target/loongarch/translate.h | 19 +- hw/loongarch/virt.c | 5 - target/loongarch/cpu.c | 46 +- target/loongarch/gdbstub.c | 2 +- target/loongarch/op_helper.c | 4 +- target/loongarch/tlb_helper.c | 66 +- target/loongarch/translate.c | 46 + target/loongarch/insn_trans/trans_arith.c.inc | 98 +- .../loongarch/insn_trans/trans_atomic.c.inc | 85 +- target/loongarch/insn_trans/trans_bit.c.inc | 56 +- .../loongarch/insn_trans/trans_branch.c.inc | 27 +- target/loongarch/insn_trans/trans_extra.c.inc | 24 +- .../loongarch/insn_trans/trans_farith.c.inc | 96 +- target/loongarch/insn_trans/trans_fcmp.c.inc | 8 + target/loongarch/insn_trans/trans_fcnv.c.inc | 56 +- .../loongarch/insn_trans/trans_fmemory.c.inc | 62 +- target/loongarch/insn_trans/trans_fmov.c.inc | 52 +- target/loongarch/insn_trans/trans_lsx.c.inc | 1434 +++++++++-------- .../loongarch/insn_trans/trans_memory.c.inc | 118 +- .../insn_trans/trans_privileged.c.inc | 24 +- target/loongarch/insn_trans/trans_shift.c.inc | 34 +- 23 files changed, 1386 insertions(+), 1020 deletions(-)
Signature · 1 line
2.41.0
PATCH v5 1/19 target/loongarch: Support LoongArch32 TLB entry
From: Jiajie Chen <[email protected]>
The TLB entry of LA32 lacks NR, NX and RPLV and they are hardwired to zero in LoongArch32.
Message-ID: <[email protected]>
--- target/loongarch/cpu-csr.h | 9 +++++---- target/loongarch/tlb_helper.c | 17 ++++++++++++----- 2 files changed, 17 insertions(+), 9 deletions(-)
target/loongarch/cpu-csr.h +5 -4
@@ -66,10 +66,11 @@ FIELD(TLBENTRY, D, 1, 1) FIELD(TLBENTRY, PLV, 2, 2) FIELD(TLBENTRY, MAT, 4, 2) FIELD(TLBENTRY, G, 6, 1) -FIELD(TLBENTRY, PPN, 12, 36) -FIELD(TLBENTRY, NR, 61, 1) -FIELD(TLBENTRY, NX, 62, 1) -FIELD(TLBENTRY, RPLV, 63, 1) +FIELD(TLBENTRY_32, PPN, 8, 24) +FIELD(TLBENTRY_64, PPN, 12, 36) +FIELD(TLBENTRY_64, NR, 61, 1) +FIELD(TLBENTRY_64, NX, 62, 1) +FIELD(TLBENTRY_64, RPLV, 63, 1)#define LOONGARCH_CSR_ASID 0x18/* Address space identifier */ FIELD (CSR_ASID ,ASID ,0 ,10 )
target/loongarch/tlb_helper.c +12 -5
@@ -48,10 +48,17 @@ static int loongarch_map_tlb_entry(CPULoongArchState *env, hwaddr *physical, tlb_v =FIELD_EX64 (tlb_entry,TLBENTRY ,V ); tlb_d =FIELD_EX64 (tlb_entry,TLBENTRY ,D ); tlb_plv =FIELD_EX64 (tlb_entry,TLBENTRY ,PLV ); - tlb_ppn =FIELD_EX64 (tlb_entry,TLBENTRY ,PPN ); - tlb_nx =FIELD_EX64 (tlb_entry,TLBENTRY ,NX ); - tlb_nr =FIELD_EX64 (tlb_entry,TLBENTRY ,NR ); - tlb_rplv =FIELD_EX64 (tlb_entry,TLBENTRY ,RPLV ); +if (is_la64 (env)) { + tlb_ppn =FIELD_EX64 (tlb_entry,TLBENTRY_64 ,PPN ); + tlb_nx =FIELD_EX64 (tlb_entry,TLBENTRY_64 ,NX ); + tlb_nr =FIELD_EX64 (tlb_entry,TLBENTRY_64 ,NR ); + tlb_rplv =FIELD_EX64 (tlb_entry,TLBENTRY_64 ,RPLV ); + }else { + tlb_ppn =FIELD_EX64 (tlb_entry,TLBENTRY_32 ,PPN ); + tlb_nx =0 ; + tlb_nr =0 ; + tlb_rplv =0 ; + }/* Check access rights */ if (!tlb_v) {
@@ -79,7 +86,7 @@ static int loongarch_map_tlb_entry(CPULoongArchState *env, hwaddr *physical,* tlb_entry contains ppn[47:12] while 16KiB ppn is [47:15] * need adjust. */ - *physical = (tlb_ppn <<R_TLBENTRY_PPN_SHIFT ) | + *physical = (tlb_ppn <<R_TLBENTRY_64_PPN_SHIFT ) | (address &MAKE_64BIT_MASK (0 , tlb_ps)); *prot =PAGE_READ ;if (tlb_d) {
Signature · 1 line
2.41.0
PATCH v5 2/19 target/loongarch: Support LoongArch32 DMW
In reply to Philippe Mathieu-DaudéFrom: Jiajie Chen <[email protected]>
LA32 uses a different encoding for CSR.DMW and a new direct mapping mechanism.
Message-ID: <[email protected]>
--- target/loongarch/cpu-csr.h | 7 +++---- target/loongarch/tlb_helper.c | 26 +++++++++++++++++++++++--- 2 files changed, 26 insertions(+), 7 deletions(-)
target/loongarch/cpu-csr.h +3 -4
@@ -188,10 +188,9 @@ FIELD(CSR_DMW, PLV1, 1, 1) FIELD(CSR_DMW, PLV2, 2, 1) FIELD(CSR_DMW, PLV3, 3, 1) FIELD(CSR_DMW, MAT, 4, 2) -FIELD(CSR_DMW, VSEG, 60, 4) - -#define dmw_va2pa (va) \ - (va & MAKE_64BIT_MASK(0, TARGET_VIRT_ADDR_SPACE_BITS)) +FIELD(CSR_DMW_32, PSEG, 25, 3) +FIELD(CSR_DMW_32, VSEG, 29, 3) +FIELD (CSR_DMW_64 ,VSEG ,60 ,4 ) /* Debug CSRs */#define LOONGARCH_CSR_DBG 0x500/* debug config */
target/loongarch/tlb_helper.c +23 -3
@@ -173,6 +173,18 @@ static int loongarch_map_address(CPULoongArchState *env, hwaddr *physical,return TLBRET_NOMATCH ; } +static hwaddr dmw_va2pa (CPULoongArchState *env,target_ulong va, +target_ulong dmw) +{ +if (is_la64 (env)) { +return va &TARGET_VIRT_MASK ; + }else { +uint32_t pseg =FIELD_EX32 (dmw,CSR_DMW_32 ,PSEG ); +return (va &MAKE_64BIT_MASK (0 ,R_CSR_DMW_32_VSEG_SHIFT )) | \ + (pseg <<R_CSR_DMW_32_VSEG_SHIFT ); + } +} +static int get_physical_address (CPULoongArchState *env,hwaddr *physical,int *prot,target_ulong address,MMUAccessType access_type,int mmu_idx)
@@ -192,12 +204,20 @@ static int get_physical_address(CPULoongArchState *env, hwaddr *physical, } plv = kernel_mode | (user_mode <<R_CSR_DMW_PLV3_SHIFT ); - base_v = address >>R_CSR_DMW_VSEG_SHIFT ; +if (is_la64 (env)) { + base_v = address >>R_CSR_DMW_64_VSEG_SHIFT ; + }else { + base_v = address >>R_CSR_DMW_32_VSEG_SHIFT ; + }/* Check direct map window */ for (int i =0 ; i <4 ; i++) { - base_c =FIELD_EX64 (env->CSR_DMW[i],CSR_DMW ,VSEG ); +if (is_la64 (env)) { + base_c =FIELD_EX64 (env->CSR_DMW[i],CSR_DMW_64 ,VSEG ); + }else { + base_c =FIELD_EX64 (env->CSR_DMW[i],CSR_DMW_32 ,VSEG ); + }if ((plv & env->CSR_DMW[i]) && (base_c == base_v)) { - *physical =dmw_va2pa (address); + *physical =dmw_va2pa (env, address, env->CSR_DMW[i]); *prot =PAGE_READ |PAGE_WRITE |PAGE_EXEC ;return TLBRET_MATCH ; }
Signature · 1 line
2.41.0
PATCH v5 3/19 target/loongarch: Support LoongArch32 VPPN
In reply to Philippe Mathieu-DaudéFrom: Jiajie Chen <[email protected]>
VPPN of TLBEHI/TLBREHI is limited to 19 bits in LA32.
Message-ID: <[email protected]>
--- target/loongarch/cpu-csr.h | 6 ++++-- target/loongarch/tlb_helper.c | 23 ++++++++++++++++++----- 2 files changed, 22 insertions(+), 7 deletions(-)
target/loongarch/cpu-csr.h +4 -2
@@ -57,7 +57,8 @@ FIELD(CSR_TLBIDX, PS, 24, 6) FIELD(CSR_TLBIDX, NE, 31, 1)#define LOONGARCH_CSR_TLBEHI 0x11/* TLB EntryHi */ -FIELD(CSR_TLBEHI, VPPN, 13, 35) +FIELD(CSR_TLBEHI_32, VPPN, 13, 19) +FIELD(CSR_TLBEHI_64, VPPN, 13, 35)#define LOONGARCH_CSR_TLBELO0 0x12/* TLB EntryLo0 */ #define LOONGARCH_CSR_TLBELO1 0x13/* TLB EntryLo1 */
@@ -164,7 +165,8 @@ FIELD(CSR_TLBRERA, PC, 2, 62)#define LOONGARCH_CSR_TLBRELO1 0x8d/* TLB refill entrylo1 */ #define LOONGARCH_CSR_TLBREHI 0x8e/* TLB refill entryhi */ FIELD(CSR_TLBREHI, PS, 0, 6) -FIELD(CSR_TLBREHI, VPPN, 13, 35) +FIELD(CSR_TLBREHI_32, VPPN, 13, 19) +FIELD(CSR_TLBREHI_64, VPPN, 13, 35)#define LOONGARCH_CSR_TLBRPRMD 0x8f/* TLB refill mode info */ FIELD(CSR_TLBRPRMD, PPLV, 0, 2)FIELD (CSR_TLBRPRMD ,PIE ,2 ,1 )
target/loongarch/tlb_helper.c +18 -5
@@ -300,8 +300,13 @@ static void raise_mmu_exception(CPULoongArchState *env, target_ulong address,if (tlb_error ==TLBRET_NOMATCH ) { env->CSR_TLBRBADV = address; - env->CSR_TLBREHI =FIELD_DP64 (env->CSR_TLBREHI,CSR_TLBREHI ,VPPN , -extract64 (address,13 ,35 )); +if (is_la64 (env)) { + env->CSR_TLBREHI =FIELD_DP64 (env->CSR_TLBREHI,CSR_TLBREHI_64 , +VPPN ,extract64 (address,13 ,35 )); + }else { + env->CSR_TLBREHI =FIELD_DP64 (env->CSR_TLBREHI,CSR_TLBREHI_32 , +VPPN ,extract64 (address,13 ,19 )); + } }else {if (!FIELD_EX64 (env->CSR_DBG,CSR_DBG ,DST )) { env->CSR_BADV = address;
@@ -366,12 +371,20 @@ static void fill_tlb_entry(CPULoongArchState *env, int index)if (FIELD_EX64 (env->CSR_TLBRERA,CSR_TLBRERA ,ISTLBR )) { csr_ps =FIELD_EX64 (env->CSR_TLBREHI,CSR_TLBREHI ,PS ); - csr_vppn =FIELD_EX64 (env->CSR_TLBREHI,CSR_TLBREHI ,VPPN ); +if (is_la64 (env)) { + csr_vppn =FIELD_EX64 (env->CSR_TLBREHI,CSR_TLBREHI_64 ,VPPN ); + }else { + csr_vppn =FIELD_EX64 (env->CSR_TLBREHI,CSR_TLBREHI_32 ,VPPN ); + } lo0 = env->CSR_TLBRELO0; lo1 = env->CSR_TLBRELO1; }else { csr_ps =FIELD_EX64 (env->CSR_TLBIDX,CSR_TLBIDX ,PS ); - csr_vppn =FIELD_EX64 (env->CSR_TLBEHI,CSR_TLBEHI ,VPPN ); +if (is_la64 (env)) { + csr_vppn =FIELD_EX64 (env->CSR_TLBEHI,CSR_TLBEHI_64 ,VPPN ); + }else { + csr_vppn =FIELD_EX64 (env->CSR_TLBEHI,CSR_TLBEHI_32 ,VPPN ); + } lo0 = env->CSR_TLBELO0; lo1 = env->CSR_TLBELO1; }
@@ -491,7 +504,7 @@ void helper_tlbfill(CPULoongArchState *env)if (pagesize == stlb_ps) {/* Only write into STLB bits [47:13] */ - address = entryhi & ~MAKE_64BIT_MASK (0 ,R_CSR_TLBEHI_VPPN_SHIFT ); + address = entryhi & ~MAKE_64BIT_MASK (0 ,R_CSR_TLBEHI_64_VPPN_SHIFT );/* Choose one set ramdomly */ set =get_random_tlb (0 ,7 );
Signature · 1 line
2.41.0
PATCH v5 4/19 target/loongarch: Add LA64 & VA32 to DisasContext
In reply to Philippe Mathieu-DaudéFrom: Jiajie Chen <[email protected]>
Add LA64 and VA32(32-bit Virtual Address) to DisasContext to allow the translator to reject doubleword instructions in LA32 mode for example.
Message-ID: <[email protected]>
--- target/loongarch/cpu.h | 13 +++++++++++++ target/loongarch/translate.h | 2 ++ target/loongarch/translate.c | 3 +++ 3 files changed, 18 insertions(+)
target/loongarch/cpu.h +13 -0
@@ -432,6 +432,17 @@ static inline bool is_la64(CPULoongArchState *env)return FIELD_EX32 (env->cpucfg[1 ],CPUCFG1 ,ARCH ) ==CPUCFG1_ARCH_LA64 ; } +static inline bool is_va32 (CPULoongArchState *env) +{ +/* VA32 if !LA64 or VA32L[1-3] */ +bool va32 = !is_la64 (env); +uint64_t plv =FIELD_EX64 (env->CSR_CRMD,CSR_CRMD ,PLV ); +if (plv >=1 && (FIELD_EX64 (env->CSR_MISC,CSR_MISC ,VA32 ) & (1 << plv))) { + va32 = true; + } +return va32; +} +/* * LoongArch CPUs hardware flags. */
@@ -439,6 +450,7 @@ static inline bool is_la64(CPULoongArchState *env)#define HW_FLAGS_CRMD_PG R_CSR_CRMD_PG_MASK/* 0x10 */ #define HW_FLAGS_EUEN_FPE 0x04#define HW_FLAGS_EUEN_SXE 0x08 +#define HW_FLAGS_VA32 0x20static inline void cpu_get_tb_cpu_state (CPULoongArchState *env,vaddr *pc,uint64_t *cs_base,uint32_t *flags)
@@ -448,6 +460,7 @@ static inline void cpu_get_tb_cpu_state(CPULoongArchState *env, vaddr *pc, *flags = env->CSR_CRMD & (R_CSR_CRMD_PLV_MASK |R_CSR_CRMD_PG_MASK ); *flags |=FIELD_EX64 (env->CSR_EUEN,CSR_EUEN ,FPE ) *HW_FLAGS_EUEN_FPE ; *flags |=FIELD_EX64 (env->CSR_EUEN,CSR_EUEN ,SXE ) *HW_FLAGS_EUEN_SXE ; + *flags |=is_va32 (env) *HW_FLAGS_VA32 ; }void loongarch_cpu_list (void );
target/loongarch/translate.h +2 -0
@@ -33,6 +33,8 @@ typedef struct DisasContext {uint16_t plv;int vl;/* Vector length */ TCGv zero; +bool la64;/* LoongArch64 mode */ +bool va32;/* 32-bit virtual address */ } DisasContext;void generate_exception (DisasContext *ctx,int excp);
target/loongarch/translate.c +3 -0
@@ -119,6 +119,9 @@ static void loongarch_tr_init_disas_context(DisasContextBase *dcbase, ctx->vl =LSX_LEN ; } + ctx->la64 =is_la64 (env); + ctx->va32 = (ctx->base.tb->flags &HW_FLAGS_VA32 ) !=0 ; + ctx->zero =tcg_constant_tl (0 ); }
Signature · 1 line
2.41.0
PATCH v5 5/19 target/loongarch: Extract make_address_x() helper
In reply to Philippe Mathieu-DaudéFrom: Jiajie Chen <[email protected]>
Message-ID: <[email protected]>
--- target/loongarch/translate.c | 12 ++++++++++++ .../loongarch/insn_trans/trans_fmemory.c.inc | 18 ++++++------------ target/loongarch/insn_trans/trans_lsx.c.inc | 6 ++---- target/loongarch/insn_trans/trans_memory.c.inc | 6 ++---- 4 files changed, 22 insertions(+), 20 deletions(-)
target/loongarch/translate.c +12 -0
@@ -208,6 +208,18 @@ static void set_fpr(int reg_num, TCGv val) offsetof(CPULoongArchState, fpr[reg_num].vreg.D(0))); } +static TCGv make_address_x (DisasContext *ctx,TCGv base,TCGv addend) +{ +TCGv temp =NULL ; + +if (addend) { + temp =tcg_temp_new (); +tcg_gen_add_tl (temp, base, addend); + base = temp; + } +return base; +} +#include "decode-insns.c.inc" #include "insn_trans/trans_arith.c.inc" #include "insn_trans/trans_shift.c.inc"
target/loongarch/insn_trans/trans_fmemory.c.inc +6 -12
@@ -57,8 +57,7 @@ static bool gen_floadx(DisasContext *ctx, arg_frr *a, MemOp mop) CHECK_FPE; - addr = tcg_temp_new(); - tcg_gen_add_tl(addr, src1, src2); + addr = make_address_x(ctx, src1, src2); tcg_gen_qemu_ld_tl(dest, addr, ctx->mem_idx, mop); maybe_nanbox_load(dest, mop); set_fpr(a->fd, dest);
@@ -75,8 +74,7 @@ static bool gen_fstorex(DisasContext *ctx, arg_frr *a, MemOp mop) CHECK_FPE; - addr = tcg_temp_new(); - tcg_gen_add_tl(addr, src1, src2); + addr = make_address_x(ctx, src1, src2); tcg_gen_qemu_st_tl(src3, addr, ctx->mem_idx, mop); return true;
@@ -91,9 +89,8 @@ static bool gen_fload_gt(DisasContext *ctx, arg_frr *a, MemOp mop) CHECK_FPE; - addr = tcg_temp_new(); gen_helper_asrtgt_d(cpu_env, src1, src2); - tcg_gen_add_tl(addr, src1, src2); + addr = make_address_x(ctx, src1, src2); tcg_gen_qemu_ld_tl(dest, addr, ctx->mem_idx, mop); maybe_nanbox_load(dest, mop); set_fpr(a->fd, dest);
@@ -110,9 +107,8 @@ static bool gen_fstore_gt(DisasContext *ctx, arg_frr *a, MemOp mop) CHECK_FPE; - addr = tcg_temp_new(); gen_helper_asrtgt_d(cpu_env, src1, src2); - tcg_gen_add_tl(addr, src1, src2); + addr = make_address_x(ctx, src1, src2); tcg_gen_qemu_st_tl(src3, addr, ctx->mem_idx, mop); return true;
@@ -127,9 +123,8 @@ static bool gen_fload_le(DisasContext *ctx, arg_frr *a, MemOp mop) CHECK_FPE; - addr = tcg_temp_new(); gen_helper_asrtle_d(cpu_env, src1, src2); - tcg_gen_add_tl(addr, src1, src2); + addr = make_address_x(ctx, src1, src2); tcg_gen_qemu_ld_tl(dest, addr, ctx->mem_idx, mop); maybe_nanbox_load(dest, mop); set_fpr(a->fd, dest);
@@ -146,9 +141,8 @@ static bool gen_fstore_le(DisasContext *ctx, arg_frr *a, MemOp mop) CHECK_FPE; - addr = tcg_temp_new(); gen_helper_asrtle_d(cpu_env, src1, src2); - tcg_gen_add_tl(addr, src1, src2); + addr = make_address_x(ctx, src1, src2); tcg_gen_qemu_st_tl(src3, addr, ctx->mem_idx, mop); return true;
target/loongarch/insn_trans/trans_lsx.c.inc +2 -4
@@ -4315,14 +4315,13 @@ static bool trans_vldx(DisasContext *ctx, arg_vrr *a) CHECK_SXE; - addr = tcg_temp_new(); src1 = gpr_src(ctx, a->rj, EXT_NONE); src2 = gpr_src(ctx, a->rk, EXT_NONE); val = tcg_temp_new_i128(); rl = tcg_temp_new_i64(); rh = tcg_temp_new_i64(); - tcg_gen_add_tl(addr, src1, src2); + addr = make_address_x(ctx, src1, src2); tcg_gen_qemu_ld_i128(val, addr, ctx->mem_idx, MO_128 | MO_TE); tcg_gen_extr_i128_i64(rl, rh, val); set_vreg64(rh, a->vd, 1);
@@ -4339,14 +4338,13 @@ static bool trans_vstx(DisasContext *ctx, arg_vrr *a) CHECK_SXE; - addr = tcg_temp_new(); src1 = gpr_src(ctx, a->rj, EXT_NONE); src2 = gpr_src(ctx, a->rk, EXT_NONE); val = tcg_temp_new_i128(); ah = tcg_temp_new_i64(); al = tcg_temp_new_i64(); - tcg_gen_add_tl(addr, src1, src2); + addr = make_address_x(ctx, src1, src2); get_vreg64(ah, a->vd, 1); get_vreg64(al, a->vd, 0); tcg_gen_concat_i64_i128(val, al, ah);
target/loongarch/insn_trans/trans_memory.c.inc +2 -4
@@ -39,9 +39,8 @@ static bool gen_loadx(DisasContext *ctx, arg_rrr *a, MemOp mop) TCGv dest = gpr_dst(ctx, a->rd, EXT_NONE); TCGv src1 = gpr_src(ctx, a->rj, EXT_NONE); TCGv src2 = gpr_src(ctx, a->rk, EXT_NONE); - TCGv addr = tcg_temp_new(); + TCGv addr = make_address_x(ctx, src1, src2); - tcg_gen_add_tl(addr, src1, src2); tcg_gen_qemu_ld_tl(dest, addr, ctx->mem_idx, mop); gen_set_gpr(a->rd, dest, EXT_NONE);
@@ -53,9 +52,8 @@ static bool gen_storex(DisasContext *ctx, arg_rrr *a, MemOp mop) TCGv data = gpr_src(ctx, a->rd, EXT_NONE); TCGv src1 = gpr_src(ctx, a->rj, EXT_NONE); TCGv src2 = gpr_src(ctx, a->rk, EXT_NONE); - TCGv addr = tcg_temp_new(); + TCGv addr = make_address_x(ctx, src1, src2); - tcg_gen_add_tl(addr, src1, src2); tcg_gen_qemu_st_tl(data, addr, ctx->mem_idx, mop); return true;
Signature · 1 line
2.41.0
PATCH v5 6/19 target/loongarch: Extract make_address_i() helper
In reply to Philippe Mathieu-DaudéFrom: Jiajie Chen <[email protected]>
Message-ID: <[email protected]>
--- target/loongarch/translate.c | 6 ++++ .../loongarch/insn_trans/trans_atomic.c.inc | 5 +-- .../loongarch/insn_trans/trans_branch.c.inc | 3 +- .../loongarch/insn_trans/trans_fmemory.c.inc | 12 ++----- target/loongarch/insn_trans/trans_lsx.c.inc | 32 +++++-------------- .../loongarch/insn_trans/trans_memory.c.inc | 28 +++++----------- 6 files changed, 29 insertions(+), 57 deletions(-)
target/loongarch/translate.c +6 -0
@@ -220,6 +220,12 @@ static TCGv make_address_x(DisasContext *ctx, TCGv base, TCGv addend)return base; } +static TCGv make_address_i (DisasContext *ctx,TCGv base,target_long ofs) +{ +TCGv addend = ofs ?tcg_constant_tl (ofs) :NULL ; +return make_address_x (ctx, base, addend); +} +#include "decode-insns.c.inc" #include "insn_trans/trans_arith.c.inc" #include "insn_trans/trans_shift.c.inc"
target/loongarch/insn_trans/trans_atomic.c.inc +3 -2
@@ -7,9 +7,8 @@ static bool gen_ll(DisasContext *ctx, arg_rr_i *a, MemOp mop) { TCGv dest = gpr_dst(ctx, a->rd, EXT_NONE); TCGv src1 = gpr_src(ctx, a->rj, EXT_NONE); - TCGv t0 = tcg_temp_new(); + TCGv t0 = make_address_i(ctx, src1, a->imm); - tcg_gen_addi_tl(t0, src1, a->imm); tcg_gen_qemu_ld_i64(dest, t0, ctx->mem_idx, mop); tcg_gen_st_tl(t0, cpu_env, offsetof(CPULoongArchState, lladdr)); tcg_gen_st_tl(dest, cpu_env, offsetof(CPULoongArchState, llval));
@@ -62,6 +61,8 @@ static bool gen_am(DisasContext *ctx, arg_rrr *a, return false; } + addr = make_address_i(ctx, addr, 0); + func(dest, addr, val, ctx->mem_idx, mop); gen_set_gpr(a->rd, dest, EXT_NONE);
target/loongarch/insn_trans/trans_branch.c.inc +2 -1
@@ -23,7 +23,8 @@ static bool trans_jirl(DisasContext *ctx, arg_jirl *a) TCGv dest = gpr_dst(ctx, a->rd, EXT_NONE); TCGv src1 = gpr_src(ctx, a->rj, EXT_NONE); - tcg_gen_addi_tl(cpu_pc, src1, a->imm); + TCGv addr = make_address_i(ctx, src1, a->imm); + tcg_gen_mov_tl(cpu_pc, addr); tcg_gen_movi_tl(dest, ctx->base.pc_next + 4); gen_set_gpr(a->rd, dest, EXT_NONE); tcg_gen_lookup_and_goto_ptr();
target/loongarch/insn_trans/trans_fmemory.c.inc +2 -10
@@ -17,11 +17,7 @@ static bool gen_fload_i(DisasContext *ctx, arg_fr_i *a, MemOp mop) CHECK_FPE; - if (a->imm) { - TCGv temp = tcg_temp_new(); - tcg_gen_addi_tl(temp, addr, a->imm); - addr = temp; - } + addr = make_address_i(ctx, addr, a->imm); tcg_gen_qemu_ld_tl(dest, addr, ctx->mem_idx, mop); maybe_nanbox_load(dest, mop);
@@ -37,11 +33,7 @@ static bool gen_fstore_i(DisasContext *ctx, arg_fr_i *a, MemOp mop) CHECK_FPE; - if (a->imm) { - TCGv temp = tcg_temp_new(); - tcg_gen_addi_tl(temp, addr, a->imm); - addr = temp; - } + addr = make_address_i(ctx, addr, a->imm); tcg_gen_qemu_st_tl(src, addr, ctx->mem_idx, mop);
target/loongarch/insn_trans/trans_lsx.c.inc +8 -24
@@ -4255,7 +4255,7 @@ TRANS(vextrins_d, gen_vv_i, gen_helper_vextrins_d) static bool trans_vld(DisasContext *ctx, arg_vr_i *a) { - TCGv addr, temp; + TCGv addr; TCGv_i64 rl, rh; TCGv_i128 val;
@@ -4266,11 +4266,7 @@ static bool trans_vld(DisasContext *ctx, arg_vr_i *a) rl = tcg_temp_new_i64(); rh = tcg_temp_new_i64(); - if (a->imm) { - temp = tcg_temp_new(); - tcg_gen_addi_tl(temp, addr, a->imm); - addr = temp; - } + addr = make_address_i(ctx, addr, a->imm); tcg_gen_qemu_ld_i128(val, addr, ctx->mem_idx, MO_128 | MO_TE); tcg_gen_extr_i128_i64(rl, rh, val);
@@ -4282,7 +4278,7 @@ static bool trans_vld(DisasContext *ctx, arg_vr_i *a) static bool trans_vst(DisasContext *ctx, arg_vr_i *a) { - TCGv addr, temp; + TCGv addr; TCGv_i128 val; TCGv_i64 ah, al;
@@ -4293,11 +4289,7 @@ static bool trans_vst(DisasContext *ctx, arg_vr_i *a) ah = tcg_temp_new_i64(); al = tcg_temp_new_i64(); - if (a->imm) { - temp = tcg_temp_new(); - tcg_gen_addi_tl(temp, addr, a->imm); - addr = temp; - } + addr = make_address_i(ctx, addr, a->imm); get_vreg64(ah, a->vd, 1); get_vreg64(al, a->vd, 0);
@@ -4356,7 +4348,7 @@ static bool trans_vstx(DisasContext *ctx, arg_vrr *a) #define VLDREPL(NAME, MO) \ static bool trans_## NAME (DisasContext *ctx, arg_vr_i *a) \ { \ - TCGv addr, temp; \ + TCGv addr; \ TCGv_i64 val; \ \ CHECK_SXE; \
@@ -4364,11 +4356,7 @@ static bool trans_## NAME (DisasContext *ctx, arg_vr_i *a) \ addr = gpr_src(ctx, a->rj, EXT_NONE); \ val = tcg_temp_new_i64(); \ \ - if (a->imm) { \ - temp = tcg_temp_new(); \ - tcg_gen_addi_tl(temp, addr, a->imm); \ - addr = temp; \ - } \ + addr = make_address_i(ctx, addr, a->imm); \ \ tcg_gen_qemu_ld_i64(val, addr, ctx->mem_idx, MO); \ tcg_gen_gvec_dup_i64(MO, vec_full_offset(a->vd), 16, ctx->vl/8, val); \
@@ -4384,7 +4372,7 @@ VLDREPL(vldrepl_d, MO_64) #define VSTELM(NAME, MO, E) \ static bool trans_## NAME (DisasContext *ctx, arg_vr_ii *a) \ { \ - TCGv addr, temp; \ + TCGv addr; \ TCGv_i64 val; \ \ CHECK_SXE; \
@@ -4392,11 +4380,7 @@ static bool trans_## NAME (DisasContext *ctx, arg_vr_ii *a) \ addr = gpr_src(ctx, a->rj, EXT_NONE); \ val = tcg_temp_new_i64(); \ \ - if (a->imm) { \ - temp = tcg_temp_new(); \ - tcg_gen_addi_tl(temp, addr, a->imm); \ - addr = temp; \ - } \ + addr = make_address_i(ctx, addr, a->imm); \ \ tcg_gen_ld_i64(val, cpu_env, \ offsetof(CPULoongArchState, fpr[a->vd].vreg.E(a->imm2))); \
target/loongarch/insn_trans/trans_memory.c.inc +8 -20
@@ -8,11 +8,7 @@ static bool gen_load(DisasContext *ctx, arg_rr_i *a, MemOp mop) TCGv dest = gpr_dst(ctx, a->rd, EXT_NONE); TCGv addr = gpr_src(ctx, a->rj, EXT_NONE); - if (a->imm) { - TCGv temp = tcg_temp_new(); - tcg_gen_addi_tl(temp, addr, a->imm); - addr = temp; - } + addr = make_address_i(ctx, addr, a->imm); tcg_gen_qemu_ld_tl(dest, addr, ctx->mem_idx, mop); gen_set_gpr(a->rd, dest, EXT_NONE);
@@ -24,11 +20,7 @@ static bool gen_store(DisasContext *ctx, arg_rr_i *a, MemOp mop) TCGv data = gpr_src(ctx, a->rd, EXT_NONE); TCGv addr = gpr_src(ctx, a->rj, EXT_NONE); - if (a->imm) { - TCGv temp = tcg_temp_new(); - tcg_gen_addi_tl(temp, addr, a->imm); - addr = temp; - } + addr = make_address_i(ctx, addr, a->imm); tcg_gen_qemu_st_tl(data, addr, ctx->mem_idx, mop); return true;
@@ -66,6 +58,7 @@ static bool gen_load_gt(DisasContext *ctx, arg_rrr *a, MemOp mop) TCGv src2 = gpr_src(ctx, a->rk, EXT_NONE); gen_helper_asrtgt_d(cpu_env, src1, src2); + src1 = make_address_i(ctx, src1, 0); tcg_gen_qemu_ld_tl(dest, src1, ctx->mem_idx, mop); gen_set_gpr(a->rd, dest, EXT_NONE);
@@ -79,6 +72,7 @@ static bool gen_load_le(DisasContext *ctx, arg_rrr *a, MemOp mop) TCGv src2 = gpr_src(ctx, a->rk, EXT_NONE); gen_helper_asrtle_d(cpu_env, src1, src2); + src1 = make_address_i(ctx, src1, 0); tcg_gen_qemu_ld_tl(dest, src1, ctx->mem_idx, mop); gen_set_gpr(a->rd, dest, EXT_NONE);
@@ -92,6 +86,7 @@ static bool gen_store_gt(DisasContext *ctx, arg_rrr *a, MemOp mop) TCGv src2 = gpr_src(ctx, a->rk, EXT_NONE); gen_helper_asrtgt_d(cpu_env, src1, src2); + src1 = make_address_i(ctx, src1, 0); tcg_gen_qemu_st_tl(data, src1, ctx->mem_idx, mop); return true;
@@ -104,6 +99,7 @@ static bool gen_store_le(DisasContext *ctx, arg_rrr *a, MemOp mop) TCGv src2 = gpr_src(ctx, a->rk, EXT_NONE); gen_helper_asrtle_d(cpu_env, src1, src2); + src1 = make_address_i(ctx, src1, 0); tcg_gen_qemu_st_tl(data, src1, ctx->mem_idx, mop); return true;
@@ -131,11 +127,7 @@ static bool gen_ldptr(DisasContext *ctx, arg_rr_i *a, MemOp mop) TCGv dest = gpr_dst(ctx, a->rd, EXT_NONE); TCGv addr = gpr_src(ctx, a->rj, EXT_NONE); - if (a->imm) { - TCGv temp = tcg_temp_new(); - tcg_gen_addi_tl(temp, addr, a->imm); - addr = temp; - } + addr = make_address_i(ctx, addr, a->imm); tcg_gen_qemu_ld_tl(dest, addr, ctx->mem_idx, mop); gen_set_gpr(a->rd, dest, EXT_NONE);
@@ -147,11 +139,7 @@ static bool gen_stptr(DisasContext *ctx, arg_rr_i *a, MemOp mop) TCGv data = gpr_src(ctx, a->rd, EXT_NONE); TCGv addr = gpr_src(ctx, a->rj, EXT_NONE); - if (a->imm) { - TCGv temp = tcg_temp_new(); - tcg_gen_addi_tl(temp, addr, a->imm); - addr = temp; - } + addr = make_address_i(ctx, addr, a->imm); tcg_gen_qemu_st_tl(data, addr, ctx->mem_idx, mop); return true;
Signature · 1 line
2.41.0
PATCH v5 7/19 target/loongarch: Extract make_address_pc() helper
In reply to Philippe Mathieu-DaudéFrom: Jiajie Chen <[email protected]>
Message-ID: <[email protected]>
--- target/loongarch/translate.c | 5 +++++ target/loongarch/insn_trans/trans_arith.c.inc | 2 +- target/loongarch/insn_trans/trans_branch.c.inc | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-)
target/loongarch/translate.c +5 -0
@@ -226,6 +226,11 @@ static TCGv make_address_i(DisasContext *ctx, TCGv base, target_long ofs)return make_address_x (ctx, base, addend); } +static uint64_t make_address_pc (DisasContext *ctx,uint64_t addr) +{ +return addr; +} +#include "decode-insns.c.inc" #include "insn_trans/trans_arith.c.inc" #include "insn_trans/trans_shift.c.inc"
target/loongarch/insn_trans/trans_arith.c.inc +1 -1
@@ -72,7 +72,7 @@ static bool gen_pc(DisasContext *ctx, arg_r_i *a, target_ulong (*func)(target_ulong, int)) { TCGv dest = gpr_dst(ctx, a->rd, EXT_NONE); - target_ulong addr = func(ctx->base.pc_next, a->imm); + target_ulong addr = make_address_pc(ctx, func(ctx->base.pc_next, a->imm)); tcg_gen_movi_tl(dest, addr); gen_set_gpr(a->rd, dest, EXT_NONE);
target/loongarch/insn_trans/trans_branch.c.inc +2 -2
@@ -12,7 +12,7 @@ static bool trans_b(DisasContext *ctx, arg_b *a) static bool trans_bl(DisasContext *ctx, arg_bl *a) { - tcg_gen_movi_tl(cpu_gpr[1], ctx->base.pc_next + 4); + tcg_gen_movi_tl(cpu_gpr[1], make_address_pc(ctx, ctx->base.pc_next + 4)); gen_goto_tb(ctx, 0, ctx->base.pc_next + a->offs); ctx->base.is_jmp = DISAS_NORETURN; return true;
@@ -25,7 +25,7 @@ static bool trans_jirl(DisasContext *ctx, arg_jirl *a) TCGv addr = make_address_i(ctx, src1, a->imm); tcg_gen_mov_tl(cpu_pc, addr); - tcg_gen_movi_tl(dest, ctx->base.pc_next + 4); + tcg_gen_movi_tl(dest, make_address_pc(ctx, ctx->base.pc_next + 4)); gen_set_gpr(a->rd, dest, EXT_NONE); tcg_gen_lookup_and_goto_ptr(); ctx->base.is_jmp = DISAS_NORETURN;
Signature · 1 line
2.41.0
PATCH v5 8/19 target/loongarch: Extract set_pc() helper
In reply to Philippe Mathieu-DaudéFrom: Jiajie Chen <[email protected]>
Message-ID: <[email protected]>
--- target/loongarch/cpu.h | 5 +++++ target/loongarch/cpu.c | 16 ++++++++-------- target/loongarch/gdbstub.c | 2 +- target/loongarch/op_helper.c | 4 ++-- 4 files changed, 16 insertions(+), 11 deletions(-)
target/loongarch/cpu.h +5 -0
@@ -443,6 +443,11 @@ static inline bool is_va32(CPULoongArchState *env)return va32; } +static inline void set_pc (CPULoongArchState *env,uint64_t value) +{ + env->pc = value; +} +/* * LoongArch CPUs hardware flags. */
target/loongarch/cpu.c +8 -8
@@ -81,7 +81,7 @@ static void loongarch_cpu_set_pc(CPUState *cs, vaddr value)LoongArchCPU *cpu =LOONGARCH_CPU (cs);CPULoongArchState *env = &cpu->env; - env->pc = value; +set_pc (env, value); }static vaddr loongarch_cpu_get_pc (CPUState *cs)
@@ -168,7 +168,7 @@ static void loongarch_cpu_do_interrupt(CPUState *cs) set_DERA: env->CSR_DERA = env->pc; env->CSR_DBG =FIELD_DP64 (env->CSR_DBG,CSR_DBG ,DST ,1 ); - env->pc = env->CSR_EENTRY +0x480 ; +set_pc (env, env->CSR_EENTRY +0x480 );break ;case EXCCODE_INT :if (FIELD_EX64 (env->CSR_DBG,CSR_DBG ,DST )) {
@@ -249,7 +249,8 @@ static void loongarch_cpu_do_interrupt(CPUState *cs)/* Find the highest-priority interrupt. */ vector =31 -clz32 (pending); - env->pc = env->CSR_EENTRY + (EXCCODE_EXTERNAL_INT + vector) * vec_size; +set_pc (env, env->CSR_EENTRY + \ + (EXCCODE_EXTERNAL_INT + vector) * vec_size);qemu_log_mask (CPU_LOG_INT ,"%s: PC " TARGET_FMT_lx" ERA " TARGET_FMT_lx " cause %d\n" " A " TARGET_FMT_lx " D "
@@ -260,10 +261,9 @@ static void loongarch_cpu_do_interrupt(CPUState *cs) env->CSR_ECFG, env->CSR_ESTAT); }else {if (tlbfill) { - env->pc = env->CSR_TLBRENTRY; +set_pc (env, env->CSR_TLBRENTRY); }else { - env->pc = env->CSR_EENTRY; - env->pc +=EXCODE_MCODE (cause) * vec_size; +set_pc (env, env->CSR_EENTRY +EXCODE_MCODE (cause) * vec_size); }qemu_log_mask (CPU_LOG_INT , "%s: PC " TARGET_FMT_lx " ERA " TARGET_FMT_lx
@@ -324,7 +324,7 @@ static void loongarch_cpu_synchronize_from_tb(CPUState *cs,CPULoongArchState *env = &cpu->env;tcg_debug_assert (!(cs->tcg_cflags &CF_PCREL )); - env->pc = tb->pc; +set_pc (env, tb->pc); } static void loongarch_restore_state_to_opc(CPUState *cs,
@@ -334,7 +334,7 @@ static void loongarch_restore_state_to_opc(CPUState *cs,LoongArchCPU *cpu =LOONGARCH_CPU (cs);CPULoongArchState *env = &cpu->env; - env->pc = data[0]; + set_pc(env, data[0]); }#endif /* CONFIG_TCG */
target/loongarch/gdbstub.c +1 -1
@@ -77,7 +77,7 @@ int loongarch_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n) env->gpr[n] = tmp; length = read_length; }else if (n ==33 ) { - env->pc = tmp; +set_pc (env, tmp); length = read_length; }return length;
target/loongarch/op_helper.c +2 -2
@@ -114,14 +114,14 @@ void helper_ertn(CPULoongArchState *env) env->CSR_TLBRERA =FIELD_DP64 (env->CSR_TLBRERA,CSR_TLBRERA ,ISTLBR ,0 ); env->CSR_CRMD =FIELD_DP64 (env->CSR_CRMD,CSR_CRMD ,DA ,0 ); env->CSR_CRMD =FIELD_DP64 (env->CSR_CRMD,CSR_CRMD ,PG ,1 ); - env->pc = env->CSR_TLBRERA; +set_pc (env, env->CSR_TLBRERA);qemu_log_mask (CPU_LOG_INT ,"%s: TLBRERA " TARGET_FMT_lx"\n" , __func__, env->CSR_TLBRERA); }else { csr_pplv =FIELD_EX64 (env->CSR_PRMD,CSR_PRMD ,PPLV ); csr_pie =FIELD_EX64 (env->CSR_PRMD,CSR_PRMD ,PIE ); - env->pc = env->CSR_ERA; +set_pc (env, env->CSR_ERA);qemu_log_mask (CPU_LOG_INT ,"%s: ERA " TARGET_FMT_lx"\n" , __func__, env->CSR_ERA); }
Signature · 1 line
2.41.0
PATCH v5 9/19 target/loongarch: Truncate high 32 bits of address in VA32 mode
In reply to Philippe Mathieu-DaudéFrom: Jiajie Chen <[email protected]>
When running in VA32 mode(!LA64 or VA32L[1-3] matching PLV), virtual address is truncated to 32 bits before address mapping.
Message-ID: <[email protected]>
--- target/loongarch/cpu.h | 6 +++++- target/loongarch/translate.c | 16 +++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-)
target/loongarch/cpu.h +5 -1
@@ -445,7 +445,11 @@ static inline bool is_va32(CPULoongArchState *env)static inline void set_pc (CPULoongArchState *env,uint64_t value) { - env->pc = value; +if (is_va32 (env)) { + env->pc = (uint32_t )value; + }else { + env->pc = value; + } }/*
target/loongarch/translate.c +15 -1
@@ -86,6 +86,10 @@ void generate_exception(DisasContext *ctx, int excp)static inline void gen_goto_tb (DisasContext *ctx,int n,target_ulong dest) { +if (ctx->va32) { + dest = (uint32_t ) dest; + } +if (translator_use_goto_tb (&ctx->base, dest)) {tcg_gen_goto_tb (n);tcg_gen_movi_tl (cpu_pc, dest);
@@ -212,11 +216,17 @@ static TCGv make_address_x(DisasContext *ctx, TCGv base, TCGv addend) {TCGv temp =NULL ; -if (addend) { +if (addend || ctx->va32) { temp =tcg_temp_new (); + } +if (addend) {tcg_gen_add_tl (temp, base, addend); base = temp; } +if (ctx->va32) { +tcg_gen_ext32u_tl (temp, base); + base = temp; + }return base; }
@@ -262,6 +272,10 @@ static void loongarch_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs) } ctx->base.pc_next +=4 ; + +if (ctx->va32) { + ctx->base.pc_next = (uint32_t )ctx->base.pc_next; + } }static void loongarch_tr_tb_stop (DisasContextBase *dcbase,CPUState *cs)
Signature · 1 line
2.41.0
Quoted 1 line · Philippe Mathieu-Daudé
(all series reviewed, for Song Gao to pick whichever v4/v5 is preferred)
Incorrect subject, and SMTP failure, so disregard (will resend).