qemu-devel
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH v15 8/9] target/loongarch: Adjust functions and structure to

From: WANG Xuerui
Subject: Re: [PATCH v15 8/9] target/loongarch: Adjust functions and structure to support user-mode
Date: Thu, 9 Jun 2022 18:18:25 +0800
User-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:103.0) Gecko/20100101 Thunderbird/103.0a1 
On 2022/6/9 10:42, Song Gao wrote:

Some functions and member of the structure are different with softmmu-mode
So we need adjust them to support user-mode.

Signed-off-by: Song Gao <gaosong@loongson.cn>
Signed-off-by: Xiaojuan Yang <yangxiaojuan@loongson.cn>
---
  target/loongarch/cpu.c                        | 22 ++++++++++--
  target/loongarch/cpu.h                        |  6 ++++
  target/loongarch/helper.h                     |  5 +--
  target/loongarch/insn_trans/trans_extra.c.inc | 14 ++++++++
  .../insn_trans/trans_privileged.c.inc         | 36 +++++++++++++++++++
  target/loongarch/internals.h                  |  2 ++
  target/loongarch/op_helper.c                  | 12 +++++++
  7 files changed, 93 insertions(+), 4 deletions(-)

diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
index 4c8f96bc3a..472e258f68 100644
--- a/target/loongarch/cpu.c
+++ b/target/loongarch/cpu.c
@@ -18,7 +18,6 @@
  #include "fpu/softfloat-helpers.h"
  #include "cpu-csr.h"
  #include "sysemu/reset.h"
-#include "hw/loader.h"
const char * const regnames[32] = { 
      "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",
@@ -82,6 +81,7 @@ static void loongarch_cpu_set_pc(CPUState *cs, vaddr value)
      env->pc = value;
  }
+#ifndef CONFIG_USER_ONLY 
  #include "hw/loongarch/virt.h"
void loongarch_cpu_set_irq(void *opaque, int irq, int level) 
@@ -292,6 +292,7 @@ static bool loongarch_cpu_exec_interrupt(CPUState *cs, int 
interrupt_request)
      }
      return false;
  }
+#endif
#ifdef CONFIG_TCG 
  static void loongarch_cpu_synchronize_from_tb(CPUState *cs,
@@ -306,6 +307,9 @@ static void loongarch_cpu_synchronize_from_tb(CPUState *cs,
static bool loongarch_cpu_has_work(CPUState *cs) 
  {
+#ifdef CONFIG_USER_ONLY
+    return true;
+#else
      LoongArchCPU *cpu = LOONGARCH_CPU(cs);
      CPULoongArchState *env = &cpu->env;
      bool has_work = false;
@@ -316,6 +320,7 @@ static bool loongarch_cpu_has_work(CPUState *cs)
      }
return has_work; 
+#endif
  }
static void loongarch_la464_initfn(Object *obj) 
@@ -464,7 +469,9 @@ static void loongarch_cpu_reset(DeviceState *dev)
          env->CSR_DMW[n] = FIELD_DP64(env->CSR_DMW[n], CSR_DMW, PLV3, 0);
      }
+#ifndef CONFIG_USER_ONLY 
      env->pc = 0x1c000000;
+#endif
restore_fp_status(env); 
      cs->exception_index = -1;
@@ -495,6 +502,7 @@ static void loongarch_cpu_realizefn(DeviceState *dev, Error 
**errp)
      lacc->parent_realize(dev, errp);
  }
+#ifndef CONFIG_USER_ONLY 
  static void loongarch_qemu_write(void *opaque, hwaddr addr,
                                   uint64_t val, unsigned size)
  {
@@ -529,13 +537,16 @@ static const MemoryRegionOps loongarch_qemu_ops = {
          .max_access_size = 8,
      },
  };
+#endif
static void loongarch_cpu_init(Object *obj) 
  {
      LoongArchCPU *cpu = LOONGARCH_CPU(obj);
-    CPULoongArchState *env = &cpu->env;
+#ifdef CONFIG_USER_ONLY 
      cpu_set_cpustate_pointers(cpu);
+#else
+    CPULoongArchState *env = &cpu->env;
      qdev_init_gpio_in(DEVICE(cpu), loongarch_cpu_set_irq, N_IRQS);
      timer_init_ns(&cpu->timer, QEMU_CLOCK_VIRTUAL,
                    &loongarch_constant_timer_cb, cpu);
@@ -545,6 +556,7 @@ static void loongarch_cpu_init(Object *obj)
      memory_region_init_io(&env->iocsr_mem, OBJECT(cpu), &loongarch_qemu_ops,
                            NULL, "iocsr_misc", 0x428);
      memory_region_add_subregion(&env->system_iocsr, 0, &env->iocsr_mem);
+#endif
  }
static ObjectClass *loongarch_cpu_class_by_name(const char *cpu_model) 
@@ -612,18 +624,22 @@ static struct TCGCPUOps loongarch_tcg_ops = {
      .initialize = loongarch_translate_init,
      .synchronize_from_tb = loongarch_cpu_synchronize_from_tb,
+#ifndef CONFIG_USER_ONLY 
      .tlb_fill = loongarch_cpu_tlb_fill,
      .cpu_exec_interrupt = loongarch_cpu_exec_interrupt,
      .do_interrupt = loongarch_cpu_do_interrupt,
      .do_transaction_failed = loongarch_cpu_do_transaction_failed,
+#endif
  };
  #endif /* CONFIG_TCG */
+#ifndef CONFIG_USER_ONLY 
  #include "hw/core/sysemu-cpu-ops.h"
static const struct SysemuCPUOps loongarch_sysemu_ops = { 
      .get_phys_page_debug = loongarch_cpu_get_phys_page_debug,
  };
+#endif
static void loongarch_cpu_class_init(ObjectClass *c, void *data) 
  {
@@ -639,8 +655,10 @@ static void loongarch_cpu_class_init(ObjectClass *c, void 
*data)
      cc->has_work = loongarch_cpu_has_work;
      cc->dump_state = loongarch_cpu_dump_state;
      cc->set_pc = loongarch_cpu_set_pc;
+#ifndef CONFIG_USER_ONLY
      dc->vmsd = &vmstate_loongarch_cpu;
      cc->sysemu_ops = &loongarch_sysemu_ops;
+#endif
      cc->disas_set_info = loongarch_cpu_disas_set_info;
      cc->gdb_read_register = loongarch_cpu_gdb_read_register;
      cc->gdb_write_register = loongarch_cpu_gdb_write_register;
diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h
index 71a5036c3c..19eed2f0c1 100644
--- a/target/loongarch/cpu.h
+++ b/target/loongarch/cpu.h
@@ -303,6 +303,7 @@ typedef struct CPUArchState {
      uint64_t CSR_DERA;
      uint64_t CSR_DSAVE;
+#ifndef CONFIG_USER_ONLY 
      LoongArchTLB  tlb[LOONGARCH_TLB_MAX];
AddressSpace address_space_iocsr; 
@@ -310,6 +311,7 @@ typedef struct CPUArchState {
      MemoryRegion iocsr_mem;
      bool load_elf;
      uint64_t elf_address;
+#endif
  } CPULoongArchState;
/** 
@@ -360,12 +362,16 @@ struct LoongArchCPUClass {
static inline int cpu_mmu_index(CPULoongArchState *env, bool ifetch) 
  {
+#ifdef CONFIG_USER_ONLY
+    return MMU_USER_IDX;
+#else
      uint8_t pg = FIELD_EX64(env->CSR_CRMD, CSR_CRMD, PG);
if (!pg) { 
          return MMU_DA_IDX;
      }
      return FIELD_EX64(env->CSR_CRMD, CSR_CRMD, PLV);
+#endif
  }
static inline void cpu_get_tb_cpu_state(CPULoongArchState *env, 
diff --git a/target/loongarch/helper.h b/target/loongarch/helper.h
index 85c11a60d4..ee42707868 100644
--- a/target/loongarch/helper.h
+++ b/target/loongarch/helper.h
@@ -93,8 +93,7 @@ DEF_HELPER_2(frint_d, i64, env, i64)
DEF_HELPER_FLAGS_2(set_rounding_mode, TCG_CALL_NO_RWG, void, env, i32) -DEF_HELPER_1(rdtime_d, i64, env) 
-
+#ifndef CONFIG_USER_ONLY
  /* CSRs helper */
  DEF_HELPER_1(csrrd_pgd, i64, env)
  DEF_HELPER_1(csrrd_tval, i64, env)
@@ -128,3 +127,5 @@ DEF_HELPER_4(lddir, tl, env, tl, tl, i32)
  DEF_HELPER_4(ldpte, void, env, tl, tl, i32)
  DEF_HELPER_1(ertn, void, env)
  DEF_HELPER_1(idle, void, env)
+DEF_HELPER_1(rdtime_d, i64, env)
+#endif
diff --git a/target/loongarch/insn_trans/trans_extra.c.inc 
b/target/loongarch/insn_trans/trans_extra.c.inc
index ad713cd61e..f1980497ac 100644
--- a/target/loongarch/insn_trans/trans_extra.c.inc
+++ b/target/loongarch/insn_trans/trans_extra.c.inc
@@ -33,6 +33,7 @@ static bool trans_asrtgt_d(DisasContext *ctx, arg_asrtgt_d * 
a)
      return true;
  }
+#ifndef CONFIG_USER_ONLY 
  static bool gen_rdtime(DisasContext *ctx, arg_rr *a,
                         bool word, bool high)
  {
@@ -50,20 +51,33 @@ static bool gen_rdtime(DisasContext *ctx, arg_rr *a,
return true; 
  }
+#endif
static bool trans_rdtimel_w(DisasContext *ctx, arg_rdtimel_w *a) 
  {
+#ifdef CONFIG_USER_ONLY
+    return cpu_get_host_ticks();
+#else
      return gen_rdtime(ctx, a, 1, 0);
+#endif
  }
static bool trans_rdtimeh_w(DisasContext *ctx, arg_rdtimeh_w *a) 
  {
+#ifdef CONFIG_USER_ONLY
+    return cpu_get_host_ticks();
+#else
This can't be right, we need to return only the high part for rdtimeh.w but I didn't see any such processing. I see ">> 32" in the target/riscv code so we want something like this here too... 
      return gen_rdtime(ctx, a, 1, 1);
+#endif
  }
static bool trans_rdtime_d(DisasContext *ctx, arg_rdtime_d *a) 
  {
+#ifdef CONFIG_USER_ONLY
+    return cpu_get_host_ticks();
+#else
      return gen_rdtime(ctx, a, 0, 0);
+#endif
  }
static bool trans_cpucfg(DisasContext *ctx, arg_cpucfg *a) 
diff --git a/target/loongarch/insn_trans/trans_privileged.c.inc 
b/target/loongarch/insn_trans/trans_privileged.c.inc
index 53596c4f77..9c4dcbfcfb 100644
--- a/target/loongarch/insn_trans/trans_privileged.c.inc
+++ b/target/loongarch/insn_trans/trans_privileged.c.inc
@@ -7,6 +7,41 @@
#include "cpu-csr.h" +#ifdef CONFIG_USER_ONLY 
+
+#define GEN_FALSE_TRANS(name)   \
+static bool trans_##name(DisasContext *ctx, arg_##name * a)  \
+{   \
+    return false;   \
+}
+
+GEN_FALSE_TRANS(csrrd)
+GEN_FALSE_TRANS(csrwr)
+GEN_FALSE_TRANS(csrxchg)
+GEN_FALSE_TRANS(iocsrrd_b)
+GEN_FALSE_TRANS(iocsrrd_h)
+GEN_FALSE_TRANS(iocsrrd_w)
+GEN_FALSE_TRANS(iocsrrd_d)
+GEN_FALSE_TRANS(iocsrwr_b)
+GEN_FALSE_TRANS(iocsrwr_h)
+GEN_FALSE_TRANS(iocsrwr_w)
+GEN_FALSE_TRANS(iocsrwr_d)
+GEN_FALSE_TRANS(tlbsrch)
+GEN_FALSE_TRANS(tlbrd)
+GEN_FALSE_TRANS(tlbwr)
+GEN_FALSE_TRANS(tlbfill)
+GEN_FALSE_TRANS(tlbclr)
+GEN_FALSE_TRANS(tlbflush)
+GEN_FALSE_TRANS(invtlb)
+GEN_FALSE_TRANS(cacop)
+GEN_FALSE_TRANS(ldpte)
+GEN_FALSE_TRANS(lddir)
+GEN_FALSE_TRANS(ertn)
+GEN_FALSE_TRANS(dbcl)
+GEN_FALSE_TRANS(idle)
+
+#else
+
  typedef void (*GenCSRRead)(TCGv dest, TCGv_ptr env);
  typedef void (*GenCSRWrite)(TCGv dest, TCGv_ptr env, TCGv src);
@@ -464,3 +499,4 @@ static bool trans_idle(DisasContext *ctx, arg_idle *a) 
      ctx->base.is_jmp = DISAS_NORETURN;
      return true;
  }
+#endif
diff --git a/target/loongarch/internals.h b/target/loongarch/internals.h
index 9d50fbdd81..ebca7a1a25 100644
--- a/target/loongarch/internals.h
+++ b/target/loongarch/internals.h
@@ -33,6 +33,7 @@ const char *loongarch_exception_name(int32_t exception);
void restore_fp_status(CPULoongArchState *env); +#ifndef CONFIG_USER_ONLY 
  extern const VMStateDescription vmstate_loongarch_cpu;
void loongarch_cpu_set_irq(void *opaque, int irq, int level); 
@@ -48,6 +49,7 @@ bool loongarch_cpu_tlb_fill(CPUState *cs, vaddr address, int 
size,
                              bool probe, uintptr_t retaddr);
hwaddr loongarch_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); 
+#endif
int loongarch_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n); 
  int loongarch_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n);
diff --git a/target/loongarch/op_helper.c b/target/loongarch/op_helper.c
index d87049851f..49fbd1343c 100644
--- a/target/loongarch/op_helper.c
+++ b/target/loongarch/op_helper.c
@@ -49,14 +49,24 @@ target_ulong helper_bitswap(target_ulong v)
  void helper_asrtle_d(CPULoongArchState *env, target_ulong rj, target_ulong rk)
  {
      if (rj > rk) {
+#ifdef CONFIG_USER_ONLY
+        cpu_loop_exit_sigsegv(env_cpu(env), GETPC(),
+                              MMU_DATA_LOAD, true, GETPC());
+#else
          do_raise_exception(env, EXCCODE_ADEM, GETPC());
+#endif
      }
  }
void helper_asrtgt_d(CPULoongArchState *env, target_ulong rj, target_ulong rk) 
  {
      if (rj <= rk) {
+#ifdef CONFIG_USER_ONLY
+        cpu_loop_exit_sigsegv(env_cpu(env), GETPC(),
+                              MMU_DATA_LOAD, true, GETPC());
+#else
          do_raise_exception(env, EXCCODE_ADEM, GETPC());
+#endif
      }
  }
@@ -84,6 +94,7 @@ target_ulong helper_cpucfg(CPULoongArchState *env, target_ulong rj) 
      return rj > 21 ? 0 : env->cpucfg[rj];
  }
+#ifndef CONFIG_USER_ONLY 
  uint64_t helper_rdtime_d(CPULoongArchState *env)
  {
      uint64_t plv;
@@ -131,3 +142,4 @@ void helper_idle(CPULoongArchState *env)
      cs->halted = 1;
      do_raise_exception(env, EXCP_HLT, 0);
  }
+#endif


The other parts seem to be good.

With the rdtime[lh].w bug fixed:

Reviewed-by: WANG Xuerui <git@xen0n.name>
reply via email to
[Prev in Thread] Current Thread [Next in Thread]