target/openrisc updates
cover target/openrisc updates
The bulk of this patch set is 2-3 years old, and was mostly reviewed by Bastian Koppelmann. But it languished because there were reports of it not booting kernel images, and I had problems putting together a set of tools that could even build a kernel.
The OpenRISC community has picked up activity recently, with Stafford Horne upstreaming some of the compiler tools. He has even done some testing for me of this patch set.
r~
Richard Henderson (21):
target/openrisc: Rename the cpu from or32 to or1k
linux-user: Add MMAP_SHIFT for openrisc
linux-user: Fix openrisc cpu_loop
target/openrisc: Implement lwa, swa
target/openrisc: Tidy insn dumping
target/openrisc: Rationalize immediate extraction target/openrisc: Streamline arithmetic and OVE target/openrisc: Put SR[OVE] in TB flags target/openrisc: Invert the decoding in dec_calc target/openrisc: Keep SR_F in a separate variable target/openrisc: Keep SR_CY and SR_OV in a separate variables target/openrisc: Use movcond where appropriate target/openrisc: Set flags on helpers target/openrisc: Enable trap, csync, msync, psync for user mode target/openrisc: Implement msync
target/openrisc: Represent MACHI:MACLO as a single unit target/openrisc: Implement muld, muldu, macu, msbu target/openrisc: Fix madd
target/openrisc: Optimize l.jal to next target/openrisc: Tidy ppc/npc implementation target/openrisc: Tidy handling of delayed branches
Stafford Horne (1):
target/openrisc: Fix exception handling status registers
configure | 6 +- default-configs/or1k-linux-user.mak | 1 + default-configs/or1k-softmmu.mak | 4 + default-configs/or32-linux-user.mak | 1 - default-configs/or32-softmmu.mak | 4 - hw/openrisc/openrisc_sim.c | 4 +- linux-user/main.c | 95 ++- linux-user/openrisc/target_syscall.h | 2 + target/openrisc/Makefile.objs | 2 +- target/openrisc/cpu.c | 1 + target/openrisc/cpu.h | 47 +- target/openrisc/exception_helper.c | 31 + target/openrisc/fpu_helper.c | 68 +- target/openrisc/gdbstub.c | 17 +- target/openrisc/helper.h | 33 +- target/openrisc/int_helper.c | 61 -- target/openrisc/interrupt.c | 14 +- target/openrisc/interrupt_helper.c | 4 +- target/openrisc/machine.c | 62 +- target/openrisc/mmu.c | 1 + target/openrisc/sys_helper.c | 62 +- target/openrisc/translate.c | 1314 +++++++++++++++------------------- tests/tcg/openrisc/Makefile | 4 +- 23 files changed, 851 insertions(+), 987 deletions(-) create mode 100644 default-configs/or1k-linux-user.mak create mode 100644 default-configs/or1k-softmmu.mak delete mode 100644 default-configs/or32-linux-user.mak delete mode 100644 default-configs/or32-softmmu.mak delete mode 100644 target/openrisc/int_helper.c
Signature · 1 line
2.9.3
PATCH 1/22 target/openrisc: Rename the cpu from or32 to or1k
This is in keeping with the toolchain and or1ksim.
--- configure | 6 +++--- default-configs/or1k-linux-user.mak | 1 + default-configs/or1k-softmmu.mak | 4 ++++ default-configs/or32-linux-user.mak | 1 - default-configs/or32-softmmu.mak | 4 ---- hw/openrisc/openrisc_sim.c | 4 ++-- target/openrisc/cpu.h | 2 +- tests/tcg/openrisc/Makefile | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 default-configs/or1k-linux-user.mak create mode 100644 default-configs/or1k-softmmu.mak delete mode 100644 default-configs/or32-linux-user.mak delete mode 100644 default-configs/or32-softmmu.mak
configure +3 -3
@@ -5843,7 +5843,7 @@ target_name=$(echo $target | cut -d '-' -f 1) target_bigendian="no" case "$target_name" in - armeb|hppa|lm32|m68k|microblaze|mips|mipsn32|mips64|moxie|or32|ppc|ppcemb|ppc64|ppc64abi32|s390x|sh4eb|sparc|sparc64|sparc32plus|xtensaeb) + armeb|hppa|lm32|m68k|microblaze|mips|mipsn32|mips64|moxie|or1k|ppc|ppcemb|ppc64|ppc64abi32|s390x|sh4eb|sparc|sparc64|sparc32plus|xtensaeb) target_bigendian=yes ;; esac
@@ -5937,7 +5937,7 @@ case "$target_name" in ;; nios2) ;; - or32) + or1k) TARGET_ARCH=openrisc TARGET_BASE_ARCH=openrisc ;;
@@ -6145,7 +6145,7 @@ for i in $ARCH $TARGET_BASE_ARCH ; do nios2) disas_config "NIOS2" ;; - or32) + or1k) disas_config "OPENRISC" ;; ppc*)
default-configs/or1k-linux-user.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for or1k-linux-user
default-configs/or1k-softmmu.mak new file +4 -0
@@ -0,0 +1,4 @@ +# Default configuration for or1k-softmmu + +CONFIG_SERIAL=y +CONFIG_OPENCORES_ETH=y
default-configs/or32-linux-user.mak deleted +0 -1
@@ -1 +0,0 @@ -# Default configuration for or32-linux-user
default-configs/or32-softmmu.mak deleted +0 -4
@@ -1,4 +0,0 @@ -# Default configuration for or32-softmmu - -CONFIG_SERIAL=y -CONFIG_OPENCORES_ETH=y
hw/openrisc/openrisc_sim.c +2 -2
@@ -139,10 +139,10 @@ static void openrisc_sim_init(MachineState *machine)static void openrisc_sim_machine_init (MachineClass *mc) { - mc->desc ="or32 simulation" ; + mc->desc ="or1k simulation" ; mc->init = openrisc_sim_init; mc->max_cpus =1 ; mc->is_default =1 ; } -DEFINE_MACHINE ("or32-sim" , openrisc_sim_machine_init) +DEFINE_MACHINE ("or1k-sim" , openrisc_sim_machine_init)
target/openrisc/cpu.h +1 -1
@@ -32,7 +32,7 @@ struct OpenRISCCPU;#include "fpu/softfloat.h" #include "qom/cpu.h" -#define TYPE_OPENRISC_CPU "or32-cpu" +#define TYPE_OPENRISC_CPU "or1k-cpu"#define OPENRISC_CPU_CLASS (klass) \ OBJECT_CLASS_CHECK(OpenRISCCPUClass, (klass), TYPE_OPENRISC_CPU)
tests/tcg/openrisc/Makefile +2 -2
@@ -1,8 +1,8 @@ -include ../../config-host.mak -CROSS = or32-linux- +CROSS = or1k-linux- -SIM = qemu-or32 +SIM = qemu-or1k CC = $(CROSS)gcc
Signature · 1 line
2.9.3
PATCH 3/22 linux-user: Fix openrisc cpu_loop
In reply to Richard HendersonWe need to handle EXCP_DEBUG and EXCP_INTERRUPT. We need to send signals to the guest using queue_signal.
--- linux-user/main.c | 95 ++++++++++++++++++++++++------------------------------- 1 file changed, 41 insertions(+), 54 deletions(-)
linux-user/main.c +41 -54
@@ -2574,52 +2574,17 @@ kuser_fail:void cpu_loop (CPUOpenRISCState *env) {CPUState *cs =CPU (openrisc_env_get_cpu (env)); -int trapnr, gdbsig; +int trapnr;abi_long ret; +target_siginfo_t info;for (;;) {cpu_exec_start (cs); trapnr =cpu_exec (cs);cpu_exec_end (cs);process_queued_cpu_work (cs); - gdbsig =0 ;switch (trapnr) { -case EXCP_RESET : -qemu_log_mask (CPU_LOG_INT ,"\nReset request, exit, pc is %#x\n" , env->pc); -exit (EXIT_FAILURE ); -break ; -case EXCP_BUSERR : -qemu_log_mask (CPU_LOG_INT ,"\nBus error, exit, pc is %#x\n" , env->pc); - gdbsig =TARGET_SIGBUS ; -break ; -case EXCP_DPF : -case EXCP_IPF : -cpu_dump_state (cs, stderr, fprintf,0 ); - gdbsig =TARGET_SIGSEGV ; -break ; -case EXCP_TICK : -qemu_log_mask (CPU_LOG_INT ,"\nTick time interrupt pc is %#x\n" , env->pc); -break ; -case EXCP_ALIGN : -qemu_log_mask (CPU_LOG_INT ,"\nAlignment pc is %#x\n" , env->pc); - gdbsig =TARGET_SIGBUS ; -break ; -case EXCP_ILLEGAL : -qemu_log_mask (CPU_LOG_INT ,"\nIllegal instructionpc is %#x\n" , env->pc); - gdbsig =TARGET_SIGILL ; -break ; -case EXCP_INT : -qemu_log_mask (CPU_LOG_INT ,"\nExternal interruptpc is %#x\n" , env->pc); -break ; -case EXCP_DTLBMISS : -case EXCP_ITLBMISS : -qemu_log_mask (CPU_LOG_INT ,"\nTLB miss\n" ); -break ; -case EXCP_RANGE : -qemu_log_mask (CPU_LOG_INT ,"\nRange\n" ); - gdbsig =TARGET_SIGSEGV ; -break ;case EXCP_SYSCALL : env->pc +=4 ;/* 0xc00; */ ret = do_syscall(env,
@@ -2636,32 +2601,54 @@ void cpu_loop(CPUOpenRISCState *env) env->gpr[11 ] = ret; }break ; +case EXCP_DPF : +case EXCP_IPF : +case EXCP_RANGE : + info.si_signo =TARGET_SIGSEGV ; + info.si_errno =0 ; + info.si_code =TARGET_SEGV_MAPERR ; + info._sifields._sigfault._addr = env->pc; +queue_signal (env, info.si_signo,QEMU_SI_FAULT , &info); +break ; +case EXCP_ALIGN : + info.si_signo =TARGET_SIGBUS ; + info.si_errno =0 ; + info.si_code =TARGET_BUS_ADRALN ; + info._sifields._sigfault._addr = env->pc; +queue_signal (env, info.si_signo,QEMU_SI_FAULT , &info); +break ; +case EXCP_ILLEGAL : + info.si_signo =TARGET_SIGILL ; + info.si_errno =0 ; + info.si_code =TARGET_ILL_ILLOPC ; + info._sifields._sigfault._addr = env->pc; +queue_signal (env, info.si_signo,QEMU_SI_FAULT , &info); +break ;case EXCP_FPE : -qemu_log_mask (CPU_LOG_INT ,"\nFloating point error\n" ); + info.si_signo =TARGET_SIGFPE ; + info.si_errno =0 ; + info.si_code =0 ; + info._sifields._sigfault._addr = env->pc; +queue_signal (env, info.si_signo,QEMU_SI_FAULT , &info);break ; -case EXCP_TRAP : -qemu_log_mask (CPU_LOG_INT ,"\nTrap\n" ); - gdbsig =TARGET_SIGTRAP ; +case EXCP_INTERRUPT : +/* We processed the pending cpu work above. */ break ; -case EXCP_NR : -qemu_log_mask (CPU_LOG_INT ,"\nNR\n" ); +case EXCP_DEBUG : + trapnr =gdb_handlesig (cs,TARGET_SIGTRAP ); +if (trapnr) { + info.si_signo = trapnr; + info.si_errno =0 ; + info.si_code =TARGET_TRAP_BRKPT ; +queue_signal (env, info.si_signo,QEMU_SI_FAULT , &info); + }break ;case EXCP_ATOMIC :cpu_exec_step_atomic (cs);break ;default : -EXCP_DUMP (env,"\nqemu: unhandled CPU exception %#x - aborting\n" , - trapnr); - gdbsig =TARGET_SIGILL ; -break ; - } -if (gdbsig) { -gdb_handlesig (cs, gdbsig); -if (gdbsig !=TARGET_SIGTRAP ) { -exit (EXIT_FAILURE ); - } +g_assert_not_reached (); } -process_pending_signals (env); } }
Signature · 1 line
2.9.3
PATCH 4/22 target/openrisc: Fix exception handling status registers
In reply to Richard HendersonFrom: Stafford Horne <[email protected]>
I am working on testing instruction emulation patches for the linux kernel. During testing I found these 2 issues:
- sets DSX (delay slot exception) but never clears it
- EEAR for illegal insns should point to the bad exception (as per openrisc spec) but its not
This patch fixes these two issues by clearing the DSX flag when not in a delay slot and by setting EEAR to exception PC when handling illegal instruction exceptions.
After this patch the openrisc kernel with latest patches boots great on qemu and instruction emulation works.
Message-Id: <[email protected]>
--- target/openrisc/interrupt.c | 7 +++++++ 1 file changed, 7 insertions(+)
target/openrisc/interrupt.c +7 -0
@@ -38,10 +38,17 @@ void openrisc_cpu_do_interrupt(CPUState *cs) env->flags &= ~D_FLAG ; env->sr |=SR_DSX ; env->epcr -=4 ; + }else { + env->sr &= ~SR_DSX ; }if (cs->exception_index ==EXCP_SYSCALL ) { env->epcr +=4 ; } +/* When we have an illegal instruction the error effective address +shall be set to the illegal instruction address. */ +if (cs->exception_index ==EXCP_ILLEGAL ) { + env->eear = env->pc; + }/* For machine-state changed between user-mode and supervisor mode, we need flush TLB when we enter&exit EXCP. */
Signature · 1 line
2.9.3
PATCH 5/22 target/openrisc: Implement lwa, swa
In reply to Richard Henderson--- target/openrisc/cpu.c | 1 + target/openrisc/cpu.h | 3 ++ target/openrisc/interrupt.c | 1 + target/openrisc/interrupt_helper.c | 1 + target/openrisc/machine.c | 24 ++++++++++------ target/openrisc/mmu.c | 1 + target/openrisc/translate.c | 58 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 81 insertions(+), 8 deletions(-)
target/openrisc/cpu.c +1 -0
@@ -48,6 +48,7 @@ static void openrisc_cpu_reset(CPUState *s) cpu->env.pc =0x100 ; cpu->env.sr =SR_FO |SR_SM ; + cpu->env.lock_addr =-1 ; s->exception_index =-1 ; cpu->env.upr =UPR_UP |UPR_DMP |UPR_IMP |UPR_PICP |UPR_TTP ;
target/openrisc/cpu.h +3 -0
@@ -296,6 +296,9 @@ typedef struct CPUOpenRISCState {uint32_t fpcsr;/* Float register */ float_status fp_status; +target_ulong lock_addr; +target_ulong lock_value; +uint32_t flags;/* cpu_flags, we only use it for exception in solt so far. */ uint32_t btaken;/* the SR_F bit */
target/openrisc/interrupt.c +1 -0
@@ -62,6 +62,7 @@ void openrisc_cpu_do_interrupt(CPUState *cs) env->sr &= ~SR_TEE ; env->tlb->cpu_openrisc_map_address_data = &cpu_openrisc_get_phys_nommu; env->tlb->cpu_openrisc_map_address_code = &cpu_openrisc_get_phys_nommu; + env->lock_addr =-1 ;if (cs->exception_index >0 && cs->exception_index <EXCP_NR ) { env->pc = (cs->exception_index <<8 );
target/openrisc/interrupt_helper.c +1 -0
@@ -34,6 +34,7 @@ void HELPER(rfe)(CPUOpenRISCState *env) cpu->env.pc = cpu->env.epcr; cpu->env.npc = cpu->env.epcr; cpu->env.sr = cpu->env.esr; + cpu->env.lock_addr =-1 ;#ifndef CONFIG_USER_ONLY if (cpu->env.sr &SR_DME ) {
target/openrisc/machine.c +16 -8
@@ -26,18 +26,26 @@static const VMStateDescription vmstate_env = { .name ="env" , - .version_id =1 , - .minimum_version_id =1 , + .version_id =2 , + .minimum_version_id =2 , .fields = (VMStateField []) { -VMSTATE_UINT32_ARRAY (gpr, CPUOpenRISCState,32 ), +VMSTATE_UINTTL_ARRAY (gpr, CPUOpenRISCState,32 ), +VMSTATE_UINTTL (pc, CPUOpenRISCState), +VMSTATE_UINTTL (npc, CPUOpenRISCState), +VMSTATE_UINTTL (ppc, CPUOpenRISCState), +VMSTATE_UINTTL (jmp_pc, CPUOpenRISCState), +VMSTATE_UINTTL (lock_addr, CPUOpenRISCState), +VMSTATE_UINTTL (lock_value, CPUOpenRISCState), +VMSTATE_UINTTL (epcr, CPUOpenRISCState), +VMSTATE_UINTTL (eear, CPUOpenRISCState),VMSTATE_UINT32 (sr, CPUOpenRISCState), -VMSTATE_UINT32 (epcr, CPUOpenRISCState), -VMSTATE_UINT32 (eear, CPUOpenRISCState), +VMSTATE_UINT32 (vr, CPUOpenRISCState), +VMSTATE_UINT32 (upr, CPUOpenRISCState), +VMSTATE_UINT32 (cpucfgr, CPUOpenRISCState), +VMSTATE_UINT32 (dmmucfgr, CPUOpenRISCState), +VMSTATE_UINT32 (immucfgr, CPUOpenRISCState),VMSTATE_UINT32 (esr, CPUOpenRISCState),VMSTATE_UINT32 (fpcsr, CPUOpenRISCState), -VMSTATE_UINT32 (pc, CPUOpenRISCState), -VMSTATE_UINT32 (npc, CPUOpenRISCState), -VMSTATE_UINT32 (ppc, CPUOpenRISCState),VMSTATE_END_OF_LIST () } };
target/openrisc/mmu.c +1 -0
@@ -174,6 +174,7 @@ static void cpu_openrisc_raise_mmu_exception(OpenRISCCPU *cpu, cs->exception_index = exception; cpu->env.eear = address; + cpu->env.lock_addr =-1 ; }#ifndef CONFIG_USER_ONLY
target/openrisc/translate.c +58 -0
88 lines not on this page · raw message
Signature · 1 line
2.9.3
PATCH 6/22 target/openrisc: Tidy insn dumping
In reply to Richard HendersonAvoids warnings from unused variables etc.
--- target/openrisc/translate.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-)
target/openrisc/translate.c +12 -24
@@ -34,14 +34,8 @@#include "trace-tcg.h" #include "exec/log.h" - -#define OPENRISC_DISAS - -#ifdef OPENRISC_DISAS -# define LOG_DIS (...) qemu_log_mask(CPU_LOG_TB_IN_ASM, ## __VA_ARGS__) -#else -# define LOG_DIS (...) do { } while (0) -#endif +#define LOG_DIS (str, ...) \ + qemu_log_mask(CPU_LOG_TB_IN_ASM, "%08x: " str, dc->pc, ## __VA_ARGS__) typedef struct DisasContext { TranslationBlock *tb;
@@ -766,9 +760,7 @@ static void dec_misc(DisasContext *dc, uint32_t insn) {uint32_t op0, op1;uint32_t ra, rb, rd; -#ifdef OPENRISC_DISAS uint32_t L6 ,K5 ; -#endif uint32_t I16 ,I5 ,I11 ,N26 , tmp;TCGMemOp mop;
@@ -777,10 +769,8 @@ static void dec_misc(DisasContext *dc, uint32_t insn) ra =extract32 (insn,16 ,5 ); rb =extract32 (insn,11 ,5 ); rd =extract32 (insn,21 ,5 ); -#ifdef OPENRISC_DISAS L6 =extract32 (insn,5 ,6 );K5 =extract32 (insn,0 ,5 ); -#endif I16 =extract32 (insn,0 ,16 );I5 =extract32 (insn,21 ,5 );I11 =extract32 (insn,0 ,11 );
@@ -1387,13 +1377,10 @@ static void dec_compi(DisasContext *dc, uint32_t insn)static void dec_sys (DisasContext *dc,uint32_t insn) {uint32_t op0; -#ifdef OPENRISC_DISAS uint32_t K16 ; -#endif + op0 =extract32 (insn,16 ,10 ); -#ifdef OPENRISC_DISAS K16 =extract32 (insn,0 ,16 ); -#endif switch (op0) {case 0x000 :/* l.sys */
@@ -1723,6 +1710,13 @@ void gen_intermediate_code(CPUOpenRISCState *env, struct TranslationBlock *tb) max_insns =TCG_MAX_INSNS ; } +if (qemu_loglevel_mask (CPU_LOG_TB_IN_ASM ) + &&qemu_log_in_addr_range (pc_start)) { +qemu_log_lock (); +qemu_log ("----------------\n" ); +qemu_log ("IN: %s\n" ,lookup_symbol (pc_start)); + } +gen_tb_start (tb); do {
@@ -1807,18 +1801,12 @@ void gen_intermediate_code(CPUOpenRISCState *env, struct TranslationBlock *tb) tb->size = dc->pc - pc_start; tb->icount = num_insns; -#ifdef DEBUG_DISAS if (qemu_loglevel_mask (CPU_LOG_TB_IN_ASM ) &&qemu_log_in_addr_range (pc_start)) { -qemu_log_lock (); -qemu_log ("----------------\n" ); -qemu_log ("IN: %s\n" ,lookup_symbol (pc_start)); -log_target_disas (cs, pc_start, dc->pc - pc_start,0 ); -qemu_log ("\nisize=%d osize=%d\n" , - dc->pc - pc_start,tcg_op_buf_count ()); +log_target_disas (cs, pc_start, tb->size,0 ); +qemu_log ("\n" );qemu_log_unlock (); } -#endif } void openrisc_cpu_dump_state(CPUState *cs, FILE *f,
Signature · 1 line
2.9.3
Re: [Qemu-devel] [PATCH 06/22] target/openrisc: Tidy insn dumping
Quoted 4 lines · Richard Henderson
Avoids warnings from unused variables etc.
Reviewed-by Bastian Koppelmann <[email protected]>Signed-off-by Richard Henderson <[email protected]>
Quoted 97 lines
--- target/openrisc/translate.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-)target/openrisc/translate.c +12
-24@@ -34,14 +34,8 @@#include "trace-tcg.h" #include "exec/log.h" - -#define OPENRISC_DISAS - -#ifdef OPENRISC_DISAS -# define LOG_DIS (...) qemu_log_mask(CPU_LOG_TB_IN_ASM, ## __VA_ARGS__) -#else -# define LOG_DIS (...) do { } while (0) -#endif +#define LOG_DIS (str, ...) \ + qemu_log_mask(CPU_LOG_TB_IN_ASM, "%08x: " str, dc->pc, ## __VA_ARGS__) typedef struct DisasContext { TranslationBlock *tb;@@ -766,9 +760,7 @@ static void dec_misc(DisasContext *dc, uint32_t insn) {uint32_t op0, op1;uint32_t ra, rb, rd; -#ifdef OPENRISC_DISAS uint32_t L6 ,K5 ; -#endif uint32_t I16 ,I5 ,I11 ,N26 , tmp;TCGMemOp mop;@@ -777,10 +769,8 @@ static void dec_misc(DisasContext *dc, uint32_t insn) ra =extract32 (insn,16 ,5 ); rb =extract32 (insn,11 ,5 ); rd =extract32 (insn,21 ,5 ); -#ifdef OPENRISC_DISAS L6 =extract32 (insn,5 ,6 );K5 =extract32 (insn,0 ,5 ); -#endif I16 =extract32 (insn,0 ,16 );I5 =extract32 (insn,21 ,5 );I11 =extract32 (insn,0 ,11 );@@ -1387,13 +1377,10 @@ static void dec_compi(DisasContext *dc, uint32_t insn)static void dec_sys (DisasContext *dc,uint32_t insn) {uint32_t op0; -#ifdef OPENRISC_DISAS uint32_t K16 ; -#endif + op0 =extract32 (insn,16 ,10 ); -#ifdef OPENRISC_DISAS K16 =extract32 (insn,0 ,16 ); -#endif switch (op0) {case 0x000 :/* l.sys */ @@ -1723,6 +1710,13 @@ void gen_intermediate_code(CPUOpenRISCState *env, struct TranslationBlock *tb) max_insns =TCG_MAX_INSNS ; } +if (qemu_loglevel_mask (CPU_LOG_TB_IN_ASM ) + &&qemu_log_in_addr_range (pc_start)) { +qemu_log_lock (); +qemu_log ("----------------\n" ); +qemu_log ("IN: %s\n" ,lookup_symbol (pc_start)); + } +gen_tb_start (tb); do {@@ -1807,18 +1801,12 @@ void gen_intermediate_code(CPUOpenRISCState *env, struct TranslationBlock *tb) tb->size = dc->pc - pc_start; tb->icount = num_insns; -#ifdef DEBUG_DISAS if (qemu_loglevel_mask (CPU_LOG_TB_IN_ASM ) &&qemu_log_in_addr_range (pc_start)) { -qemu_log_lock (); -qemu_log ("----------------\n" ); -qemu_log ("IN: %s\n" ,lookup_symbol (pc_start)); -log_target_disas (cs, pc_start, dc->pc - pc_start,0 ); -qemu_log ("\nisize=%d osize=%d\n" , - dc->pc - pc_start,tcg_op_buf_count ()); +log_target_disas (cs, pc_start, tb->size,0 ); +qemu_log ("\n" );qemu_log_unlock (); } -#endif } void openrisc_cpu_dump_state(CPUState *cs, FILE *f,
PATCH 7/22 target/openrisc: Rationalize immediate extraction
In reply to Richard HendersonThe architecture manual is consistent in using "I" for signed fields and "K" for unsigned fields. Mirror that.
--- target/openrisc/translate.c | 98 ++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 58 deletions(-)
target/openrisc/translate.c +40 -58
@@ -129,23 +129,6 @@ static inline void wb_SR_F(void)gen_set_label (label); } -static inline int zero_extend (unsigned int val,int width) -{ -return val & ((1 << width) -1 ); -} - -static inline int sign_extend (unsigned int val,int width) -{ -int sval; - -/* LSL */ - val <<=TARGET_LONG_BITS - width; - sval = val; -/* ASR. */ - sval >>=TARGET_LONG_BITS - width; -return sval; -} -static inline void gen_sync_flags (DisasContext *dc) {/* Sync the tb dependent flag between translate and runtime. */
@@ -221,11 +204,9 @@ static void gen_goto_tb(DisasContext *dc, int n, target_ulong dest) } } -static void gen_jump (DisasContext *dc,uint32_t imm,uint32_t reg,uint32_t op0) +static void gen_jump (DisasContext *dc,int32_t n26,uint32_t reg,uint32_t op0) { -target_ulong tmp_pc; -/* N26, 26bits imm */ - tmp_pc =sign_extend ((imm<<2 ),26 ) + dc->pc; +target_ulong tmp_pc = dc->pc + n26 *4 ;switch (op0) {case 0x00 :/* l.j */
@@ -760,8 +741,8 @@ static void dec_misc(DisasContext *dc, uint32_t insn) {uint32_t op0, op1;uint32_t ra, rb, rd; -uint32_t L6 ,K5 ; -uint32_t I16 ,I5 ,I11 ,N26 , tmp; +uint32_t L6 ,K5 ,K16 ,K5_11 ; +int32_t I16 ,I5_11 ,N26 ;TCGMemOp mop; op0 =extract32 (insn,26 ,6 );
@@ -771,11 +752,11 @@ static void dec_misc(DisasContext *dc, uint32_t insn) rd =extract32 (insn,21 ,5 );L6 =extract32 (insn,5 ,6 );K5 =extract32 (insn,0 ,5 ); -I16 =extract32 (insn,0 ,16 ); -I5 =extract32 (insn,21 ,5 ); -I11 =extract32 (insn,0 ,11 ); -N26 =extract32 (insn,0 ,26 ); - tmp = (I5 <<11 ) +I11 ; +K16 =extract32 (insn,0 ,16 ); +I16 = (int16_t )K16 ; +N26 =sextract32 (insn,0 ,26 ); +K5_11 = (extract32 (insn,21 ,5 ) <<11 ) |extract32 (insn,0 ,11 ); +I5_11 = (int16_t )K5_11 ;switch (op0) {case 0x00 :/* l.j */
@@ -821,12 +802,12 @@ static void dec_misc(DisasContext *dc, uint32_t insn)break ;case 0x13 :/* l.maci */ -LOG_DIS ("l.maci %d, r%d, %d\n" ,I5 , ra,I11 ); +LOG_DIS ("l.maci r%d, %d\n" , ra,I16 ); {TCGv_i64 t1 =tcg_temp_new_i64 ();TCGv_i64 t2 =tcg_temp_new_i64 ();TCGv_i32 dst =tcg_temp_new_i32 (); -TCGv ttmp =tcg_const_tl (tmp); +TCGv ttmp =tcg_const_tl (I16 );tcg_gen_mul_tl (dst, cpu_R[ra], ttmp);tcg_gen_ext_i32_i64 (t1, dst);tcg_gen_concat_i32_i64 (t2, maclo, machi);
@@ -936,7 +917,7 @@ static void dec_misc(DisasContext *dc, uint32_t insn) do_load: {TCGv t0 =tcg_temp_new (); -tcg_gen_addi_tl (t0, cpu_R[ra],sign_extend (I16 ,16 )); +tcg_gen_addi_tl (t0, cpu_R[ra],I16 );tcg_gen_qemu_ld_tl (cpu_R[rd], t0, dc->mem_idx, mop);tcg_temp_free (t0); }
@@ -954,7 +935,7 @@ static void dec_misc(DisasContext *dc, uint32_t insn)TCGv_i32 res =tcg_temp_local_new_i32 ();TCGv_i32 sr_ove =tcg_temp_local_new_i32 ();tcg_gen_extu_i32_i64 (ta, cpu_R[ra]); -tcg_gen_addi_i64 (td, ta,sign_extend (I16 ,16 )); +tcg_gen_addi_i64 (td, ta,I16 );tcg_gen_extrl_i64_i32 (res, td);tcg_gen_shri_i64 (td, td,32 );tcg_gen_andi_i64 (td, td,0x3 );
@@ -989,7 +970,7 @@ static void dec_misc(DisasContext *dc, uint32_t insn)tcg_gen_andi_i32 (sr_cy, cpu_sr,SR_CY );tcg_gen_shri_i32 (sr_cy, sr_cy,10 );tcg_gen_extu_i32_i64 (tcy, sr_cy); -tcg_gen_addi_i64 (td, ta,sign_extend (I16 ,16 )); +tcg_gen_addi_i64 (td, ta,I16 );tcg_gen_add_i64 (td, td, tcy);tcg_gen_extrl_i64_i32 (res, td);tcg_gen_shri_i64 (td, td,32 );
@@ -1013,18 +994,18 @@ static void dec_misc(DisasContext *dc, uint32_t insn)break ;case 0x29 :/* l.andi */ -LOG_DIS ("l.andi r%d, r%d, %d\n" , rd, ra,I16 ); -tcg_gen_andi_tl (cpu_R[rd], cpu_R[ra],zero_extend (I16 ,16 )); +LOG_DIS ("l.andi r%d, r%d, %d\n" , rd, ra,K16 ); +tcg_gen_andi_tl (cpu_R[rd], cpu_R[ra],K16 );break ;case 0x2a :/* l.ori */ -LOG_DIS ("l.ori r%d, r%d, %d\n" , rd, ra,I16 ); -tcg_gen_ori_tl (cpu_R[rd], cpu_R[ra],zero_extend (I16 ,16 )); +LOG_DIS ("l.ori r%d, r%d, %d\n" , rd, ra,K16 ); +tcg_gen_ori_tl (cpu_R[rd], cpu_R[ra],K16 );break ;case 0x2b :/* l.xori */ LOG_DIS ("l.xori r%d, r%d, %d\n" , rd, ra,I16 ); -tcg_gen_xori_tl (cpu_R[rd], cpu_R[ra],sign_extend (I16 ,16 )); +tcg_gen_xori_tl (cpu_R[rd], cpu_R[ra],I16 );break ;case 0x2c :/* l.muli */
@@ -1039,12 +1020,12 @@ static void dec_misc(DisasContext *dc, uint32_t insn)break ;case 0x2d :/* l.mfspr */ -LOG_DIS ("l.mfspr r%d, r%d, %d\n" , rd, ra,I16 ); +LOG_DIS ("l.mfspr r%d, r%d, %d\n" , rd, ra,K16 ); {#if defined(CONFIG_USER_ONLY )return ;#else -TCGv_i32 ti =tcg_const_i32 (I16 ); +TCGv_i32 ti =tcg_const_i32 (K16 );if (dc->mem_idx ==MMU_USER_IDX ) {gen_illegal_exception (dc);return ;
@@ -1056,12 +1037,12 @@ static void dec_misc(DisasContext *dc, uint32_t insn)break ;case 0x30 :/* l.mtspr */ -LOG_DIS ("l.mtspr %d, r%d, r%d, %d\n" ,I5 , ra, rb,I11 ); +LOG_DIS ("l.mtspr r%d, r%d, %d\n" , ra, rb,K5_11 ); {#if defined(CONFIG_USER_ONLY )return ;#else -TCGv_i32 im =tcg_const_i32 (tmp); +TCGv_i32 im =tcg_const_i32 (K5_11 );if (dc->mem_idx ==MMU_USER_IDX ) {gen_illegal_exception (dc);return ;
@@ -1073,38 +1054,38 @@ static void dec_misc(DisasContext *dc, uint32_t insn)break ;case 0x33 :/* l.swa */ -LOG_DIS ("l.swa %d, r%d, r%d, %d\n" ,I5 , ra, rb,I11 ); -gen_swa (dc, cpu_R[rb], cpu_R[ra],sign_extend (tmp,16 )); +LOG_DIS ("l.swa r%d, r%d, %d\n" , ra, rb,I5_11 ); +gen_swa (dc, cpu_R[rb], cpu_R[ra],I5_11 );break ;/* not used yet, open it when we need or64. */ /*#ifdef TARGET_OPENRISC64 case 0x34: l.sd -LOG_DIS("l.sd %d, r%d, r%d, %d\n", I5, ra, rb, I11); +LOG_DIS("l.sd r%d, r%d, %d\n", ra, rb, I5_11); check_ob64s(dc); mop = MO_TEQ; goto do_store; #endif*/ case 0x35 :/* l.sw */ -LOG_DIS ("l.sw %d, r%d, r%d, %d\n" ,I5 , ra, rb,I11 ); +LOG_DIS ("l.sw r%d, r%d, %d\n" , ra, rb,I5_11 ); mop =MO_TEUL ; goto do_store;case 0x36 :/* l.sb */ -LOG_DIS ("l.sb %d, r%d, r%d, %d\n" ,I5 , ra, rb,I11 ); +LOG_DIS ("l.sb r%d, r%d, %d\n" , ra, rb,I5_11 ); mop =MO_UB ; goto do_store;case 0x37 :/* l.sh */ -LOG_DIS ("l.sh %d, r%d, r%d, %d\n" ,I5 , ra, rb,I11 ); +LOG_DIS ("l.sh r%d, r%d, %d\n" , ra, rb,I5_11 ); mop =MO_TEUW ; goto do_store; do_store: {TCGv t0 =tcg_temp_new (); -tcg_gen_addi_tl (t0, cpu_R[ra],sign_extend (tmp,16 )); +tcg_gen_addi_tl (t0, cpu_R[ra],I5_11 );tcg_gen_qemu_st_tl (cpu_R[rb], t0, dc->mem_idx, mop);tcg_temp_free (t0); }
@@ -1172,30 +1153,32 @@ static void dec_mac(DisasContext *dc, uint32_t insn)static void dec_logic (DisasContext *dc,uint32_t insn) {uint32_t op0; -uint32_t rd, ra,L6 ; +uint32_t rd, ra,L6 ,S6 ; op0 =extract32 (insn,6 ,2 ); rd =extract32 (insn,21 ,5 ); ra =extract32 (insn,16 ,5 );L6 =extract32 (insn,0 ,6 ); +S6 =L6 & (TARGET_LONG_BITS -1 );switch (op0) {case 0x00 :/* l.slli */ LOG_DIS ("l.slli r%d, r%d, %d\n" , rd, ra,L6 ); -tcg_gen_shli_tl (cpu_R[rd], cpu_R[ra], (L6 &0x1f )); +tcg_gen_shli_tl (cpu_R[rd], cpu_R[ra],S6 );break ;case 0x01 :/* l.srli */ LOG_DIS ("l.srli r%d, r%d, %d\n" , rd, ra,L6 ); -tcg_gen_shri_tl (cpu_R[rd], cpu_R[ra], (L6 &0x1f )); +tcg_gen_shri_tl (cpu_R[rd], cpu_R[ra],S6 );break ;case 0x02 :/* l.srai */ LOG_DIS ("l.srai r%d, r%d, %d\n" , rd, ra,L6 ); -tcg_gen_sari_tl (cpu_R[rd], cpu_R[ra], (L6 &0x1f ));break ; +tcg_gen_sari_tl (cpu_R[rd], cpu_R[ra],S6 ); +break ;case 0x03 :/* l.rori */ LOG_DIS ("l.rori r%d, r%d, %d\n" , rd, ra,L6 ); -tcg_gen_rotri_tl (cpu_R[rd], cpu_R[ra], (L6 &0x1f )); +tcg_gen_rotri_tl (cpu_R[rd], cpu_R[ra],S6 );break ;default :
@@ -1306,15 +1289,14 @@ static void dec_comp(DisasContext *dc, uint32_t insn)static void dec_compi (DisasContext *dc,uint32_t insn) { -uint32_t op0; -uint32_t ra,I16 ; +uint32_t op0, ra; +int32_t I16 ; op0 =extract32 (insn,21 ,5 ); ra =extract32 (insn,16 ,5 ); -I16 =extract32 (insn,0 ,16 ); +I16 =sextract32 (insn,0 ,16 );tcg_gen_movi_i32 (env_btaken,0x0 ); -I16 =sign_extend (I16 ,16 );switch (op0) {case 0x0 :/* l.sfeqi */
Signature · 1 line
2.9.3
PATCH 8/22 target/openrisc: Streamline arithmetic and OVE
In reply to Richard HendersonFix incorrect overflow calculation. Move overflow exception check to a helper function, to eliminate inline branches. Remove some incorrect special casing of R0. Implement multiply inline.
--- target/openrisc/Makefile.objs | 2 +- target/openrisc/exception_helper.c | 12 ++ target/openrisc/helper.h | 4 +- target/openrisc/int_helper.c | 61 ------ target/openrisc/translate.c | 426 +++++++++++++++---------------------- 5 files changed, 191 insertions(+), 314 deletions(-) delete mode 100644 target/openrisc/int_helper.c
target/openrisc/Makefile.objs +1 -1
@@ -1,5 +1,5 @@ obj-$(CONFIG_SOFTMMU) += machine.o obj-y += cpu.o exception.o interrupt.o mmu.o translate.o -obj-y += exception_helper.o fpu_helper.o int_helper.o \ +obj-y += exception_helper.o fpu_helper.o \ interrupt_helper.o mmu_helper.o sys_helper.o obj-y += gdbstub.o
target/openrisc/exception_helper.c +12 -0
@@ -20,6 +20,7 @@#include "qemu/osdep.h" #include "cpu.h" #include "exec/helper-proto.h" +#include "exec/exec-all.h" #include "exception.h" void HELPER (exception )(CPUOpenRISCState *env,uint32_t excp)
@@ -28,3 +29,14 @@ void HELPER(exception)(CPUOpenRISCState *env, uint32_t excp)raise_exception (cpu, excp); } + +void HELPER (ove )(CPUOpenRISCState *env,target_ulong test) +{ +if (unlikely (test) && (env->sr &SR_OVE )) { +OpenRISCCPU *cpu =openrisc_env_get_cpu (env); +CPUState *cs =CPU (cpu); + + cs->exception_index =EXCP_RANGE ; +cpu_loop_exit_restore (cs,GETPC ()); + } +}
target/openrisc/helper.h +1 -3
@@ -19,6 +19,7 @@/* exception */ DEF_HELPER_FLAGS_2(exception, 0, void, env, i32) +DEF_HELPER_FLAGS_2 (ove,TCG_CALL_NO_WG , void, env, tl) /* float */DEF_HELPER_FLAGS_2 (itofd,0 , i64, env, i64)
@@ -53,9 +54,6 @@ FOP_CMP(gt) FOP_CMP(ge)#undef FOP_CMP -/* int */ -DEF_HELPER_FLAGS_3 (mul32,0 , i32, env, i32, i32) -/* interrupt */ DEF_HELPER_FLAGS_1 (rfe,0 , void, env)
target/openrisc/int_helper.c deleted +0 -61
61 lines not on this page · raw message
target/openrisc/translate.c +177 -249
496 lines not on this page · raw message
Signature · 1 line
2.9.3
PATCH 9/22 target/openrisc: Put SR[OVE] in TB flags
In reply to Richard HendersonRemoves a call at execution time for overflow exceptions.
--- target/openrisc/cpu.h | 4 ++-- target/openrisc/exception_helper.c | 2 +- target/openrisc/translate.c | 24 +++++++++++++++--------- 3 files changed, 18 insertions(+), 12 deletions(-)
target/openrisc/cpu.h +2 -2
@@ -400,8 +400,8 @@ static inline void cpu_get_tb_cpu_state(CPUOpenRISCState *env, { *pc = env->pc; *cs_base =0 ; -/* D_FLAG -- branch instruction exception */ - *flags = (env->flags &D_FLAG ); +/* D_FLAG -- branch instruction exception, OVE overflow trap enable. */ + *flags = (env->flags &D_FLAG ) | (env->sr &SR_OVE ); }static inline int cpu_mmu_index (CPUOpenRISCState *env,bool ifetch)
target/openrisc/exception_helper.c +1 -1
@@ -32,7 +32,7 @@ void HELPER(exception)(CPUOpenRISCState *env, uint32_t excp)void HELPER (ove )(CPUOpenRISCState *env,target_ulong test) { -if (unlikely (test) && (env->sr &SR_OVE )) { +if (unlikely (test)) {OpenRISCCPU *cpu =openrisc_env_get_cpu (env);CPUState *cs =CPU (cpu);
target/openrisc/translate.c +15 -9
@@ -132,8 +132,8 @@ static inline void wb_SR_F(void)static inline void gen_sync_flags (DisasContext *dc) {/* Sync the tb dependent flag between translate and runtime. */ -if (dc->tb_flags != dc->synced_flags) { -tcg_gen_movi_tl (env_flags, dc->tb_flags); +if ((dc->tb_flags ^ dc->synced_flags) &D_FLAG ) { +tcg_gen_movi_tl (env_flags, dc->tb_flags &D_FLAG ); dc->synced_flags = dc->tb_flags; } }
@@ -249,20 +249,26 @@ static void gen_jump(DisasContext *dc, int32_t n26, uint32_t reg, uint32_t op0)static void gen_ove_cy (DisasContext *dc,TCGv cy) { -gen_helper_ove (cpu_env, cy); +if (dc->tb_flags &SR_OVE ) { +gen_helper_ove (cpu_env, cy); + } }static void gen_ove_ov (DisasContext *dc,TCGv ov) { -gen_helper_ove (cpu_env, ov); +if (dc->tb_flags &SR_OVE ) { +gen_helper_ove (cpu_env, ov); + } }static void gen_ove_cyov (DisasContext *dc,TCGv cy,TCGv ov) { -TCGv t0 =tcg_temp_new (); -tcg_gen_or_tl (t0, cy, ov); -gen_helper_ove (cpu_env, t0); -tcg_temp_free (t0); +if (dc->tb_flags &SR_OVE ) { +TCGv t0 =tcg_temp_new (); +tcg_gen_or_tl (t0, cy, ov); +gen_helper_ove (cpu_env, t0); +tcg_temp_free (t0); + } }static void gen_add (DisasContext *dc,TCGv dest,TCGv srca,TCGv srcb)
@@ -1606,7 +1612,7 @@ void gen_intermediate_code(CPUOpenRISCState *env, struct TranslationBlock *tb) dc->flags = cpu->env.cpucfgr; dc->mem_idx =cpu_mmu_index (&cpu->env, false); dc->synced_flags = dc->tb_flags = tb->flags; - dc->delayed_branch = !!(dc->tb_flags &D_FLAG ); + dc->delayed_branch = (dc->tb_flags &D_FLAG ) !=0 ; dc->singlestep_enabled = cs->singlestep_enabled; next_page_start = (pc_start &TARGET_PAGE_MASK ) +TARGET_PAGE_SIZE ;
Signature · 1 line
2.9.3
PATCH 10/22 target/openrisc: Invert the decoding in dec_calc
In reply to Richard HendersonDecoding the opcodes in the right order reduces by 100+ lines. Also, it happens to put the opcodes in the same order as Chapter 17.
--- target/openrisc/translate.c | 302 ++++++++++++++------------------------------ 1 file changed, 95 insertions(+), 207 deletions(-)
target/openrisc/translate.c +95 -207
@@ -465,133 +465,95 @@ static void dec_calc(DisasContext *dc, uint32_t insn) rb =extract32 (insn,11 ,5 ); rd =extract32 (insn,21 ,5 ); -switch (op0) { -case 0x0000 : -switch (op1) { -case 0x00 :/* l.add */ +switch (op1) { +case 0 : +switch (op0) { +case 0x0 :/* l.add */ LOG_DIS ("l.add r%d, r%d, r%d\n" , rd, ra, rb);gen_add (dc, cpu_R[rd], cpu_R[ra], cpu_R[rb]); -break ; -default : -gen_illegal_exception (dc); -break ; - } -break ; +return ; -case 0x0001 :/* l.addc */ -switch (op1) { -case 0x00 : +case 0x1 :/* l.addc */ LOG_DIS ("l.addc r%d, r%d, r%d\n" , rd, ra, rb);gen_addc (dc, cpu_R[rd], cpu_R[ra], cpu_R[rb]); -break ; -default : -gen_illegal_exception (dc); -break ; - } -break ; +return ; -case 0x0002 :/* l.sub */ -switch (op1) { -case 0x00 : +case 0x2 :/* l.sub */ LOG_DIS ("l.sub r%d, r%d, r%d\n" , rd, ra, rb);gen_sub (dc, cpu_R[rd], cpu_R[ra], cpu_R[rb]); -break ; -default : -gen_illegal_exception (dc); -break ; - } -break ; +return ; -case 0x0003 :/* l.and */ -switch (op1) { -case 0x00 : +case 0x3 :/* l.and */ LOG_DIS ("l.and r%d, r%d, r%d\n" , rd, ra, rb);tcg_gen_and_tl (cpu_R[rd], cpu_R[ra], cpu_R[rb]); -break ; -default : -gen_illegal_exception (dc); -break ; - } -break ; +return ; -case 0x0004 :/* l.or */ -switch (op1) { -case 0x00 : +case 0x4 :/* l.or */ LOG_DIS ("l.or r%d, r%d, r%d\n" , rd, ra, rb);tcg_gen_or_tl (cpu_R[rd], cpu_R[ra], cpu_R[rb]); -break ; -default : -gen_illegal_exception (dc); -break ; - } -break ; +return ; -case 0x0005 : -switch (op1) { -case 0x00 :/* l.xor */ +case 0x5 :/* l.xor */ LOG_DIS ("l.xor r%d, r%d, r%d\n" , rd, ra, rb);tcg_gen_xor_tl (cpu_R[rd], cpu_R[ra], cpu_R[rb]); -break ; -default : -gen_illegal_exception (dc); -break ; - } -break ; - -case 0x0006 : -switch (op1) { -case 0x03 :/* l.mul */ -LOG_DIS ("l.mul r%d, r%d, r%d\n" , rd, ra, rb); -gen_mul (dc, cpu_R[rd], cpu_R[ra], cpu_R[rb]); -break ; -default : -gen_illegal_exception (dc); -break ; - } -break ; - -case 0x0009 : -switch (op1) { -case 0x03 :/* l.div */ -LOG_DIS ("l.div r%d, r%d, r%d\n" , rd, ra, rb); -gen_div (dc, cpu_R[rd], cpu_R[ra], cpu_R[rb]); -break ; - -default : -gen_illegal_exception (dc); -break ; - } -break ; - -case 0x000a : -switch (op1) { -case 0x03 :/* l.divu */ -LOG_DIS ("l.divu r%d, r%d, r%d\n" , rd, ra, rb); -gen_divu (dc, cpu_R[rd], cpu_R[ra], cpu_R[rb]); -break ; +return ; -default : -gen_illegal_exception (dc); +case 0x8 : +switch (op2) { +case 0 :/* l.sll */ +LOG_DIS ("l.sll r%d, r%d, r%d\n" , rd, ra, rb); +tcg_gen_shl_tl (cpu_R[rd], cpu_R[ra], cpu_R[rb]); +return ; +case 1 :/* l.srl */ +LOG_DIS ("l.srl r%d, r%d, r%d\n" , rd, ra, rb); +tcg_gen_shr_tl (cpu_R[rd], cpu_R[ra], cpu_R[rb]); +return ; +case 2 :/* l.sra */ +LOG_DIS ("l.sra r%d, r%d, r%d\n" , rd, ra, rb); +tcg_gen_sar_tl (cpu_R[rd], cpu_R[ra], cpu_R[rb]); +return ; +case 3 :/* l.ror */ +LOG_DIS ("l.ror r%d, r%d, r%d\n" , rd, ra, rb); +tcg_gen_rotr_tl (cpu_R[rd], cpu_R[ra], cpu_R[rb]); +return ; + }break ; - } -break ; -case 0x000b : -switch (op1) { -case 0x03 :/* l.mulu */ -LOG_DIS ("l.mulu r%d, r%d, r%d\n" , rd, ra, rb); -gen_mulu (dc, cpu_R[rd], cpu_R[ra], cpu_R[rb]); +case 0xc : +switch (op2) { +case 0 :/* l.exths */ +LOG_DIS ("l.exths r%d, r%d\n" , rd, ra); +tcg_gen_ext16s_tl (cpu_R[rd], cpu_R[ra]); +return ; +case 1 :/* l.extbs */ +LOG_DIS ("l.extbs r%d, r%d\n" , rd, ra); +tcg_gen_ext8s_tl (cpu_R[rd], cpu_R[ra]); +return ; +case 2 :/* l.exthz */ +LOG_DIS ("l.exthz r%d, r%d\n" , rd, ra); +tcg_gen_ext16u_tl (cpu_R[rd], cpu_R[ra]); +return ; +case 3 :/* l.extbz */ +LOG_DIS ("l.extbz r%d, r%d\n" , rd, ra); +tcg_gen_ext8u_tl (cpu_R[rd], cpu_R[ra]); +return ; + }break ; -default : -gen_illegal_exception (dc); +case 0xd : +switch (op2) { +case 0 :/* l.extws */ +LOG_DIS ("l.extws r%d, r%d\n" , rd, ra); +tcg_gen_ext32s_tl (cpu_R[rd], cpu_R[ra]); +return ; +case 1 :/* l.extwz */ +LOG_DIS ("l.extwz r%d, r%d\n" , rd, ra); +tcg_gen_ext32u_tl (cpu_R[rd], cpu_R[ra]); +return ; + }break ; - } -break ; -case 0x000e : -switch (op1) { -case 0x00 :/* l.cmov */ +case 0xe :/* l.cmov */ LOG_DIS ("l.cmov r%d, r%d, r%d\n" , rd, ra, rb); {TCGLabel *lab =gen_new_label ();
@@ -606,128 +568,54 @@ static void dec_calc(DisasContext *dc, uint32_t insn)tcg_temp_free (sr_f);tcg_temp_free (res); } -break ; - -default : -gen_illegal_exception (dc); -break ; - } -break ; +return ; -case 0x000f : -switch (op1) { -case 0x00 :/* l.ff1 */ +case 0xf :/* l.ff1 */ LOG_DIS ("l.ff1 r%d, r%d, r%d\n" , rd, ra, rb);tcg_gen_ctzi_tl (cpu_R[rd], cpu_R[ra],-1 );tcg_gen_addi_tl (cpu_R[rd], cpu_R[rd],1 ); -break ; -case 0x01 :/* l.fl1 */ +return ; + } +break ; + +case 1 : +switch (op0) { +case 0xf :/* l.fl1 */ LOG_DIS ("l.fl1 r%d, r%d, r%d\n" , rd, ra, rb);tcg_gen_clzi_tl (cpu_R[rd], cpu_R[ra],TARGET_LONG_BITS );tcg_gen_subfi_tl (cpu_R[rd],TARGET_LONG_BITS , cpu_R[rd]); -break ; - -default : -gen_illegal_exception (dc); -break ; +return ; }break ; -case 0x0008 : -switch (op1) { -case 0x00 : -switch (op2) { -case 0x00 :/* l.sll */ -LOG_DIS ("l.sll r%d, r%d, r%d\n" , rd, ra, rb); -tcg_gen_shl_tl (cpu_R[rd], cpu_R[ra], cpu_R[rb]); -break ; -case 0x01 :/* l.srl */ -LOG_DIS ("l.srl r%d, r%d, r%d\n" , rd, ra, rb); -tcg_gen_shr_tl (cpu_R[rd], cpu_R[ra], cpu_R[rb]); -break ; -case 0x02 :/* l.sra */ -LOG_DIS ("l.sra r%d, r%d, r%d\n" , rd, ra, rb); -tcg_gen_sar_tl (cpu_R[rd], cpu_R[ra], cpu_R[rb]); -break ; -case 0x03 :/* l.ror */ -LOG_DIS ("l.ror r%d, r%d, r%d\n" , rd, ra, rb); -tcg_gen_rotr_tl (cpu_R[rd], cpu_R[ra], cpu_R[rb]); -break ; - -default : -gen_illegal_exception (dc); -break ; - } -break ; - -default : -gen_illegal_exception (dc); -break ; - } +case 2 :break ; -case 0x000c : -switch (op1) { -case 0x00 : -switch (op2) { -case 0x00 :/* l.exths */ -LOG_DIS ("l.exths r%d, r%d\n" , rd, ra); -tcg_gen_ext16s_tl (cpu_R[rd], cpu_R[ra]); -break ; -case 0x01 :/* l.extbs */ -LOG_DIS ("l.extbs r%d, r%d\n" , rd, ra); -tcg_gen_ext8s_tl (cpu_R[rd], cpu_R[ra]); -break ; -case 0x02 :/* l.exthz */ -LOG_DIS ("l.exthz r%d, r%d\n" , rd, ra); -tcg_gen_ext16u_tl (cpu_R[rd], cpu_R[ra]); -break ; -case 0x03 :/* l.extbz */ -LOG_DIS ("l.extbz r%d, r%d\n" , rd, ra); -tcg_gen_ext8u_tl (cpu_R[rd], cpu_R[ra]); -break ; - -default : -gen_illegal_exception (dc); -break ; - } -break ; - -default : -gen_illegal_exception (dc); -break ; - } -break ; +case 3 : +switch (op0) { +case 0x6 :/* l.mul */ +LOG_DIS ("l.mul r%d, r%d, r%d\n" , rd, ra, rb); +gen_mul (dc, cpu_R[rd], cpu_R[ra], cpu_R[rb]); +return ; -case 0x000d : -switch (op1) { -case 0x00 : -switch (op2) { -case 0x00 :/* l.extws */ -LOG_DIS ("l.extws r%d, r%d\n" , rd, ra); -tcg_gen_ext32s_tl (cpu_R[rd], cpu_R[ra]); -break ; -case 0x01 :/* l.extwz */ -LOG_DIS ("l.extwz r%d, r%d\n" , rd, ra); -tcg_gen_ext32u_tl (cpu_R[rd], cpu_R[ra]); -break ; +case 0x9 :/* l.div */ +LOG_DIS ("l.div r%d, r%d, r%d\n" , rd, ra, rb); +gen_div (dc, cpu_R[rd], cpu_R[ra], cpu_R[rb]); +return ; -default : -gen_illegal_exception (dc); -break ; - } -break ; +case 0xa :/* l.divu */ +LOG_DIS ("l.divu r%d, r%d, r%d\n" , rd, ra, rb); +gen_divu (dc, cpu_R[rd], cpu_R[ra], cpu_R[rb]); +return ; -default : -gen_illegal_exception (dc); -break ; +case 0xb :/* l.mulu */ +LOG_DIS ("l.mulu r%d, r%d, r%d\n" , rd, ra, rb); +gen_mulu (dc, cpu_R[rd], cpu_R[ra], cpu_R[rb]); +return ; }break ; - -default : -gen_illegal_exception (dc); -break ; } +gen_illegal_exception (dc); }static void dec_misc (DisasContext *dc,uint32_t insn)
Signature · 1 line
2.9.3
PATCH 11/22 target/openrisc: Keep SR_F in a separate variable
In reply to Richard HendersonThis avoids having to keep merging and extracting the flag from SR.
--- target/openrisc/cpu.h | 15 +++++- target/openrisc/gdbstub.c | 4 +- target/openrisc/interrupt.c | 2 +- target/openrisc/interrupt_helper.c | 2 +- target/openrisc/machine.c | 38 +++++++++++++- target/openrisc/sys_helper.c | 5 +- target/openrisc/translate.c | 104 ++++++++++++++----------------------- 7 files changed, 96 insertions(+), 74 deletions(-)
target/openrisc/cpu.h +13 -2
@@ -286,7 +286,8 @@ typedef struct CPUOpenRISCState {target_ulong epcr;/* Exception PC register */ target_ulong eear;/* Exception EA register */ -uint32_t sr;/* Supervisor register */ +target_ulong sr_f;/* the SR_F bit, values 0, 1. */ +uint32_t sr;/* Supervisor register, without SR_F */ uint32_t vr;/* Version register */ uint32_t upr;/* Unit presence register */ uint32_t cpucfgr;/* CPU configure register */
@@ -301,7 +302,6 @@ typedef struct CPUOpenRISCState {uint32_t flags;/* cpu_flags, we only use it for exception in solt so far. */ -uint32_t btaken;/* the SR_F bit */ /* Fields up to this point are cleared by a CPU reset */ struct {} end_reset_fields;
@@ -412,6 +412,17 @@ static inline int cpu_mmu_index(CPUOpenRISCState *env, bool ifetch) return (env->sr & SR_SM) == 0 ? MMU_USER_IDX : MMU_SUPERVISOR_IDX; } +static inline uint32_t cpu_get_sr (CPUOpenRISCState *env) +{ +return env->sr + env->sr_f *SR_F ; +} + +static inline void cpu_set_sr (CPUOpenRISCState *env,uint32_t val) +{ + env->sr_f = (val &SR_F ) !=0 ; + env->sr = (val & ~SR_F ) |SR_FO ; +} +#define CPU_INTERRUPT_TIMER CPU_INTERRUPT_TGT_INT_0#endif /* OPENRISC_CPU_H */
target/openrisc/gdbstub.c +2 -2
@@ -38,7 +38,7 @@ int openrisc_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n)return gdb_get_reg32 (mem_buf, env->npc);case 34 :/* SR */ -return gdb_get_reg32 (mem_buf, env->sr); +return gdb_get_reg32 (mem_buf,cpu_get_sr (env));default :break ;
@@ -73,7 +73,7 @@ int openrisc_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)break ;case 34 :/* SR */ - env->sr = tmp; +cpu_set_sr (env, tmp);break ;default :
target/openrisc/interrupt.c +1 -1
@@ -54,7 +54,7 @@ void openrisc_cpu_do_interrupt(CPUState *cs)we need flush TLB when we enter&exit EXCP. */ tlb_flush (cs); - env->esr = env->sr; + env->esr =cpu_get_sr (env); env->sr &= ~SR_DME ; env->sr &= ~SR_IME ; env->sr |=SR_SM ;
target/openrisc/interrupt_helper.c +1 -1
@@ -33,7 +33,7 @@ void HELPER(rfe)(CPUOpenRISCState *env)#endif cpu->env.pc = cpu->env.epcr; cpu->env.npc = cpu->env.epcr; - cpu->env.sr = cpu->env.esr; +cpu_set_sr (&cpu->env, cpu->env.esr); cpu->env.lock_addr =-1 ;#ifndef CONFIG_USER_ONLY
target/openrisc/machine.c +37 -1
@@ -24,6 +24,27 @@#include "hw/boards.h" #include "migration/cpu.h" +static int get_sr (QEMUFile *f,void *opaque,size_t size,VMStateField *field) +{ +CPUOpenRISCState *env = opaque; +cpu_set_sr (env,qemu_get_be32 (f)); +return 0 ; +} + +static int put_sr (QEMUFile *f,void *opaque,size_t size, +VMStateField *field,QJSON *vmdesc) +{ +CPUOpenRISCState *env = opaque; +qemu_put_be32 (f,cpu_get_sr (env)); +return 0 ; +} + +static const VMStateInfo vmstate_sr = { + .name ="sr" , + .get = get_sr, + .put = put_sr, +}; +static const VMStateDescription vmstate_env = { .name ="env" , .version_id =2 ,
@@ -38,7 +59,22 @@ static const VMStateDescription vmstate_env = {VMSTATE_UINTTL (lock_value, CPUOpenRISCState),VMSTATE_UINTTL (epcr, CPUOpenRISCState),VMSTATE_UINTTL (eear, CPUOpenRISCState), -VMSTATE_UINT32 (sr, CPUOpenRISCState), + +/* Save the architecture value of the SR, not the internally +expanded version. Since this architecture value does not +exist in memory to be stored, this requires a but of hoop +jumping. We want OFFSET=0 so that we effectively pass ENV +to the helper functions, and we need to fill in the name by +hand since there's no field of that name. */ + { + .name = "sr", + .version_id = 0, + .size = sizeof(uint32_t), + .info = &vmstate_sr, + .flags = VMS_SINGLE, + .offset = 0 + }, +VMSTATE_UINT32 (vr, CPUOpenRISCState),VMSTATE_UINT32 (upr, CPUOpenRISCState), VMSTATE_UINT32(cpucfgr, CPUOpenRISCState),
target/openrisc/sys_helper.c +2 -3
@@ -49,8 +49,7 @@ void HELPER(mtspr)(CPUOpenRISCState *env, (rb & (SR_IME | SR_DME | SR_SM))) {tlb_flush (cs); } - env->sr = rb; - env->sr |=SR_FO ;/* FO is const equal to 1 */ +cpu_set_sr (env, rb);if (env->sr &SR_DME ) { env->tlb->cpu_openrisc_map_address_data = &cpu_openrisc_get_phys_data;
@@ -200,7 +199,7 @@ target_ulong HELPER(mfspr)(CPUOpenRISCState *env,return env->npc;case TO_SPR (0 ,17 ):/* SR */ -return env->sr; +return cpu_get_sr (env);case TO_SPR (0 ,18 ):/* PPC */ return env->ppc;
target/openrisc/translate.c +40 -64
323 lines not on this page · raw message
Signature · 1 line
2.9.3
PATCH 12/22 target/openrisc: Keep SR_CY and SR_OV in a separate variables
In reply to Richard HendersonThis significantly streamlines carry and overflow production.
--- target/openrisc/cpu.h | 13 +++- target/openrisc/exception_helper.c | 31 ++++++++-- target/openrisc/helper.h | 4 +- target/openrisc/translate.c | 119 +++++++++++++------------------------ 4 files changed, 78 insertions(+), 89 deletions(-)
target/openrisc/cpu.h +10 -3
@@ -287,7 +287,9 @@ typedef struct CPUOpenRISCState {target_ulong eear;/* Exception EA register */ target_ulong sr_f;/* the SR_F bit, values 0, 1. */ -uint32_t sr;/* Supervisor register, without SR_F */ +target_ulong sr_cy;/* the SR_CY bit, values 0, 1. */ +target_long sr_ov;/* the SR_OV bit (in the sign bit only) */ +uint32_t sr;/* Supervisor register, without SR_{F,CY,OV} */ uint32_t vr;/* Version register */ uint32_t upr;/* Unit presence register */ uint32_t cpucfgr;/* CPU configure register */
@@ -414,13 +416,18 @@ static inline int cpu_mmu_index(CPUOpenRISCState *env, bool ifetch)static inline uint32_t cpu_get_sr (CPUOpenRISCState *env) { -return env->sr + env->sr_f *SR_F ; +return (env->sr + + env->sr_f *SR_F + + env->sr_cy *SR_CY + + (env->sr_ov <0 ) *SR_OV ); }static inline void cpu_set_sr (CPUOpenRISCState *env,uint32_t val) { env->sr_f = (val &SR_F ) !=0 ; - env->sr = (val & ~SR_F ) |SR_FO ; + env->sr_cy = (val &SR_CY ) !=0 ; + env->sr_ov = (val &SR_OV ?-1 :0 ); + env->sr = (val & ~(SR_F |SR_CY |SR_OV )) |SR_FO ; }#define CPU_INTERRUPT_TIMER CPU_INTERRUPT_TGT_INT_0
target/openrisc/exception_helper.c +25 -6
@@ -30,13 +30,32 @@ void HELPER(exception)(CPUOpenRISCState *env, uint32_t excp)raise_exception (cpu, excp); } -void HELPER (ove )(CPUOpenRISCState *env,target_ulong test) +static void QEMU_NORETURN do_range(CPUOpenRISCState *env, uintptr_t pc) { -if (unlikely (test)) { -OpenRISCCPU *cpu =openrisc_env_get_cpu (env); -CPUState *cs =CPU (cpu); +OpenRISCCPU *cpu =openrisc_env_get_cpu (env); +CPUState *cs =CPU (cpu); + + cs->exception_index =EXCP_RANGE ; +cpu_loop_exit_restore (cs, pc); +} + +void HELPER (ove_cy )(CPUOpenRISCState *env) +{ +if (env->sr_cy) { +do_range (env,GETPC ()); + } +} + +void HELPER (ove_ov )(CPUOpenRISCState *env) +{ +if (env->sr_ov <0 ) { +do_range (env,GETPC ()); + } +} - cs->exception_index =EXCP_RANGE ; -cpu_loop_exit_restore (cs,GETPC ()); +void HELPER (ove_cyov )(CPUOpenRISCState *env) +{ +if (env->sr_cy || env->sr_ov <0 ) { +do_range (env,GETPC ()); } }
target/openrisc/helper.h +3 -1
@@ -19,7 +19,9 @@/* exception */ DEF_HELPER_FLAGS_2(exception, 0, void, env, i32) -DEF_HELPER_FLAGS_2 (ove,TCG_CALL_NO_WG , void, env, tl) +DEF_HELPER_FLAGS_1(ove_cy, TCG_CALL_NO_WG, void, env) +DEF_HELPER_FLAGS_1(ove_ov, TCG_CALL_NO_WG, void, env) +DEF_HELPER_FLAGS_1 (ove_cyov,TCG_CALL_NO_WG , void, env) /* float */DEF_HELPER_FLAGS_2 (itofd,0 , i64, env, i64)
target/openrisc/translate.c +40 -79
222 lines not on this page · raw message
Signature · 1 line
2.9.3
PATCH 13/22 target/openrisc: Use movcond where appropriate
In reply to Richard Henderson--- target/openrisc/translate.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
target/openrisc/translate.c +14 -14
@@ -214,12 +214,16 @@ static void gen_jump(DisasContext *dc, int32_t n26, uint32_t reg, uint32_t op0)case 0x03 :/* l.bnf */ case 0x04 :/* l.bf */ { -TCGLabel *lab =gen_new_label (); -tcg_gen_movi_tl (jmp_pc, dc->pc+8 ); -tcg_gen_brcondi_tl (op0 ==0x03 ?TCG_COND_NE :TCG_COND_EQ , - cpu_sr_f,0 , lab); -tcg_gen_movi_tl (jmp_pc, tmp_pc); -gen_set_label (lab); +TCGv t_next =tcg_const_tl (dc->pc +8 ); +TCGv t_true =tcg_const_tl (tmp_pc); +TCGv t_zero =tcg_const_tl (0 ); + +tcg_gen_movcond_tl (op0 ==0x03 ?TCG_COND_EQ :TCG_COND_NE , + jmp_pc, cpu_sr_f, t_zero, t_true, t_next); + +tcg_temp_free (t_next); +tcg_temp_free (t_true); +tcg_temp_free (t_zero); }break ;case 0x11 :/* l.jr */
@@ -502,14 +506,10 @@ static void dec_calc(DisasContext *dc, uint32_t insn)case 0xe :/* l.cmov */ LOG_DIS ("l.cmov r%d, r%d, r%d\n" , rd, ra, rb); { -TCGLabel *lab =gen_new_label (); -TCGv res =tcg_temp_local_new (); -tcg_gen_mov_tl (res, cpu_R[rb]); -tcg_gen_brcondi_tl (TCG_COND_EQ , cpu_sr_f,0 , lab); -tcg_gen_mov_tl (res, cpu_R[ra]); -gen_set_label (lab); -tcg_gen_mov_tl (cpu_R[rd], res); -tcg_temp_free (res); +TCGv zero =tcg_const_tl (0 ); +tcg_gen_movcond_tl (TCG_COND_NE , cpu_R[rd], cpu_sr_f, zero, + cpu_R[ra], cpu_R[rb]); +tcg_temp_free (zero); }return ;
Signature · 1 line
2.9.3
PATCH 14/22 target/openrisc: Set flags on helpers
In reply to Richard Henderson--- target/openrisc/helper.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
target/openrisc/helper.h +12 -12
@@ -18,26 +18,26 @@*/ /* exception */ -DEF_HELPER_FLAGS_2(exception, 0, void, env, i32) +DEF_HELPER_FLAGS_2(exception, TCG_CALL_NO_WG, void, env, i32) DEF_HELPER_FLAGS_1(ove_cy, TCG_CALL_NO_WG, void, env) DEF_HELPER_FLAGS_1(ove_ov, TCG_CALL_NO_WG, void, env)DEF_HELPER_FLAGS_1 (ove_cyov,TCG_CALL_NO_WG , void, env) /* float */ -DEF_HELPER_FLAGS_2(itofd, 0, i64, env, i64) -DEF_HELPER_FLAGS_2(itofs, 0, i32, env, i32) -DEF_HELPER_FLAGS_2(ftoid, 0, i64, env, i64) -DEF_HELPER_FLAGS_2(ftois, 0, i32, env, i32) +DEF_HELPER_FLAGS_2(itofd, TCG_CALL_NO_WG, i64, env, i64) +DEF_HELPER_FLAGS_2(itofs, TCG_CALL_NO_WG, i32, env, i32) +DEF_HELPER_FLAGS_2(ftoid, TCG_CALL_NO_WG, i64, env, i64) +DEF_HELPER_FLAGS_2(ftois, TCG_CALL_NO_WG, i32, env, i32)#define FOP_MADD (op) \ -DEF_HELPER_FLAGS_3(float_ ## op ## _s, 0, i32, env, i32, i32) \ -DEF_HELPER_FLAGS_3(float_ ## op ## _d, 0, i64, env, i64, i64) +DEF_HELPER_FLAGS_3(float_ ## op ## _s, TCG_CALL_NO_WG, i32, env, i32, i32) \ +DEF_HELPER_FLAGS_3(float_ ## op ## _d, TCG_CALL_NO_WG, i64, env, i64, i64) FOP_MADD(muladd)#undef FOP_MADD#define FOP_CALC (op) \ -DEF_HELPER_FLAGS_3(float_ ## op ## _s, 0, i32, env, i32, i32) \ -DEF_HELPER_FLAGS_3(float_ ## op ## _d, 0, i64, env, i64, i64) +DEF_HELPER_FLAGS_3(float_ ## op ## _s, TCG_CALL_NO_WG, i32, env, i32, i32) \ +DEF_HELPER_FLAGS_3(float_ ## op ## _d, TCG_CALL_NO_WG, i64, env, i64, i64) FOP_CALC(add) FOP_CALC(sub) FOP_CALC(mul)
@@ -46,8 +46,8 @@ FOP_CALC(rem)#undef FOP_CALC#define FOP_CMP (op) \ -DEF_HELPER_FLAGS_3(float_ ## op ## _s, 0, i32, env, i32, i32) \ -DEF_HELPER_FLAGS_3(float_ ## op ## _d, 0, i64, env, i64, i64) +DEF_HELPER_FLAGS_3(float_ ## op ## _s, TCG_CALL_NO_WG, i32, env, i32, i32) \ +DEF_HELPER_FLAGS_3(float_ ## op ## _d, TCG_CALL_NO_WG, i64, env, i64, i64) FOP_CMP(eq) FOP_CMP(lt) FOP_CMP(le)
@@ -61,4 +61,4 @@ DEF_HELPER_FLAGS_1(rfe, 0, void, env)/* sys */ DEF_HELPER_FLAGS_4(mtspr, 0, void, env, tl, tl, tl) -DEF_HELPER_FLAGS_4 (mfspr,0 , tl, env, tl, tl, tl) +DEF_HELPER_FLAGS_4 (mfspr,TCG_CALL_NO_WG , tl, env, tl, tl, tl)
Signature · 1 line
2.9.3
Re: [Qemu-devel] [PATCH 14/22] target/openrisc: Set flags on helpers
Quoted 2 lines · Richard Henderson
Reviewed-by Bastian Koppelmann <[email protected]>Signed-off-by Richard Henderson <[email protected]>
Quoted 62 lines
--- target/openrisc/helper.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)target/openrisc/helper.h +12
-12@@ -18,26 +18,26 @@*/ /* exception */ -DEF_HELPER_FLAGS_2(exception, 0, void, env, i32) +DEF_HELPER_FLAGS_2(exception, TCG_CALL_NO_WG, void, env, i32) DEF_HELPER_FLAGS_1(ove_cy, TCG_CALL_NO_WG, void, env) DEF_HELPER_FLAGS_1(ove_ov, TCG_CALL_NO_WG, void, env)DEF_HELPER_FLAGS_1 (ove_cyov,TCG_CALL_NO_WG , void, env) /* float */ -DEF_HELPER_FLAGS_2(itofd, 0, i64, env, i64) -DEF_HELPER_FLAGS_2(itofs, 0, i32, env, i32) -DEF_HELPER_FLAGS_2(ftoid, 0, i64, env, i64) -DEF_HELPER_FLAGS_2(ftois, 0, i32, env, i32) +DEF_HELPER_FLAGS_2(itofd, TCG_CALL_NO_WG, i64, env, i64) +DEF_HELPER_FLAGS_2(itofs, TCG_CALL_NO_WG, i32, env, i32) +DEF_HELPER_FLAGS_2(ftoid, TCG_CALL_NO_WG, i64, env, i64) +DEF_HELPER_FLAGS_2(ftois, TCG_CALL_NO_WG, i32, env, i32)#define FOP_MADD (op) \ -DEF_HELPER_FLAGS_3(float_ ## op ## _s, 0, i32, env, i32, i32) \ -DEF_HELPER_FLAGS_3(float_ ## op ## _d, 0, i64, env, i64, i64) +DEF_HELPER_FLAGS_3(float_ ## op ## _s, TCG_CALL_NO_WG, i32, env, i32, i32) \ +DEF_HELPER_FLAGS_3(float_ ## op ## _d, TCG_CALL_NO_WG, i64, env, i64, i64) FOP_MADD(muladd)#undef FOP_MADD#define FOP_CALC (op) \ -DEF_HELPER_FLAGS_3(float_ ## op ## _s, 0, i32, env, i32, i32) \ -DEF_HELPER_FLAGS_3(float_ ## op ## _d, 0, i64, env, i64, i64) +DEF_HELPER_FLAGS_3(float_ ## op ## _s, TCG_CALL_NO_WG, i32, env, i32, i32) \ +DEF_HELPER_FLAGS_3(float_ ## op ## _d, TCG_CALL_NO_WG, i64, env, i64, i64) FOP_CALC(add) FOP_CALC(sub) FOP_CALC(mul)@@ -46,8 +46,8 @@ FOP_CALC(rem)#undef FOP_CALC#define FOP_CMP (op) \ -DEF_HELPER_FLAGS_3(float_ ## op ## _s, 0, i32, env, i32, i32) \ -DEF_HELPER_FLAGS_3(float_ ## op ## _d, 0, i64, env, i64, i64) +DEF_HELPER_FLAGS_3(float_ ## op ## _s, TCG_CALL_NO_WG, i32, env, i32, i32) \ +DEF_HELPER_FLAGS_3(float_ ## op ## _d, TCG_CALL_NO_WG, i64, env, i64, i64) FOP_CMP(eq) FOP_CMP(lt) FOP_CMP(le)@@ -61,4 +61,4 @@ DEF_HELPER_FLAGS_1(rfe, 0, void, env)/* sys */ DEF_HELPER_FLAGS_4(mtspr, 0, void, env, tl, tl, tl) -DEF_HELPER_FLAGS_4 (mfspr,0 , tl, env, tl, tl, tl) +DEF_HELPER_FLAGS_4 (mfspr,TCG_CALL_NO_WG , tl, env, tl, tl, tl)
PATCH 15/22 target/openrisc: Enable trap, csync, msync, psync for user mode
In reply to Richard HendersonNot documented as disabled for user mode.
--- target/openrisc/translate.c | 32 -------------------------------- 1 file changed, 32 deletions(-)
target/openrisc/translate.c +0 -32
@@ -1134,52 +1134,20 @@ static void dec_sys(DisasContext *dc, uint32_t insn)case 0x100 :/* l.trap */ LOG_DIS ("l.trap %d\n" ,K16 ); -#if defined(CONFIG_USER_ONLY ) -return ; -#else -if (dc->mem_idx ==MMU_USER_IDX ) { -gen_illegal_exception (dc); -return ; - }tcg_gen_movi_tl (cpu_pc, dc->pc);gen_exception (dc,EXCP_TRAP ); -#endif break ;case 0x300 :/* l.csync */ LOG_DIS ("l.csync\n" ); -#if defined(CONFIG_USER_ONLY ) -return ; -#else -if (dc->mem_idx ==MMU_USER_IDX ) { -gen_illegal_exception (dc); -return ; - } -#endif break ;case 0x200 :/* l.msync */ LOG_DIS ("l.msync\n" ); -#if defined(CONFIG_USER_ONLY ) -return ; -#else -if (dc->mem_idx ==MMU_USER_IDX ) { -gen_illegal_exception (dc); -return ; - } -#endif break ;case 0x270 :/* l.psync */ LOG_DIS ("l.psync\n" ); -#if defined(CONFIG_USER_ONLY ) -return ; -#else -if (dc->mem_idx ==MMU_USER_IDX ) { -gen_illegal_exception (dc); -return ; - } -#endif break ;default :
Signature · 1 line
2.9.3
Re: [Qemu-devel] [PATCH 15/22] target/openrisc: Enable trap, csync, msync, psync for user mode
Quoted 4 lines · Richard Henderson
Not documented as disabled for user mode.
Reviewed-by Bastian Koppelmann <[email protected]>Signed-off-by Richard Henderson <[email protected]>
Quoted 62 lines
--- target/openrisc/translate.c | 32 -------------------------------- 1 file changed, 32 deletions(-)target/openrisc/translate.c +0
-32@@ -1134,52 +1134,20 @@ static void dec_sys(DisasContext *dc, uint32_t insn)case 0x100 :/* l.trap */ LOG_DIS ("l.trap %d\n" ,K16 ); -#if defined(CONFIG_USER_ONLY ) -return ; -#else -if (dc->mem_idx ==MMU_USER_IDX ) { -gen_illegal_exception (dc); -return ; - }tcg_gen_movi_tl (cpu_pc, dc->pc);gen_exception (dc,EXCP_TRAP ); -#endif break ;case 0x300 :/* l.csync */ LOG_DIS ("l.csync\n" ); -#if defined(CONFIG_USER_ONLY ) -return ; -#else -if (dc->mem_idx ==MMU_USER_IDX ) { -gen_illegal_exception (dc); -return ; - } -#endif break ;case 0x200 :/* l.msync */ LOG_DIS ("l.msync\n" ); -#if defined(CONFIG_USER_ONLY ) -return ; -#else -if (dc->mem_idx ==MMU_USER_IDX ) { -gen_illegal_exception (dc); -return ; - } -#endif break ;case 0x270 :/* l.psync */ LOG_DIS ("l.psync\n" ); -#if defined(CONFIG_USER_ONLY ) -return ; -#else -if (dc->mem_idx ==MMU_USER_IDX ) { -gen_illegal_exception (dc); -return ; - } -#endif break ;default :
PATCH 16/22 target/openrisc: Implement msync
In reply to Richard Henderson--- target/openrisc/translate.c | 1 + 1 file changed, 1 insertion(+)
target/openrisc/translate.c +1 -0
@@ -1144,6 +1144,7 @@ static void dec_sys(DisasContext *dc, uint32_t insn)case 0x200 :/* l.msync */ LOG_DIS ("l.msync\n" ); +tcg_gen_mb (TCG_MO_ALL );break ;case 0x270 :/* l.psync */
Signature · 1 line
2.9.3
PATCH 17/22 target/openrisc: Represent MACHI:MACLO as a single unit
In reply to Richard HendersonSignificantly simplifies the implementation of the use of MAC.
--- target/openrisc/cpu.h | 3 +- target/openrisc/machine.c | 5 +- target/openrisc/sys_helper.c | 13 +++++ target/openrisc/translate.c | 120 +++++++++++++++++++++++-------------------- 4 files changed, 80 insertions(+), 61 deletions(-)
target/openrisc/cpu.h +1 -2
@@ -277,8 +277,7 @@ typedef struct CPUOpenRISCState {target_ulong ppc;/* Prev PC */ target_ulong jmp_pc;/* Jump PC */ -target_ulong machi;/* Multiply register MACHI */ -target_ulong maclo;/* Multiply register MACLO */ +uint64_t mac;/* Multiply registers MACHI:MACLO */ target_ulong fpmaddhi;/* Multiply and add float register FPMADDHI */ target_ulong fpmaddlo;/* Multiply and add float register FPMADDLO */
target/openrisc/machine.c +3 -2
@@ -47,8 +47,8 @@ static const VMStateInfo vmstate_sr = {static const VMStateDescription vmstate_env = { .name ="env" , - .version_id =2 , - .minimum_version_id =2 , + .version_id =3 , + .minimum_version_id =3 , .fields = (VMStateField []) {VMSTATE_UINTTL_ARRAY (gpr, CPUOpenRISCState,32 ),VMSTATE_UINTTL (pc, CPUOpenRISCState),
@@ -82,6 +82,7 @@ static const VMStateDescription vmstate_env = {VMSTATE_UINT32 (immucfgr, CPUOpenRISCState),VMSTATE_UINT32 (esr, CPUOpenRISCState),VMSTATE_UINT32 (fpcsr, CPUOpenRISCState), +VMSTATE_UINT64 (mac, CPUOpenRISCState), VMSTATE_END_OF_LIST() } };
target/openrisc/sys_helper.c +13 -0
@@ -120,6 +120,12 @@ void HELPER(mtspr)(CPUOpenRISCState *env, case TO_SPR(2, 1280) ... TO_SPR(2, 1407): /* ITLBW3MR 0-127 */ case TO_SPR(2, 1408) ... TO_SPR(2, 1535): /* ITLBW3TR 0-127 */break ; +case TO_SPR (5 ,1 ):/* MACLO */ + env->mac =deposit64 (env->mac,0 ,32 , rb); +break ; +case TO_SPR (5 ,2 ):/* MACHI */ + env->mac =deposit64 (env->mac,32 ,32 , rb); +break ;case TO_SPR (9 ,0 ):/* PICMR */ env->picmr |= rb;break ;
@@ -245,6 +251,13 @@ target_ulong HELPER(mfspr)(CPUOpenRISCState *env, case TO_SPR(2, 1408) ... TO_SPR(2, 1535): /* ITLBW3TR 0-127 */break ; +case TO_SPR (5 ,1 ):/* MACLO */ +return (uint32_t )env->mac; +break ; +case TO_SPR (5 ,2 ):/* MACHI */ +return env->mac >>32 ; +break ; +case TO_SPR (9 ,0 ):/* PICMR */ return env->picmr;
target/openrisc/translate.c +63 -57
160 lines not on this page · raw message
Signature · 1 line
2.9.3
PATCH 18/22 target/openrisc: Implement muld, muldu, macu, msbu
In reply to Richard Henderson--- target/openrisc/translate.c | 108 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+)
target/openrisc/translate.c +108 -0
@@ -362,6 +362,56 @@ static void gen_divu(DisasContext *dc, TCGv dest, TCGv srca, TCGv srcb)gen_ove_cy (dc); } +static void gen_muld (DisasContext *dc,TCGv srca,TCGv srcb) +{ +TCGv_i64 t1 =tcg_temp_new_i64 (); +TCGv_i64 t2 =tcg_temp_new_i64 (); + +tcg_gen_ext_tl_i64 (t1, srca); +tcg_gen_ext_tl_i64 (t2, srcb); +if (TARGET_LONG_BITS ==32 ) { +tcg_gen_mul_i64 (cpu_mac, t1, t2); +tcg_gen_movi_tl (cpu_sr_ov,0 ); + }else { +TCGv_i64 high =tcg_temp_new_i64 (); + +tcg_gen_muls2_i64 (cpu_mac, high, t1, t2); +tcg_gen_sari_i64 (t1, cpu_mac,63 ); +tcg_gen_setcond_i64 (TCG_COND_NE , t1, t1, high); +tcg_temp_free_i64 (high); +tcg_gen_trunc_i64_tl (cpu_sr_ov, t1); +tcg_gen_neg_tl (cpu_sr_ov, cpu_sr_ov); + +gen_ove_ov (dc); + } +tcg_temp_free_i64 (t1); +tcg_temp_free_i64 (t2); +} + +static void gen_muldu (DisasContext *dc,TCGv srca,TCGv srcb) +{ +TCGv_i64 t1 =tcg_temp_new_i64 (); +TCGv_i64 t2 =tcg_temp_new_i64 (); + +tcg_gen_extu_tl_i64 (t1, srca); +tcg_gen_extu_tl_i64 (t2, srcb); +if (TARGET_LONG_BITS ==32 ) { +tcg_gen_mul_i64 (cpu_mac, t1, t2); +tcg_gen_movi_tl (cpu_sr_cy,0 ); + }else { +TCGv_i64 high =tcg_temp_new_i64 (); + +tcg_gen_mulu2_i64 (cpu_mac, high, t1, t2); +tcg_gen_setcondi_i64 (TCG_COND_NE , high, high,0 ); +tcg_gen_trunc_i64_tl (cpu_sr_cy, high); +tcg_temp_free_i64 (high); + +gen_ove_cy (dc); + } +tcg_temp_free_i64 (t1); +tcg_temp_free_i64 (t2); +} +static void gen_mac (DisasContext *dc,TCGv srca,TCGv srcb) {TCGv_i64 t1 =tcg_temp_new_i64 ();
@@ -388,6 +438,25 @@ static void gen_mac(DisasContext *dc, TCGv srca, TCGv srcb)gen_ove_ov (dc); } +static void gen_macu (DisasContext *dc,TCGv srca,TCGv srcb) +{ +TCGv_i64 t1 =tcg_temp_new_i64 (); +TCGv_i64 t2 =tcg_temp_new_i64 (); + +tcg_gen_extu_tl_i64 (t1, srca); +tcg_gen_extu_tl_i64 (t2, srcb); +tcg_gen_mul_i64 (t1, t1, t2); +tcg_temp_free_i64 (t2); + +/* Note that overflow is only computed during addition stage. */ +tcg_gen_add_i64 (cpu_mac, cpu_mac, t1); +tcg_gen_setcond_i64 (TCG_COND_LTU , t1, cpu_mac, t1); +tcg_gen_trunc_i64_tl (cpu_sr_cy, t1); +tcg_temp_free_i64 (t1); + +gen_ove_cy (dc); +} +static void gen_msb (DisasContext *dc,TCGv srca,TCGv srcb) {TCGv_i64 t1 =tcg_temp_new_i64 ();
@@ -414,6 +483,25 @@ static void gen_msb(DisasContext *dc, TCGv srca, TCGv srcb)gen_ove_ov (dc); } +static void gen_msbu (DisasContext *dc,TCGv srca,TCGv srcb) +{ +TCGv_i64 t1 =tcg_temp_new_i64 (); +TCGv_i64 t2 =tcg_temp_new_i64 (); + +tcg_gen_extu_tl_i64 (t1, srca); +tcg_gen_extu_tl_i64 (t2, srcb); +tcg_gen_mul_i64 (t1, t1, t2); + +/* Note that overflow is only computed during subtraction stage. */ +tcg_gen_setcond_i64 (TCG_COND_LTU , t2, cpu_mac, t1); +tcg_gen_sub_i64 (cpu_mac, cpu_mac, t1); +tcg_gen_trunc_i64_tl (cpu_sr_cy, t2); +tcg_temp_free_i64 (t2); +tcg_temp_free_i64 (t1); + +gen_ove_cy (dc); +} +static void gen_lwa (DisasContext *dc,TCGv rd,TCGv ra,int32_t ofs) {TCGv ea =tcg_temp_new ();
@@ -590,6 +678,11 @@ static void dec_calc(DisasContext *dc, uint32_t insn)gen_mul (dc, cpu_R[rd], cpu_R[ra], cpu_R[rb]);return ; +case 0x7 :/* l.muld */ +LOG_DIS ("l.muld r%d, r%d\n" , ra, rb); +gen_muld (dc, cpu_R[ra], cpu_R[rb]); +break ; +case 0x9 :/* l.div */ LOG_DIS ("l.div r%d, r%d, r%d\n" , rd, ra, rb);gen_div (dc, cpu_R[rd], cpu_R[ra], cpu_R[rb]);
@@ -604,6 +697,11 @@ static void dec_calc(DisasContext *dc, uint32_t insn)LOG_DIS ("l.mulu r%d, r%d, r%d\n" , rd, ra, rb);gen_mulu (dc, cpu_R[rd], cpu_R[ra], cpu_R[rb]);return ; + +case 0xc :/* l.muldu */ +LOG_DIS ("l.muldu r%d, r%d\n" , ra, rb); +gen_muldu (dc, cpu_R[ra], cpu_R[rb]); +return ; }break ; }
@@ -916,6 +1014,16 @@ static void dec_mac(DisasContext *dc, uint32_t insn)gen_msb (dc, cpu_R[ra], cpu_R[rb]);break ; +case 0x0003 :/* l.macu */ +LOG_DIS ("l.macu r%d, r%d\n" , ra, rb); +gen_macu (dc, cpu_R[ra], cpu_R[rb]); +break ; + +case 0x0004 :/* l.msbu */ +LOG_DIS ("l.msbu r%d, r%d\n" , ra, rb); +gen_msbu (dc, cpu_R[ra], cpu_R[rb]); +break ; +default :gen_illegal_exception (dc);break ;
Signature · 1 line
2.9.3
PATCH 19/22 target/openrisc: Fix madd
In reply to Richard HendersonNote that the specification for lf.madd.s is confused. It's the only mention of supposed FPMADDHI/FPMADDLO special registers. On the other hand, or1ksim implements a somewhat normal non-fused multiply and add. Mirror that.
--- target/openrisc/cpu.h | 3 -- target/openrisc/fpu_helper.c | 68 ++++++++++++++++---------------------------- target/openrisc/helper.h | 7 ++--- target/openrisc/translate.c | 13 +++------ 4 files changed, 30 insertions(+), 61 deletions(-)
target/openrisc/cpu.h +0 -3
@@ -279,9 +279,6 @@ typedef struct CPUOpenRISCState {uint64_t mac;/* Multiply registers MACHI:MACLO */ -target_ulong fpmaddhi;/* Multiply and add float register FPMADDHI */ -target_ulong fpmaddlo;/* Multiply and add float register FPMADDLO */ -target_ulong epcr;/* Exception PC register */ target_ulong eear;/* Exception EA register */
target/openrisc/fpu_helper.c +24 -44
76 lines not on this page · raw message
target/openrisc/helper.h +2 -5
@@ -29,11 +29,8 @@ DEF_HELPER_FLAGS_2(itofs, TCG_CALL_NO_WG, i32, env, i32) DEF_HELPER_FLAGS_2(ftoid, TCG_CALL_NO_WG, i64, env, i64) DEF_HELPER_FLAGS_2(ftois, TCG_CALL_NO_WG, i32, env, i32) -#define FOP_MADD (op) \ -DEF_HELPER_FLAGS_3(float_ ## op ## _s, TCG_CALL_NO_WG, i32, env, i32, i32) \ -DEF_HELPER_FLAGS_3(float_ ## op ## _d, TCG_CALL_NO_WG, i64, env, i64, i64) -FOP_MADD(muladd) -#undef FOP_MADD +DEF_HELPER_FLAGS_4(float_madd_s, TCG_CALL_NO_WG, i32, env, i32, i32, i32) +DEF_HELPER_FLAGS_4(float_madd_d, TCG_CALL_NO_WG, i64, env, i64, i64, i64)#define FOP_CALC (op) \ DEF_HELPER_FLAGS_3(float_ ## op ## _s, TCG_CALL_NO_WG, i32, env, i32, i32) \
target/openrisc/translate.c +4 -9
@@ -61,7 +61,6 @@ static TCGv cpu_lock_addr;static TCGv cpu_lock_value;static TCGv_i32 fpcsr;static TCGv_i64 cpu_mac;/* MACHI:MACLO */ -static TCGv fpmaddhi, fpmaddlo;static TCGv_i32 env_flags;#include "exec/gen-icount.h"
@@ -108,12 +107,6 @@ void openrisc_translate_init(void) cpu_mac =tcg_global_mem_new_i64 (cpu_env, offsetof(CPUOpenRISCState , mac),"mac" ); - fpmaddhi =tcg_global_mem_new (cpu_env, - offsetof(CPUOpenRISCState , fpmaddhi), -"fpmaddhi" ); - fpmaddlo =tcg_global_mem_new (cpu_env, - offsetof(CPUOpenRISCState , fpmaddlo), -"fpmaddlo" );for (i =0 ; i <32 ; i++) { cpu_R[i] =tcg_global_mem_new (cpu_env, offsetof(CPUOpenRISCState, gpr[i]),
@@ -1324,7 +1317,8 @@ static void dec_float(DisasContext *dc, uint32_t insn)case 0x07 :/* lf.madd.s */ LOG_DIS ("lf.madd.s r%d, r%d, r%d\n" , rd, ra, rb); -gen_helper_float_muladd_s (cpu_R[rd], cpu_env, cpu_R[ra], cpu_R[rb]); +gen_helper_float_madd_s (cpu_R[rd], cpu_env, cpu_R[rd], + cpu_R[ra], cpu_R[rb]);break ;case 0x08 :/* lf.sfeq.s */
@@ -1409,7 +1403,8 @@ static void dec_float(DisasContext *dc, uint32_t insn) case 0x17: lf.madd.dLOG_DIS ("lf.madd.d r%d, r%d, r%d\n" , rd, ra, rb);check_of64s (dc); -gen_helper_float_muladd_d (cpu_R[rd], cpu_env, cpu_R[ra], cpu_R[rb]); +gen_helper_float_madd_d (cpu_R[rd], cpu_env, cpu_R[rd], + cpu_R[ra], cpu_R[rb]);break ;case 0x18 : lf.sfeq.d
Signature · 1 line
2.9.3
PATCH 20/22 target/openrisc: Optimize l.jal to next
In reply to Richard HendersonThis allows the tcg optimizer to see, and fold, all of the constants involved in a GOT base register load sequence.
--- target/openrisc/translate.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
target/openrisc/translate.c +5 -1
@@ -198,7 +198,11 @@ static void gen_jump(DisasContext *dc, int32_t n26, uint32_t reg, uint32_t op0)tcg_gen_movi_tl (jmp_pc, tmp_pc);break ;case 0x01 :/* l.jal */ -tcg_gen_movi_tl (cpu_R[9 ], (dc->pc +8 )); +tcg_gen_movi_tl (cpu_R[9 ], dc->pc +8 ); +/* Optimize jal being used to load the PC for PIC. */ +if (tmp_pc == dc->pc +8 ) { +return ; + }tcg_gen_movi_tl (jmp_pc, tmp_pc);break ;case 0x03 :/* l.bnf */
Signature · 1 line
2.9.3
Re: [Qemu-devel] [PATCH 20/22] target/openrisc: Optimize l.jal to next
Quoted 4 lines · Richard Henderson
This allows the tcg optimizer to see, and fold, all of the constants involved in a GOT base register load sequence.
Signed-off-by Richard Henderson <[email protected]>
Quoted 22 lines
--- target/openrisc/translate.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)target/openrisc/translate.c +5
-1@@ -198,7 +198,11 @@ static void gen_jump(DisasContext *dc, int32_t n26, uint32_t reg, uint32_t op0)tcg_gen_movi_tl (jmp_pc, tmp_pc);break ;case 0x01 :/* l.jal */ -tcg_gen_movi_tl (cpu_R[9 ], (dc->pc +8 )); +tcg_gen_movi_tl (cpu_R[9 ], dc->pc +8 ); +/* Optimize jal being used to load the PC for PIC. */ +if (tmp_pc == dc->pc +8 ) { +return ; + }tcg_gen_movi_tl (jmp_pc, tmp_pc);break ;case 0x03 :/* l.bnf */
PATCH 21/22 target/openrisc: Tidy ppc/npc implementation
In reply to Richard HendersonThe NPC SPR is really only supposed to be used for FPGA debugging. It contains the same contents as PC, unless one plays games. Follow the or1ksim implementation in flushing delayed branch state when it is changed.
The PPC SPR need not be updated every instruction, merely when we exit the TB or attempt to read its contents.
--- target/openrisc/cpu.h | 2 +- target/openrisc/gdbstub.c | 13 +++++++---- target/openrisc/interrupt_helper.c | 1 - target/openrisc/machine.c | 5 ++--- target/openrisc/sys_helper.c | 44 ++++++++++++++------------------------ target/openrisc/translate.c | 29 ++++++++++--------------- 6 files changed, 39 insertions(+), 55 deletions(-)
target/openrisc/cpu.h +1 -1
@@ -58,6 +58,7 @@ typedef struct OpenRISCCPUClass { } OpenRISCCPUClass;#define NB_MMU_MODES 3 +#define TARGET_INSN_START_EXTRA_WORDS 1enum {MMU_NOMMU_IDX =0 ,
@@ -273,7 +274,6 @@ typedef struct CPUOpenRISCTLBContext { typedef struct CPUOpenRISCState { target_ulong gpr[32]; /* General registers */ target_ulong pc; /* Program counter */ - target_ulong npc; /* Next PC */ target_ulong ppc; /* Prev PC */ target_ulong jmp_pc; /* Jump PC */
target/openrisc/gdbstub.c +9 -4
@@ -34,8 +34,8 @@ int openrisc_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n)case 32 :/* PPC */ return gdb_get_reg32 (mem_buf, env->ppc); -case 33 :/* NPC */ -return gdb_get_reg32 (mem_buf, env->npc); +case 33 :/* NPC (equals PC) */ +return gdb_get_reg32 (mem_buf, env->pc);case 34 :/* SR */ return gdb_get_reg32 (mem_buf,cpu_get_sr (env));
@@ -68,8 +68,13 @@ int openrisc_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n) env->ppc = tmp;break ; -case 33 :/* NPC */ - env->npc = tmp; +case 33 :/* NPC (equals PC) */ +/* If setting PC to something different, +also clear delayed branch status. */ +if (env->pc != tmp) { + env->pc = tmp; + env->flags =0 ; + }break ;case 34 :/* SR */
target/openrisc/interrupt_helper.c +0 -1
@@ -32,7 +32,6 @@ void HELPER(rfe)(CPUOpenRISCState *env) (cpu->env.esr & (SR_SM |SR_IME |SR_DME ));#endif cpu->env.pc = cpu->env.epcr; - cpu->env.npc = cpu->env.epcr;cpu_set_sr (&cpu->env, cpu->env.esr); cpu->env.lock_addr =-1 ;
target/openrisc/machine.c +2 -3
@@ -47,12 +47,11 @@ static const VMStateInfo vmstate_sr = {static const VMStateDescription vmstate_env = { .name ="env" , - .version_id =3 , - .minimum_version_id =3 , + .version_id =4 , + .minimum_version_id =4 , .fields = (VMStateField []) {VMSTATE_UINTTL_ARRAY (gpr, CPUOpenRISCState,32 ),VMSTATE_UINTTL (pc, CPUOpenRISCState), -VMSTATE_UINTTL (npc, CPUOpenRISCState),VMSTATE_UINTTL (ppc, CPUOpenRISCState),VMSTATE_UINTTL (jmp_pc, CPUOpenRISCState),VMSTATE_UINTTL (lock_addr, CPUOpenRISCState),
target/openrisc/sys_helper.c +16 -28
90 lines not on this page · raw message
target/openrisc/translate.c +11 -18
@@ -39,7 +39,7 @@ typedef struct DisasContext { TranslationBlock *tb; - target_ulong pc, ppc, npc; + target_ulong pc; uint32_t tb_flags, synced_flags, flags; uint32_t is_jmp; uint32_t mem_idx;
@@ -52,7 +52,6 @@ static TCGv cpu_sr;static TCGv cpu_R[32 ];static TCGv cpu_pc;static TCGv jmp_pc;/* l.jr/l.jalr temp pc */ -static TCGv cpu_npc;static TCGv cpu_ppc;static TCGv cpu_sr_f;/* bf/bnf, F flag taken */ static TCGv cpu_sr_cy;/* carry (unsigned overflow) */
@@ -83,8 +82,6 @@ void openrisc_translate_init(void) "flags"); cpu_pc =tcg_global_mem_new (cpu_env, offsetof(CPUOpenRISCState , pc),"pc" ); - cpu_npc =tcg_global_mem_new (cpu_env, - offsetof(CPUOpenRISCState , npc),"npc" ); cpu_ppc =tcg_global_mem_new (cpu_env, offsetof(CPUOpenRISCState , ppc),"ppc" ); jmp_pc = tcg_global_mem_new(cpu_env,
@@ -1514,7 +1511,6 @@ void gen_intermediate_code(CPUOpenRISCState *env, struct TranslationBlock *tb) dc->tb = tb; dc->is_jmp =DISAS_NEXT ; - dc->ppc = pc_start; dc->pc = pc_start; dc->flags = cpu->env.cpucfgr; dc->mem_idx =cpu_mmu_index (&cpu->env, false);
@@ -1543,7 +1539,7 @@ void gen_intermediate_code(CPUOpenRISCState *env, struct TranslationBlock *tb)gen_tb_start (tb); do { - tcg_gen_insn_start(dc->pc); + tcg_gen_insn_start(dc->pc, num_insns != 0); num_insns++; if (unlikely(cpu_breakpoint_test(cs, dc->pc, BP_ANY))) {
@@ -1561,12 +1557,9 @@ void gen_intermediate_code(CPUOpenRISCState *env, struct TranslationBlock *tb)if (num_insns == max_insns && (tb->cflags &CF_LAST_IO )) {gen_io_start (); } - dc->ppc = dc->pc -4 ; - dc->npc = dc->pc +4 ; -tcg_gen_movi_tl (cpu_ppc, dc->ppc); -tcg_gen_movi_tl (cpu_npc, dc->npc);disas_openrisc_insn (dc, cpu); - dc->pc = dc->npc; + dc->pc = dc->pc +4 ; +/* delay slot */ if (dc->delayed_branch) { dc->delayed_branch--;
@@ -1574,10 +1567,8 @@ void gen_intermediate_code(CPUOpenRISCState *env, struct TranslationBlock *tb) dc->tb_flags &= ~D_FLAG ;gen_sync_flags (dc);tcg_gen_mov_tl (cpu_pc, jmp_pc); -tcg_gen_mov_tl (cpu_npc, jmp_pc); -tcg_gen_movi_tl (jmp_pc,0 ); -tcg_gen_exit_tb (0 ); - dc->is_jmp =DISAS_JUMP ; +tcg_gen_discard_tl (jmp_pc); + dc->is_jmp =DISAS_UPDATE ;break ; } }
@@ -1591,14 +1582,13 @@ void gen_intermediate_code(CPUOpenRISCState *env, struct TranslationBlock *tb)if (tb->cflags &CF_LAST_IO ) {gen_io_end (); } + +tcg_gen_movi_tl (cpu_ppc, dc->pc -4 );if (dc->is_jmp ==DISAS_NEXT ) { dc->is_jmp =DISAS_UPDATE ;tcg_gen_movi_tl (cpu_pc, dc->pc); }if (unlikely (cs->singlestep_enabled)) { -if (dc->is_jmp ==DISAS_NEXT ) { -tcg_gen_movi_tl (cpu_pc, dc->pc); - }gen_exception (dc,EXCP_DEBUG ); }else {switch (dc->is_jmp) {
@@ -1651,4 +1641,7 @@ void restore_state_to_opc(CPUOpenRISCState *env, TranslationBlock *tb, target_ulong *data) { env->pc = data[0 ]; +if (data[1 ]) { + env->ppc = env->pc -4 ; + } }
Signature · 1 line
2.9.3
PATCH 22/22 target/openrisc: Tidy handling of delayed branches
In reply to Richard Henderson--- target/openrisc/cpu.h | 12 +++++------- target/openrisc/gdbstub.c | 2 +- target/openrisc/interrupt.c | 4 ++-- target/openrisc/sys_helper.c | 2 +- target/openrisc/translate.c | 40 ++++++++++++++++------------------------ 5 files changed, 25 insertions(+), 35 deletions(-)
target/openrisc/cpu.h +5 -7
@@ -83,9 +83,6 @@ enum {/* Version Register */ #define SPR_VR 0xFFFF003F -/* Internal flags, delay slot flag */ -#define D_FLAG 1 -/* Interrupt */ #define NR_IRQS 32
@@ -298,8 +295,7 @@ typedef struct CPUOpenRISCState {target_ulong lock_addr;target_ulong lock_value; -uint32_t flags;/* cpu_flags, we only use it for exception -in solt so far. */ +uint32_t dflag;/* In delay slot (boolean) */ /* Fields up to this point are cleared by a CPU reset */ struct {} end_reset_fields;
@@ -392,14 +388,16 @@ int cpu_openrisc_get_phys_data(OpenRISCCPU *cpu,#include "exec/cpu-all.h" +#define TB_FLAGS_DFLAG 1 +#define TB_FLAGS_OVE SR_OVE +static inline void cpu_get_tb_cpu_state (CPUOpenRISCState *env,target_ulong *pc,target_ulong *cs_base,uint32_t *flags) { *pc = env->pc; *cs_base =0 ; -/* D_FLAG -- branch instruction exception, OVE overflow trap enable. */ - *flags = (env->flags &D_FLAG ) | (env->sr &SR_OVE ); + *flags = env->dflag | (env->sr &SR_OVE ); }static inline int cpu_mmu_index (CPUOpenRISCState *env,bool ifetch)
target/openrisc/gdbstub.c +1 -1
@@ -73,7 +73,7 @@ int openrisc_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)also clear delayed branch status. */ if (env->pc != tmp) { env->pc = tmp; - env->flags =0 ; + env->dflag =0 ; }break ;
target/openrisc/interrupt.c +2 -2
@@ -34,8 +34,8 @@ void openrisc_cpu_do_interrupt(CPUState *cs)CPUOpenRISCState *env = &cpu->env; env->epcr = env->pc; -if (env->flags &D_FLAG ) { - env->flags &= ~D_FLAG ; +if (env->dflag) { + env->dflag =0 ; env->sr |=SR_DSX ; env->epcr -=4 ; }else {
target/openrisc/sys_helper.c +1 -1
@@ -45,7 +45,7 @@ void HELPER(mtspr)(CPUOpenRISCState *env,when "jumping" to the current instruction. */ if (env->pc != rb) { env->pc = rb; - env->flags =0 ; + env->dflag =0 ;cpu_loop_exit (cs); }break ;
target/openrisc/translate.c +16 -24
@@ -40,11 +40,11 @@typedef struct DisasContext {TranslationBlock *tb;target_ulong pc; -uint32_t tb_flags, synced_flags, flags;uint32_t is_jmp;uint32_t mem_idx; -int singlestep_enabled; +uint32_t tb_flags;uint32_t delayed_branch; +bool singlestep_enabled; }DisasContext ;static TCGv_env cpu_env;
@@ -60,7 +60,7 @@ static TCGv cpu_lock_addr;static TCGv cpu_lock_value;static TCGv_i32 fpcsr;static TCGv_i64 cpu_mac;/* MACHI:MACLO */ -static TCGv_i32 env_flags; +static TCGv_i32 cpu_dflag;#include "exec/gen-icount.h" void openrisc_translate_init (void )
@@ -77,9 +77,9 @@ void openrisc_translate_init(void) tcg_ctx.tcg_env = cpu_env; cpu_sr =tcg_global_mem_new (cpu_env, offsetof(CPUOpenRISCState , sr),"sr" ); - env_flags =tcg_global_mem_new_i32 (cpu_env, - offsetof(CPUOpenRISCState , flags), -"flags" ); + cpu_dflag =tcg_global_mem_new_i32 (cpu_env, + offsetof(CPUOpenRISCState , dflag), +"dflag" ); cpu_pc =tcg_global_mem_new (cpu_env, offsetof(CPUOpenRISCState , pc),"pc" ); cpu_ppc = tcg_global_mem_new(cpu_env,
@@ -111,15 +111,6 @@ void openrisc_translate_init(void) } } -static inline void gen_sync_flags (DisasContext *dc) -{ -/* Sync the tb dependent flag between translate and runtime. */ -if ((dc->tb_flags ^ dc->synced_flags) &D_FLAG ) { -tcg_gen_movi_tl (env_flags, dc->tb_flags &D_FLAG ); - dc->synced_flags = dc->tb_flags; - } -} -static void gen_exception (DisasContext *dc,unsigned int excp) {TCGv_i32 tmp =tcg_const_i32 (excp);
@@ -230,8 +221,6 @@ static void gen_jump(DisasContext *dc, int32_t n26, uint32_t reg, uint32_t op0) } dc->delayed_branch =2 ; - dc->tb_flags |=D_FLAG ; -gen_sync_flags (dc); }static void gen_ove_cy (DisasContext *dc)
@@ -1512,10 +1501,9 @@ void gen_intermediate_code(CPUOpenRISCState *env, struct TranslationBlock *tb) dc->is_jmp =DISAS_NEXT ; dc->pc = pc_start; - dc->flags = cpu->env.cpucfgr; dc->mem_idx =cpu_mmu_index (&cpu->env, false); - dc->synced_flags = dc->tb_flags = tb->flags; - dc->delayed_branch = (dc->tb_flags &D_FLAG ) !=0 ; + dc->tb_flags = tb->flags; + dc->delayed_branch = (dc->tb_flags &TB_FLAGS_DFLAG ) !=0 ; dc->singlestep_enabled = cs->singlestep_enabled; next_page_start = (pc_start &TARGET_PAGE_MASK ) +TARGET_PAGE_SIZE ;
@@ -1539,7 +1527,8 @@ void gen_intermediate_code(CPUOpenRISCState *env, struct TranslationBlock *tb)gen_tb_start (tb); do { - tcg_gen_insn_start(dc->pc, num_insns != 0); + tcg_gen_insn_start(dc->pc, (dc->delayed_branch ? 1 : 0) + | (num_insns ? 2 : 0)); num_insns++; if (unlikely(cpu_breakpoint_test(cs, dc->pc, BP_ANY))) {
@@ -1564,8 +1553,6 @@ void gen_intermediate_code(CPUOpenRISCState *env, struct TranslationBlock *tb)if (dc->delayed_branch) { dc->delayed_branch--;if (!dc->delayed_branch) { - dc->tb_flags &= ~D_FLAG ; -gen_sync_flags (dc);tcg_gen_mov_tl (cpu_pc, jmp_pc);tcg_gen_discard_tl (jmp_pc); dc->is_jmp =DISAS_UPDATE ;
@@ -1583,6 +1570,10 @@ void gen_intermediate_code(CPUOpenRISCState *env, struct TranslationBlock *tb)gen_io_end (); } +if ((dc->tb_flags &TB_FLAGS_DFLAG ?1 :0 ) != (dc->delayed_branch !=0 )) { +tcg_gen_movi_i32 (cpu_dflag, dc->delayed_branch !=0 ); + } +tcg_gen_movi_tl (cpu_ppc, dc->pc -4 );if (dc->is_jmp ==DISAS_NEXT ) { dc->is_jmp =DISAS_UPDATE ;
@@ -1641,7 +1632,8 @@ void restore_state_to_opc(CPUOpenRISCState *env, TranslationBlock *tb, target_ulong *data) { env->pc = data[0 ]; -if (data[1 ]) { + env->dflag = data[1 ] &1 ; +if (data[1 ] &2 ) { env->ppc = env->pc -4 ; } }
Signature · 1 line
2.9.3
[Qemu-devel] [PATCH 23/22] linux-user: Honor CLONE_SETTLS for openrisc
In reply to Richard HendersonThreads work much better when you set the TLS register. This was fixed in the upstream kernel for Linux 4.9.
--- linux-user/openrisc/target_cpu.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
linux-user/openrisc/target_cpu.h +1 -3
@@ -30,9 +30,7 @@ static inline void cpu_clone_regs(CPUOpenRISCState *env, target_ulong newsp)static inline void cpu_set_tls (CPUOpenRISCState *env,target_ulong newtls) { -/* Linux kernel 3.10 does not pay any attention to CLONE_SETTLS -* in copy_thread(), so QEMU need not do so either. -*/ + env->gpr[10 ] = newtls; }#endif
Signature · 1 line
2.9.3
Stafford Horne
Reviewed-by[OpenRISC] [PATCH 23/22] linux-user: Honor CLONE_SETTLS for openrisc
23/22 ?
:)
Quoted 26 lines · Richard Henderson
Threads work much better when you set the TLS register. This was fixed in the upstream kernel for Linux 4.9.
Signed-off-by Richard Henderson <[email protected]>--- linux-user/openrisc/target_cpu.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)linux-user/openrisc/target_cpu.h +1
-3@@ -30,9 +30,7 @@ static inline void cpu_clone_regs(CPUOpenRISCState *env, target_ulong newsp)static inline void cpu_set_tls (CPUOpenRISCState *env,target_ulong newtls) { -/* Linux kernel 3.10 does not pay any attention to CLONE_SETTLS -* in copy_thread(), so QEMU need not do so either. -*/ + env->gpr[10 ] = newtls; }#endif Signature · 1 line
2.9.3