[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v1 2/5] RISC-V: Move non-ops from op_helper to c
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [Qemu-devel] [PATCH v1 2/5] RISC-V: Move non-ops from op_helper to cpu_helper |
Date: |
Wed, 10 Oct 2018 21:07:20 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.0 |
On 08/10/2018 20:25, Alistair Francis wrote:
> From: Michael Clark <address@hidden>
>
> This patch makes op_helper.c contain only instruction
> operation helpers used by translate.c and moves any
> unrelated cpu helpers into cpu_helper.c. No logic is
> changed by this patch.
>
> Cc: Sagar Karandikar <address@hidden>
> Cc: Bastian Koppelmann <address@hidden>
> Cc: Palmer Dabbelt <address@hidden>
> Cc: Alistair Francis <address@hidden>
> Signed-off-by: Michael Clark <address@hidden>
> Reviewed-by: Alistair Francis <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
> ---
> target/riscv/Makefile.objs | 2 +-
> target/riscv/{helper.c => cpu_helper.c} | 35 ++++++++++++++++++++++++-
> target/riscv/op_helper.c | 34 ------------------------
> 3 files changed, 35 insertions(+), 36 deletions(-)
> rename target/riscv/{helper.c => cpu_helper.c} (95%)
>
> diff --git a/target/riscv/Makefile.objs b/target/riscv/Makefile.objs
> index abd0a7cde3..fcc5d34c1f 100644
> --- a/target/riscv/Makefile.objs
> +++ b/target/riscv/Makefile.objs
> @@ -1 +1 @@
> -obj-y += translate.o op_helper.o helper.o cpu.o fpu_helper.o gdbstub.o pmp.o
> +obj-y += translate.o op_helper.o cpu_helper.o cpu.o fpu_helper.o gdbstub.o
> pmp.o
> diff --git a/target/riscv/helper.c b/target/riscv/cpu_helper.c
> similarity index 95%
> rename from target/riscv/helper.c
> rename to target/riscv/cpu_helper.c
> index 63b3386b76..86f9f4730c 100644
> --- a/target/riscv/helper.c
> +++ b/target/riscv/cpu_helper.c
> @@ -1,5 +1,5 @@
> /*
> - * RISC-V emulation helpers for qemu.
> + * RISC-V CPU helpers for qemu.
> *
> * Copyright (c) 2016-2017 Sagar Karandikar, address@hidden
> * Copyright (c) 2017-2018 SiFive, Inc.
> @@ -72,6 +72,39 @@ bool riscv_cpu_exec_interrupt(CPUState *cs, int
> interrupt_request)
>
> #if !defined(CONFIG_USER_ONLY)
>
> +/* iothread_mutex must be held */
> +uint32_t riscv_cpu_update_mip(RISCVCPU *cpu, uint32_t mask, uint32_t value)
> +{
> + CPURISCVState *env = &cpu->env;
> + uint32_t old, new, cmp = atomic_read(&env->mip);
> +
> + do {
> + old = cmp;
> + new = (old & ~mask) | (value & mask);
> + cmp = atomic_cmpxchg(&env->mip, old, new);
> + } while (old != cmp);
> +
> + if (new && !old) {
> + cpu_interrupt(CPU(cpu), CPU_INTERRUPT_HARD);
> + } else if (!new && old) {
> + cpu_reset_interrupt(CPU(cpu), CPU_INTERRUPT_HARD);
> + }
> +
> + return old;
> +}
> +
> +void riscv_set_mode(CPURISCVState *env, target_ulong newpriv)
> +{
> + if (newpriv > PRV_M) {
> + g_assert_not_reached();
> + }
> + if (newpriv == PRV_H) {
> + newpriv = PRV_U;
> + }
> + /* tlb_flush is unnecessary as mode is contained in mmu_idx */
> + env->priv = newpriv;
> +}
> +
> /* get_physical_address - get the physical address for this virtual address
> *
> * Do a page table walk to obtain the physical address corresponding to a
> diff --git a/target/riscv/op_helper.c b/target/riscv/op_helper.c
> index d0883d329b..495390ab1c 100644
> --- a/target/riscv/op_helper.c
> +++ b/target/riscv/op_helper.c
> @@ -654,39 +654,6 @@ target_ulong helper_csrrc(CPURISCVState *env,
> target_ulong src,
>
> #ifndef CONFIG_USER_ONLY
>
> -/* iothread_mutex must be held */
> -uint32_t riscv_cpu_update_mip(RISCVCPU *cpu, uint32_t mask, uint32_t value)
> -{
> - CPURISCVState *env = &cpu->env;
> - uint32_t old, new, cmp = atomic_read(&env->mip);
> -
> - do {
> - old = cmp;
> - new = (old & ~mask) | (value & mask);
> - cmp = atomic_cmpxchg(&env->mip, old, new);
> - } while (old != cmp);
> -
> - if (new && !old) {
> - cpu_interrupt(CPU(cpu), CPU_INTERRUPT_HARD);
> - } else if (!new && old) {
> - cpu_reset_interrupt(CPU(cpu), CPU_INTERRUPT_HARD);
> - }
> -
> - return old;
> -}
> -
> -void riscv_set_mode(CPURISCVState *env, target_ulong newpriv)
> -{
> - if (newpriv > PRV_M) {
> - g_assert_not_reached();
> - }
> - if (newpriv == PRV_H) {
> - newpriv = PRV_U;
> - }
> - /* tlb_flush is unnecessary as mode is contained in mmu_idx */
> - env->priv = newpriv;
> -}
> -
> target_ulong helper_sret(CPURISCVState *env, target_ulong cpu_pc_deb)
> {
> if (!(env->priv >= PRV_S)) {
> @@ -737,7 +704,6 @@ target_ulong helper_mret(CPURISCVState *env, target_ulong
> cpu_pc_deb)
> return retpc;
> }
>
> -
> void helper_wfi(CPURISCVState *env)
> {
> CPUState *cs = CPU(riscv_env_get_cpu(env));
>
- [Qemu-devel] [PATCH v1 0/5] Misc RISC-V patches, Alistair Francis, 2018/10/08
- [Qemu-devel] [PATCH v1 1/5] RISC-V: Allow setting and clearing multiple irqs, Alistair Francis, 2018/10/08
- [Qemu-devel] [PATCH v1 2/5] RISC-V: Move non-ops from op_helper to cpu_helper, Alistair Francis, 2018/10/08
- [Qemu-devel] [PATCH v1 3/5] RISC-V: Update CSR and interrupt definitions, Alistair Francis, 2018/10/08
- [Qemu-devel] [PATCH v1 4/5] RISC-V: Add missing free for plic_hart_config, Alistair Francis, 2018/10/08
- [Qemu-devel] [PATCH v1 5/5] RISC-V: Don't add NULL bootargs to device-tree, Alistair Francis, 2018/10/08
- Re: [Qemu-devel] [PATCH v1 0/5] Misc RISC-V patches, Palmer Dabbelt, 2018/10/10