OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

pull-loongarch-20221107 

-----BEGIN PGP SIGNATURE-----
 
 iLMEAAEIAB0WIQS4/x2g0v3LLaCcbCxAov/yOSY+3wUCY2hz5gAKCRBAov/yOSY+
 31ESA/9ppQVu70y8AnA/aYCzC6koQxxAsaD/lvwc7M1xzeZnjwOsVnsFLpZITTJj
 2+2O/BlEO3uRvAtV6E7Vtu9D/+Cc+HQ7yOFnwbY0jZmePThp3YYtTg6o+2T7/9ya
 RMicgny1SYjsOjG8/Uam9+dRbH5QheNFwid0BWFhMts9MDB3Mg==
 =zZ8m
 -----END PGP SIGNATURE-----

Merge tag 'pull-loongarch-20221107' of https://gitlab.com/gaosong/qemu into staging

pull-loongarch-20221107

# -----BEGIN PGP SIGNATURE-----
#
# iLMEAAEIAB0WIQS4/x2g0v3LLaCcbCxAov/yOSY+3wUCY2hz5gAKCRBAov/yOSY+
# 31ESA/9ppQVu70y8AnA/aYCzC6koQxxAsaD/lvwc7M1xzeZnjwOsVnsFLpZITTJj
# 2+2O/BlEO3uRvAtV6E7Vtu9D/+Cc+HQ7yOFnwbY0jZmePThp3YYtTg6o+2T7/9ya
# RMicgny1SYjsOjG8/Uam9+dRbH5QheNFwid0BWFhMts9MDB3Mg==
# =zZ8m
# -----END PGP SIGNATURE-----
# gpg: Signature made Sun 06 Nov 2022 21:56:38 EST
# gpg:                using RSA key B8FF1DA0D2FDCB2DA09C6C2C40A2FFF239263EDF
# gpg: Good signature from "Song Gao <m17746591750@163.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: B8FF 1DA0 D2FD CB2D A09C  6C2C 40A2 FFF2 3926 3EDF

* tag 'pull-loongarch-20221107' of https://gitlab.com/gaosong/qemu:
  target/loongarch: Fix return value of CHECK_FPE
  target/loongarch: Separate the hardware flags into MMU index and PLV

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2022-11-07 15:21:45 -05:00
parent cd706454c6 e913bace61
commit 622a84ef76
6 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
target/loongarch/cpu.h
View File

@ -374,21 +374,21 @@ struct LoongArchCPUClass {
* 0 for kernel mode, 3 for user mode. * 0 for kernel mode, 3 for user mode.
* Define an extra index for DA(direct addressing) mode. * Define an extra index for DA(direct addressing) mode.
*/ */
#define MMU_KERNEL_IDX 0 #define MMU_PLV_KERNEL 0
#define MMU_USER_IDX 3 #define MMU_PLV_USER 3
#define MMU_DA_IDX 4 #define MMU_IDX_KERNEL MMU_PLV_KERNEL
#define MMU_IDX_USER MMU_PLV_USER
#define MMU_IDX_DA 4
static inline int cpu_mmu_index(CPULoongArchState *env, bool ifetch) static inline int cpu_mmu_index(CPULoongArchState *env, bool ifetch)
{ {
#ifdef CONFIG_USER_ONLY #ifdef CONFIG_USER_ONLY
return MMU_USER_IDX; return MMU_IDX_USER;
#else #else
uint8_t pg = FIELD_EX64(env->CSR_CRMD, CSR_CRMD, PG); if (FIELD_EX64(env->CSR_CRMD, CSR_CRMD, PG)) {
return FIELD_EX64(env->CSR_CRMD, CSR_CRMD, PLV);
if (!pg) {
return MMU_DA_IDX;
} }
return FIELD_EX64(env->CSR_CRMD, CSR_CRMD, PLV); return MMU_IDX_DA;
#endif #endif
} }

2
target/loongarch/insn_trans/trans_farith.c.inc
View File

@ -7,7 +7,7 @@
#define CHECK_FPE do { \ #define CHECK_FPE do { \
if ((ctx->base.tb->flags & HW_FLAGS_EUEN_FPE) == 0) { \ if ((ctx->base.tb->flags & HW_FLAGS_EUEN_FPE) == 0) { \
generate_exception(ctx, EXCCODE_FPD); \ generate_exception(ctx, EXCCODE_FPD); \
return false; \ return true; \
} \ } \
} while (0) } while (0)
#else #else

4
target/loongarch/insn_trans/trans_privileged.c.inc
View File

@ -159,7 +159,7 @@ static const CSRInfo csr_info[] = {
static bool check_plv(DisasContext *ctx) static bool check_plv(DisasContext *ctx)
{ {
if (ctx->mem_idx == MMU_USER_IDX) { if (ctx->plv == MMU_PLV_USER) {
generate_exception(ctx, EXCCODE_IPE); generate_exception(ctx, EXCCODE_IPE);
return true; return true;
} }
@ -335,7 +335,7 @@ TRANS(iocsrwr_d, gen_iocsrwr, gen_helper_iocsrwr_d)
static void check_mmu_idx(DisasContext *ctx) static void check_mmu_idx(DisasContext *ctx)
{ {
if (ctx->mem_idx != MMU_DA_IDX) { if (ctx->mem_idx != MMU_IDX_DA) {
tcg_gen_movi_tl(cpu_pc, ctx->base.pc_next + 4); tcg_gen_movi_tl(cpu_pc, ctx->base.pc_next + 4);
ctx->base.is_jmp = DISAS_EXIT; ctx->base.is_jmp = DISAS_EXIT;
} }

4
target/loongarch/tlb_helper.c
View File

@ -170,8 +170,8 @@ static int get_physical_address(CPULoongArchState *env, hwaddr *physical,
int *prot, target_ulong address, int *prot, target_ulong address,
MMUAccessType access_type, int mmu_idx) MMUAccessType access_type, int mmu_idx)
{ {
int user_mode = mmu_idx == MMU_USER_IDX; int user_mode = mmu_idx == MMU_IDX_USER;
int kernel_mode = mmu_idx == MMU_KERNEL_IDX; int kernel_mode = mmu_idx == MMU_IDX_KERNEL;
uint32_t plv, base_c, base_v; uint32_t plv, base_c, base_v;
int64_t addr_high; int64_t addr_high;
uint8_t da = FIELD_EX64(env->CSR_CRMD, CSR_CRMD, DA); uint8_t da = FIELD_EX64(env->CSR_CRMD, CSR_CRMD, DA);

5
target/loongarch/translate.c
View File

@ -75,10 +75,11 @@ static void loongarch_tr_init_disas_context(DisasContextBase *dcbase,
DisasContext *ctx = container_of(dcbase, DisasContext, base); DisasContext *ctx = container_of(dcbase, DisasContext, base);
ctx->page_start = ctx->base.pc_first & TARGET_PAGE_MASK; ctx->page_start = ctx->base.pc_first & TARGET_PAGE_MASK;
ctx->plv = ctx->base.tb->flags & HW_FLAGS_PLV_MASK;
if (ctx->base.tb->flags & HW_FLAGS_CRMD_PG) { if (ctx->base.tb->flags & HW_FLAGS_CRMD_PG) {
ctx->mem_idx = ctx->base.tb->flags & HW_FLAGS_PLV_MASK; ctx->mem_idx = ctx->plv;
} else { } else {
ctx->mem_idx = MMU_DA_IDX; ctx->mem_idx = MMU_IDX_DA;
} }
/* Bound the number of insns to execute to those left on the page. */ /* Bound the number of insns to execute to those left on the page. */

3
target/loongarch/translate.h
View File

@ -29,7 +29,8 @@ typedef struct DisasContext {
DisasContextBase base; DisasContextBase base;
target_ulong page_start; target_ulong page_start;
uint32_t opcode; uint32_t opcode;
int mem_idx; uint16_t mem_idx;
uint16_t plv;
TCGv zero; TCGv zero;
/* Space for 3 operands plus 1 extra for address computation. */ /* Space for 3 operands plus 1 extra for address computation. */
TCGv temp[4]; TCGv temp[4];