target-openrisc improvements
cover target-openrisc improvements
This is a refresh of a branch I worked on in February, but I don't believe was ever posted. I'm doing so now in order to flush my set of uncommitted branches.
The openrisc target is in terrible shape and, as far as I can tell from the opencores mailing list, no one uses it. The fact that it's missing so many of the instructions in the ISA, so many that we cannot execute the musl libc, is proof of that.
This patch set should probably be reviewed and merged, or we should drop the whole target.
r~
Richard Henderson (17):
target-openrisc: Always enable OPENRISC_DISAS
target-openrisc: Streamline arithmetic and OVE
target-openrisc: Invert the decoding in dec_calc
target-openrisc: Keep SR_F in a separate variable
target-openrisc: Use movcond where appropriate
target-openrisc: Put SR[OVE] in TB flags
target-openrisc: Keep SR_CY and SR_OV in a separate variables
target-openrisc: Set flags on helpers
target-openrisc: Implement ff1 and fl1 for 64-bit
target-openrisc: Represent MACHI:MACLO as a single unit
target-openrisc: Rationalize immediate extraction
target-openrisc: Enable m[tf]spr from user mode
target-openrisc: Enable trap, csync, msync, psync for user mode
target-openrisc: Implement muld, muldu, macu, msbu
target-openrisc: Fix madd
target-openrisc: Write back result before FPE exception
target-openrisc: Implement lwa, swa
linux-user/main.c | 45 ++ target-openrisc/cpu.c | 1 + target-openrisc/cpu.h | 41 +- target-openrisc/exception_helper.c | 31 + target-openrisc/fpu_helper.c | 286 ++----- target-openrisc/gdbstub.c | 4 +- target-openrisc/helper.h | 42 +- target-openrisc/int_helper.c | 57 +- target-openrisc/interrupt.c | 3 +- target-openrisc/interrupt_helper.c | 3 +- target-openrisc/mmu.c | 1 + target-openrisc/sys_helper.c | 69 +- target-openrisc/translate.c | 1443 ++++++++++++++++-------------------- 13 files changed, 883 insertions(+), 1143 deletions(-)
Signature · 1 line
2.4.3
PATCH 1/17 target-openrisc: Always enable OPENRISC_DISAS
Avoids warnings from unused variables etc.
--- target-openrisc/translate.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-)
target-openrisc/translate.c +4 -16
@@ -33,14 +33,9 @@#include "trace-tcg.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 +/* Set to 0 to completely disable. */ +#define OPENRISC_DISAS CPU_LOG_TB_IN_ASM +#define LOG_DIS (...) qemu_log_mask(OPENRISC_DISAS, ## __VA_ARGS__) typedef struct DisasContext { TranslationBlock *tb;
@@ -704,9 +699,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;
@@ -715,10 +708,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 );
@@ -1315,13 +1306,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 */
Signature · 1 line
2.4.3
Re: [Qemu-devel] [PATCH 01/17] target-openrisc: Always enable OPENRISC_DISAS
Quoted 8 lines · Richard Henderson
Avoids warnings from unused variables etc.
Signed-off-by Richard Henderson <[email protected]>--- target-openrisc/translate.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-)
Cheers,
Bastian
PATCH 2/17 target-openrisc: Streamline arithmetic and OVE
In reply to Richard HendersonSimplify overflow calculation. Move overflow exception check to a helper function, to eliminate inline branches.
--- target-openrisc/exception_helper.c | 12 ++ target-openrisc/helper.h | 1 + target-openrisc/translate.c | 426 +++++++++++++++---------------------- 3 files changed, 190 insertions(+), 249 deletions(-)
target-openrisc/exception_helper.c +12 -0
@@ -27,3 +27,15 @@ 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_restore_state (cs,GETPC ()); +cpu_loop_exit (cs); + } +}
target-openrisc/helper.h +1 -0
@@ -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)
target-openrisc/translate.c +177 -249
496 lines not on this page · raw message
Signature · 1 line
2.4.3
Re: [Qemu-devel] [PATCH 02/17] target-openrisc: Streamline arithmetic and OVE
target-openrisc/exception_helper.c void HELPER(exception)(CPUOpenRISCState *env, uint32_t excp) · line 41
Quoted 12 lines · Richard Henderson
target-openrisc/exception_helper.c +12
-0+ +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_restore_state (cs,GETPC ()); +cpu_loop_exit (cs); + } +}
You forgot to check the AECR register, whether the exception really occurs.
target-openrisc/translate.c static void gen_jump(DisasContext *dc, uint32_t imm, uint32_t reg, uint32_t op0) · line 259
Quoted 11 lines
target-openrisc/translate.c +10
-0+static void gen_ove_cy (DisasContext *dc,TCGv cy) +{ +gen_helper_ove (cpu_env, cy); +} + +static void gen_ove_ov (DisasContext *dc,TCGv ov) +{ +gen_helper_ove (cpu_env, ov); +} +
Do we really need two functions here? They differ only by the name of the second argument. We should directly use gen_helper_ove ().
Quoted 14 lines
target-openrisc/translate.c +14
-0+static void gen_add (DisasContext *dc,TCGv dest,TCGv srca,TCGv srcb) +{ +TCGv t0 =tcg_const_tl (0 ); +TCGv res =tcg_temp_new (); +TCGv sr_cy =tcg_temp_new (); +TCGv sr_ov =tcg_temp_new (); + +tcg_gen_add2_tl (res, sr_cy, srca, t0, srcb, t0); +tcg_gen_xor_tl (sr_ov, srca, srcb); +tcg_gen_xor_tl (t0, res, srcb); +tcg_gen_andc_tl (sr_ov, t0, sr_ov); +tcg_temp_free (t0); + +tcg_gen_mov_tl (dest, res);
target-openrisc/translate.c static void gen_jump(DisasContext *dc, uint32_t imm, uint32_t reg, uint32_t op0) · line 291
Quoted 10 lines
target-openrisc/translate.c +10
-0+tcg_temp_free (res); + +tcg_gen_shri_tl (sr_ov, sr_ov,TARGET_LONG_BITS -1 ); +tcg_gen_deposit_tl (cpu_sr, cpu_sr, sr_cy,ctz32 (SR_CY ),1 ); +tcg_gen_deposit_tl (cpu_sr, cpu_sr, sr_ov,ctz32 (SR_OV ),1 ); + +gen_ove_cyov (dc, sr_ov, sr_cy); +tcg_temp_free (sr_ov); +tcg_temp_free (sr_cy); +}
I do wonder, if we should use TCG globals for sr_cy and sr_ov, as you recommended for the TriCore target. It would not change the helper in case of no ovf/carry, but simplify addc. And we would not need two deposits for every add/sub.
target-openrisc/translate.c static void dec_calc(DisasContext *dc, uint32_t insn) · line 499
Quoted 6 lines
target-openrisc/translate.c +1
-5-if (ra !=0 && rb !=0 ) { -gen_helper_mul32 (cpu_R[rd], cpu_env, cpu_R[ra], cpu_R[rb]); - }else { -tcg_gen_movi_tl (cpu_R[rd],0x0 ); - } +gen_mul (dc, cpu_R[rd], cpu_R[ra], cpu_R[rb]);
What happened to this special case here? r0 should always hold zero, so we can keep this optimization here, or at least move it to gen_mul().
Quoted 20 lines
target-openrisc/translate.c +0
-20-if (rb !=0 && ra !=0 ) { -TCGv_i64 result =tcg_temp_local_new_i64 (); -TCGv_i64 tra =tcg_temp_local_new_i64 (); -TCGv_i64 trb =tcg_temp_local_new_i64 (); -TCGv_i64 high =tcg_temp_new_i64 (); -TCGv_i32 sr_ove =tcg_temp_local_new_i32 (); -TCGLabel *lab =gen_new_label (); -/* Calculate each result. */ -tcg_gen_extu_i32_i64 (tra, cpu_R[ra]); -tcg_gen_extu_i32_i64 (trb, cpu_R[rb]); -tcg_gen_mul_i64 (result, tra, trb); -tcg_temp_free_i64 (tra); -tcg_temp_free_i64 (trb); -tcg_gen_shri_i64 (high, result,TARGET_LONG_BITS ); -/* Overflow or not. */ -tcg_gen_brcondi_i64 (TCG_COND_EQ , high,0x00000000 , lab); -tcg_gen_ori_tl (cpu_sr, cpu_sr, (SR_OV |SR_CY )); -tcg_gen_andi_tl (sr_ove, cpu_sr,SR_OVE ); -tcg_gen_brcondi_tl (TCG_COND_NE , sr_ove,SR_OVE , lab); -gen_exception (dc,EXCP_RANGE );
target-openrisc/translate.c static void dec_calc(DisasContext *dc, uint32_t insn) · line 538
Quoted 10 lines
target-openrisc/translate.c +1
-8-gen_set_label (lab); -tcg_temp_free_i64 (high); -tcg_gen_trunc_i64_tl (cpu_R[rd], result); -tcg_temp_free_i64 (result); -tcg_temp_free_i32 (sr_ove); - }else { -tcg_gen_movi_tl (cpu_R[rd],0 ); - } +gen_mulu (dc, cpu_R[rd], cpu_R[ra], cpu_R[rb]);break ;
The same here.
Quoted 23 lines
target-openrisc/translate.c +0
-23- { -if (I16 ==0 ) { -tcg_gen_mov_tl (cpu_R[rd], cpu_R[ra]); - }else { -TCGLabel *lab =gen_new_label (); -TCGv_i64 ta =tcg_temp_new_i64 (); -TCGv_i64 td =tcg_temp_local_new_i64 (); -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_extrl_i64_i32 (res, td); -tcg_gen_shri_i64 (td, td,32 ); -tcg_gen_andi_i64 (td, td,0x3 ); -/* Jump to lab when no overflow. */ -tcg_gen_brcondi_i64 (TCG_COND_EQ , td,0x0 , lab); -tcg_gen_brcondi_i64 (TCG_COND_EQ , td,0x3 , lab); -tcg_gen_ori_i32 (cpu_sr, cpu_sr, (SR_OV |SR_CY )); -tcg_gen_andi_i32 (sr_ove, cpu_sr,SR_OVE ); -tcg_gen_brcondi_i32 (TCG_COND_NE , sr_ove,SR_OVE , lab); -gen_exception (dc,EXCP_RANGE ); -gen_set_label (lab); -tcg_gen_mov_i32 (cpu_R[rd], res);
target-openrisc/translate.c static void dec_misc(DisasContext *dc, uint32_t insn) · line 872
Quoted 10 lines
target-openrisc/translate.c +3
-6-tcg_temp_free_i64 (ta); -tcg_temp_free_i64 (td); -tcg_temp_free_i32 (res); -tcg_temp_free_i32 (sr_ove); - } - } + t0 =tcg_const_tl (I16 ); +gen_add (dc, cpu_R[rd], cpu_R[ra], t0); +tcg_temp_free (t0);break ;
Again, why remove the special case?
Quoted 5 lines
case 0x29: /* l.andi */target-openrisc/translate.c +0
-0@@ -963,13 +895,9 @@ static void dec_misc(DisasContext *dc, uint32_t insn)case 0x2c :/* l.muli */ LOG_DIS ("l.muli r%d, r%d, %d\n" , rd, ra,I16 );
target-openrisc/translate.c static void dec_misc(DisasContext *dc, uint32_t insn) · line 900
Quoted 10 lines
target-openrisc/translate.c +3
-7-if (ra !=0 &&I16 !=0 ) { -TCGv_i32 im =tcg_const_i32 (I16 ); -gen_helper_mul32 (cpu_R[rd], cpu_env, cpu_R[ra], im); -tcg_temp_free_i32 (im); - }else { -tcg_gen_movi_tl (cpu_R[rd],0x0 ); - } + t0 =tcg_const_tl (I16 ); +gen_mul (dc, cpu_R[rd], cpu_R[ra], t0); +tcg_temp_free (t0);
Again, why remove the special case?
Cheers,
Bastian
Re: [Qemu-devel] [PATCH 02/17] target-openrisc: Streamline arithmetic and OVE
Quoted 17 lines · Bastian Koppelmann
target-openrisc/exception_helper.c void HELPER(exception)(CPUOpenRISCState *env, uint32_t excp) · line 41
Quoted 12 lines · Richard Henderson
target-openrisc/exception_helper.c +12
-0+ +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_restore_state (cs,GETPC ()); +cpu_loop_exit (cs); + } +}You forgot to check the AECR register, whether the exception really occurs.
The current state of the port suggests it's written to a (pre?) 1.0 specification, prior to the AECR register being invented. Let's not try to introduce new features just yet.
Quoted 5 lines
Quoted 5 lines
target-openrisc/translate.c +5
-0+static void gen_ove_cy (DisasContext *dc,TCGv cy) +{ +gen_helper_ove (cpu_env, cy); +} +
Quoted 8 lines
target-openrisc/translate.c static void gen_jump(DisasContext *dc, uint32_t imm, uint32_t reg, uint32_t op0) · line 259
Quoted 5 lines
target-openrisc/translate.c +5
-0+static void gen_ove_ov (DisasContext *dc,TCGv ov) +{ +gen_helper_ove (cpu_env, ov); +} +Do we really need two functions here? They differ only by the name of the second argument. We should directly use
gen_helper_ove().
This is prep work for patch 7/17.
Quoted 4 lines
I do wonder, if we should use TCG globals for
sr_cyandsr_ov, as you recommended for the TriCore target. It would not change the helper in case of no ovf/carry, but simplify addc. And we would not need two deposits for every add/sub.
That's patch 7/17. ;-)
Quoted 10 lines
target-openrisc/translate.c static void dec_calc(DisasContext *dc, uint32_t insn) · line 499
Quoted 7 lines
target-openrisc/translate.c +1
-5-if (ra !=0 && rb !=0 ) { -gen_helper_mul32 (cpu_R[rd], cpu_env, cpu_R[ra], cpu_R[rb]); - }else { -tcg_gen_movi_tl (cpu_R[rd],0x0 ); - } +gen_mul (dc, cpu_R[rd], cpu_R[ra], cpu_R[rb]);What happened to this special case here? r0 should always hold zero, so we can keep this optimization here, or at least move it to
gen_mul().
R0 is not an *architectural* zero. It's a software convention. The spec is fairly clear on this point.
I agree that there ought to be some special-casing of the software convention, but that should require a TB flag to verify the convention is followed. But even then I would not bother retaining the special case here in multiply. I would only use it in the "move" and constant formation types of pseudo instructions (or, ori, etc).
r~
Bastian Koppelmann
Reviewed-byRe: [Qemu-devel] [PATCH 02/17] target-openrisc: Streamline arithmetic and OVE
Quoted 1 line · Richard Henderson
That's patch 7/17. ;-)
Woops , I just realized ;-)
Quoted 3 lines
R0 is not an *architectural* zero. It's a software convention. The spec is fairly clear on this point.
I agree that there ought to be some special-casing of the software convention, but that should require a TB flag to verify the convention is followed. But even then I would not bother retaining the special case here in multiply. I would only use it in the "move" and constant formation types of pseudo instructions (or, ori, etc).
That sounds reasonable and is clearly for another patch, so
Cheers,
Bastian
PATCH 3/17 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 | 300 ++++++++++++++------------------------------ 1 file changed, 94 insertions(+), 206 deletions(-)
target-openrisc/translate.c +94 -206
@@ -419,267 +419,155 @@ 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 ; - -default : -gen_illegal_exception (dc); -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]); -break ; - -default : -gen_illegal_exception (dc); -break ; - } -break ; - -case 0x000e : -switch (op1) { -case 0x00 :/* 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 (); -TCGv sr_f =tcg_temp_new (); -tcg_gen_andi_tl (sr_f, cpu_sr,SR_F ); -tcg_gen_mov_tl (res, cpu_R[rb]); -tcg_gen_brcondi_tl (TCG_COND_NE , sr_f,SR_F , lab); -tcg_gen_mov_tl (res, cpu_R[ra]); -gen_set_label (lab); -tcg_gen_mov_tl (cpu_R[rd], res); -tcg_temp_free (sr_f); -tcg_temp_free (res); - } -break ; - -default : -gen_illegal_exception (dc); -break ; - } -break ; - -case 0x000f : -switch (op1) { -case 0x00 :/* l.ff1 */ -LOG_DIS ("l.ff1 r%d, r%d, r%d\n" , rd, ra, rb); -gen_helper_ff1 (cpu_R[rd], cpu_R[ra]); -break ; -case 0x01 :/* l.fl1 */ -LOG_DIS ("l.fl1 r%d, r%d, r%d\n" , rd, ra, rb); -gen_helper_fl1 (cpu_R[rd], cpu_R[ra]); -break ; - -default : -gen_illegal_exception (dc); -break ; - } -break ; +return ; -case 0x0008 : -switch (op1) { -case 0x00 : +case 0x8 :switch (op2) { -case 0x00 :/* l.sll */ +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]); -break ; -case 0x01 :/* l.srl */ +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]); -break ; -case 0x02 :/* l.sra */ +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]); -break ; -case 0x03 :/* l.ror */ +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]); -break ; - -default : -gen_illegal_exception (dc); -break ; +return ; }break ; -default : -gen_illegal_exception (dc); -break ; - } -break ; - -case 0x000c : -switch (op1) { -case 0x00 : +case 0xc :switch (op2) { -case 0x00 :/* l.exths */ +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]); -break ; -case 0x01 :/* l.extbs */ +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]); -break ; -case 0x02 :/* l.exthz */ +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]); -break ; -case 0x03 :/* l.extbz */ +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]); -break ; - -default : -gen_illegal_exception (dc); -break ; +return ; }break ; -default : -gen_illegal_exception (dc); -break ; - } -break ; - -case 0x000d : -switch (op1) { -case 0x00 : +case 0xd :switch (op2) { -case 0x00 :/* l.extws */ +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]); -break ; -case 0x01 :/* l.extwz */ +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]); -break ; - -default : -gen_illegal_exception (dc); -break ; +return ; }break ; -default : -gen_illegal_exception (dc); -break ; +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 (); +TCGv sr_f =tcg_temp_new (); +tcg_gen_andi_tl (sr_f, cpu_sr,SR_F ); +tcg_gen_mov_tl (res, cpu_R[rb]); +tcg_gen_brcondi_tl (TCG_COND_NE , sr_f,SR_F , lab); +tcg_gen_mov_tl (res, cpu_R[ra]); +gen_set_label (lab); +tcg_gen_mov_tl (cpu_R[rd], res); +tcg_temp_free (sr_f); +tcg_temp_free (res); + } +return ; + +case 0xf :/* l.ff1 */ +LOG_DIS ("l.ff1 r%d, r%d, r%d\n" , rd, ra, rb); +gen_helper_ff1 (cpu_R[rd], cpu_R[ra]); +return ; }break ; -default : -gen_illegal_exception (dc); +case 1 : +switch (op0) { +case 0xf :/* l.fl1 */ +LOG_DIS ("l.fl1 r%d, r%d, r%d\n" , rd, ra, rb); +gen_helper_fl1 (cpu_R[rd], cpu_R[ra]); +return ; + } +break ; + +case 2 : +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 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 ; + +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 ; + +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 ; } +gen_illegal_exception (dc); }static void dec_misc (DisasContext *dc,uint32_t insn)
Signature · 1 line
2.4.3
Re: [Qemu-devel] [PATCH 03/17] target-openrisc: Invert the decoding in dec_calc
Quoted 13 lines · Richard Henderson
Decoding the opcodes in the right order reduces by 100+ lines. Also, it happens to put the opcodes in the same order as Chapter 17.
Signed-off-by Richard Henderson <[email protected]>--- target-openrisc/translate.c | 300 ++++++++++++++------------------------------ 1 file changed, 94 insertions(+), 206 deletions(-)target-openrisc/translate.c +0
-0
target-openrisc/translate.c static void dec_calc(DisasContext *dc, uint32_t insn) · line 422
Quoted 4 lines
target-openrisc/translate.c +0
-1@@ -419,267 +419,155 @@ static void dec_calc(DisasContext *dc, uint32_t insn) rb =extract32 (insn,11 ,5 ); rd =extract32 (insn,21 ,5 ); -switch (op0) {
I think it's worth while to group all instructions with op0 = 0 into a separate decoding function.
target-openrisc/translate.c static void dec_calc(DisasContext *dc, uint32_t insn) · line 480
Quoted 10 lines
target-openrisc/translate.c +2
-5- -case 0x000c : -switch (op1) { -case 0x00 : +case 0xc :switch (op2) { -case 0x00 :/* l.exths */ +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]);
Nitpick: l.exths comes before l.add in chapter 17 of my manual [1]
However those are mostly minor issues, so
Cheers,
Bastian
[1] https://github.com/openrisc/doc/blob/master/openrisc-arch-1.1-rev0.pdf?raw=true
PATCH 4/17 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/sys_helper.c | 5 +- target-openrisc/translate.c | 96 +++++++++++++++----------------------- 6 files changed, 56 insertions(+), 68 deletions(-)
target-openrisc/cpu.h +13 -2
@@ -288,7 +288,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 */ +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 */
@@ -300,7 +301,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 */ CPU_COMMON
@@ -411,6 +411,17 @@ static inline int cpu_mmu_index(CPUOpenRISCState *env)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#include "exec/exec-all.h"
target-openrisc/gdbstub.c +2 -2
@@ -37,7 +37,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 ;
@@ -72,7 +72,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
@@ -45,7 +45,7 @@ void openrisc_cpu_do_interrupt(CPUState *cs)we need flush TLB when we enter&exit EXCP. */ tlb_flush (cs,1 ); - 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
@@ -31,7 +31,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);#ifndef CONFIG_USER_ONLY if (cpu->env.sr &SR_DME ) {
target-openrisc/sys_helper.c +2 -3
@@ -47,8 +47,7 @@ void HELPER(mtspr)(CPUOpenRISCState *env, (rb & (SR_IME | SR_DME | SR_SM))) {tlb_flush (cs,1 ); } - 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;
@@ -198,7 +197,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 +37 -59
304 lines not on this page · raw message
Signature · 1 line
2.4.3
Re: [Qemu-devel] [PATCH 04/17] target-openrisc: Keep SR_F in a separate variable
Quoted 17 lines · Richard Henderson
This avoids having to keep merging and extracting the flag from SR.
Signed-off-by Richard Henderson <[email protected]>--- target-openrisc/cpu.h | 15 +++++- target-openrisc/gdbstub.c | 4 +- target-openrisc/interrupt.c | 2 +- target-openrisc/interrupt_helper.c | 2 +- target-openrisc/sys_helper.c | 5 +- target-openrisc/translate.c | 96 +++++++++++++++----------------------- 6 files changed, 56 insertions(+), 68 deletions(-)target-openrisc/cpu.h +0
-0
target-openrisc/cpu.h typedef struct CPUOpenRISCState { · line 291
Quoted 5 lines
target-openrisc/cpu.h +1
-1@@ -288,7 +288,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 */
A comment that states the expected value of sr_f would be nice.
Other then that,
PATCH 5/17 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
@@ -208,12 +208,16 @@ static void gen_jump(DisasContext *dc, uint32_t imm, 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_i32 (op0 ==0x03 ?TCG_COND_EQ :TCG_COND_NE , - cpu_sr_f,SR_F , 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 */
@@ -496,14 +500,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_NE , cpu_sr_f,SR_F , 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.4.3
Re: [Qemu-devel] [PATCH 05/17] target-openrisc: Use movcond where appropriate
Quoted 5 lines · Richard Henderson
Signed-off-by Richard Henderson <[email protected]>--- target-openrisc/translate.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
Cheers,
Bastian
PATCH 6/17 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
@@ -399,8 +399,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)
target-openrisc/exception_helper.c +1 -1
@@ -30,7 +30,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
@@ -129,8 +129,8 @@ static inline int sign_extend(unsigned int val, int width)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; } }
@@ -239,20 +239,26 @@ static void gen_jump(DisasContext *dc, uint32_t imm, 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)
@@ -1437,7 +1443,7 @@ static inline void gen_intermediate_code_internal(OpenRISCCPU *cpu, dc->flags = cpu->env.cpucfgr; dc->mem_idx =cpu_mmu_index (&cpu->env); 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;if (qemu_loglevel_mask (CPU_LOG_TB_IN_ASM )) {qemu_log ("-----------------------------------------\n" );
Signature · 1 line
2.4.3
Re: [Qemu-devel] [PATCH 06/17] target-openrisc: Put SR[OVE] in TB flags
target-openrisc/translate.c static inline int sign_extend(unsigned int val, int width) · line 136
Quoted 9 lines · Richard Henderson
{ /* Sync the tb dependent flag between translate and runtime. */target-openrisc/translate.c +2
-2-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; } }
Why do we only need to sync D_FLAG? Will there only be D_FLAG, which needs to be synced?
Cheers,
Bastian
Re: [Qemu-devel] [PATCH 06/17] target-openrisc: Put SR[OVE] in TB flags
Quoted 12 lines · Bastian Koppelmann
target-openrisc/translate.c static inline int sign_extend(unsigned int val, int width) · line 136
Quoted 9 lines · Richard Henderson
{ /* Sync the tb dependent flag between translate and runtime. */target-openrisc/translate.c +2
-2-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; } }
Quoted 2 lines
Why do we only need to sync
D_FLAG? Will there only beD_FLAG, which needs to be synced?
It's a somewhat silly way to mark the delayed branch status. I don't recall if I eventually got around to fixing this or not.
r~
PATCH 7/17 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 | 33 ++++++++--- target-openrisc/helper.h | 5 +- target-openrisc/int_helper.c | 36 ----------- target-openrisc/translate.c | 118 ++++++++++++------------------------- 5 files changed, 78 insertions(+), 127 deletions(-)
target-openrisc/cpu.h +10 -3
@@ -289,7 +289,9 @@ typedef struct CPUOpenRISCState {target_ulong eear;/* Exception EA register */ target_ulong sr_f;/* the SR_F bit */ -uint32_t sr;/* Supervisor register, without SR_F */ +target_ulong sr_cy;/* the SR_CY bit */ +target_ulong sr_ov;/* the SR_OV bit (in the high 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 */
@@ -413,13 +415,18 @@ static inline int cpu_mmu_index(CPUOpenRISCState *env)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 + + ((target_long )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 +26 -7
@@ -28,14 +28,33 @@ void HELPER(exception)(CPUOpenRISCState *env, uint32_t excp)raise_exception (cpu, excp); } -void HELPER (ove )(CPUOpenRISCState *env,target_ulong test) +static void 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_restore_state (cs, pc); +cpu_loop_exit (cs); +} + +void HELPER (ove_cy )(CPUOpenRISCState *env) +{ +if (env->sr_cy) { +do_range (env,GETPC ()); + } +} + +void HELPER (ove_ov )(CPUOpenRISCState *env) +{ +if ((target_long )env->sr_ov <0 ) { +do_range (env,GETPC ()); + } +} - cs->exception_index =EXCP_RANGE ; -cpu_restore_state (cs,GETPC ()); -cpu_loop_exit (cs); +void HELPER (ove_cyov )(CPUOpenRISCState *env) +{ +if (env->sr_cy || (target_long )env->sr_ov <0 ) { +do_range (env,GETPC ()); } }
target-openrisc/helper.h +3 -2
@@ -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)
@@ -57,7 +59,6 @@ FOP_CMP(ge)/* int */ DEF_HELPER_FLAGS_1(ff1, 0, tl, tl)DEF_HELPER_FLAGS_1 (fl1,0 , tl, tl) -DEF_HELPER_FLAGS_3 (mul32,0 , i32, env, i32, i32) /* interrupt */DEF_HELPER_FLAGS_1 (rfe,0 , void, env)
target-openrisc/int_helper.c +0 -36
@@ -41,39 +41,3 @@ target_ulong HELPER(fl1)(target_ulong x)return 32 -clz32 (x);/*#endif*/ } - -uint32_t HELPER (mul32 )(CPUOpenRISCState *env, -uint32_t ra,uint32_t rb) -{ -uint64_t result; -uint32_t high, cy; - -OpenRISCCPU *cpu =openrisc_env_get_cpu (env); - - result = (uint64_t )ra * rb; -/* regisiers in or32 is 32bit, so 32 is NOT a magic number. -or64 is not handled in this function, and not implement yet, -TARGET_LONG_BITS for or64 is 64, it will break this function, -so, we didn't use TARGET_LONG_BITS here. */ - high = result >>32 ; - cy = result >> (32 -1 ); - -if ((cy &0x1 ) ==0x0 ) { -if (high ==0x0 ) { -return result; - } - } - -if ((cy &0x1 ) ==0x1 ) { -if (high ==0xffffffff ) { -return result; - } - } - - cpu->env.sr |= (SR_OV |SR_CY ); -if (cpu->env.sr &SR_OVE ) { -raise_exception (cpu,EXCP_RANGE ); - } - -return result; -}
target-openrisc/translate.c +39 -79
221 lines not on this page · raw message
Signature · 1 line
2.4.3
Re: [Qemu-devel] [PATCH 07/17] target-openrisc: Keep SR_CY and SR_OV in a separate variables
Quoted 26 lines · Richard Henderson
target-openrisc/int_helper.c +0
-26- -uint32_t HELPER (mul32 )(CPUOpenRISCState *env, -uint32_t ra,uint32_t rb) -{ -uint64_t result; -uint32_t high, cy; - -OpenRISCCPU *cpu =openrisc_env_get_cpu (env); - - result = (uint64_t )ra * rb; -/* regisiers in or32 is 32bit, so 32 is NOT a magic number. -or64 is not handled in this function, and not implement yet, -TARGET_LONG_BITS for or64 is 64, it will break this function, -so, we didn't use TARGET_LONG_BITS here. */ - high = result >>32 ; - cy = result >> (32 -1 ); - -if ((cy &0x1 ) ==0x0 ) { -if (high ==0x0 ) { -return result; - } - } - -if ((cy &0x1 ) ==0x1 ) { -if (high ==0xffffffff ) { -return result;
target-openrisc/int_helper.c target_ulong HELPER(fl1)(target_ulong x) · line 79
Quoted 10 lines
target-openrisc/int_helper.c +0
-10- } - } - - cpu->env.sr |= (SR_OV |SR_CY ); -if (cpu->env.sr &SR_OVE ) { -raise_exception (cpu,EXCP_RANGE ); - } - -return result; -}
This ought to be part of patch 02, where you removed the last use of helper_mul32.
Other than that,
Cheers,
Bastian
PATCH 8/17 target-openrisc: Set flags on helpers
In reply to Richard Henderson--- target-openrisc/helper.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
target-openrisc/helper.h +14 -14
@@ -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)
@@ -57,12 +57,12 @@ FOP_CMP(ge)#undef FOP_CMP/* int */ -DEF_HELPER_FLAGS_1(ff1, 0, tl, tl) -DEF_HELPER_FLAGS_1 (fl1,0 , tl, tl) +DEF_HELPER_FLAGS_1(ff1, TCG_CALL_NO_RWG_SE, tl, tl) +DEF_HELPER_FLAGS_1 (fl1,TCG_CALL_NO_RWG_SE , tl, tl) /* interrupt */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.4.3
Re: [Qemu-devel] [PATCH 08/17] target-openrisc: Set flags on helpers
Quoted 6 lines · Richard Henderson
Signed-off-by Richard Henderson <[email protected]>--- target-openrisc/helper.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
PATCH 9/17 target-openrisc: Implement ff1 and fl1 for 64-bit
In reply to Richard HendersonTrue, this is unused so far, but commented out is worse than actually implemented properly.
--- target-openrisc/int_helper.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)
target-openrisc/int_helper.c +12 -11
@@ -25,19 +25,20 @@target_ulong HELPER (ff1 )(target_ulong x) { -/*#ifdef TARGET_OPENRISC64 -return x ? ctz64(x) + 1 : 0; -#else*/ -return x ?ctz32 (x) +1 :0 ; -/*#endif*/ +if (x ==0 ) { +return 0 ; + }else if (TARGET_LONG_BITS ==64 ) { +return ctz64 (x) +1 ; + }else { +return ctz32 (x) +1 ; + } }target_ulong HELPER (fl1 )(target_ulong x) { -/* not used yet, open it when we need or64. */ -/*#ifdef TARGET_OPENRISC64 -return 64 - clz64(x); -#else*/ -return 32 -clz32 (x); -/*#endif*/ +if (TARGET_LONG_BITS ==64 ) { +return 64 -clz64 (x); + }else { +return 32 -clz32 (x); + } }
Signature · 1 line
2.4.3
Re: [Qemu-devel] [PATCH 09/17] target-openrisc: Implement ff1 and fl1 for 64-bit
Quoted 8 lines · Richard Henderson
True, this is unused so far, but commented out is worse than actually implemented properly.
Signed-off-by Richard Henderson <[email protected]>--- target-openrisc/int_helper.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)
PATCH 10/17 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/sys_helper.c | 13 +++++ target-openrisc/translate.c | 120 +++++++++++++++++++++++-------------------- 3 files changed, 78 insertions(+), 58 deletions(-)
target-openrisc/cpu.h +1 -2
@@ -279,8 +279,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/sys_helper.c +13 -0
@@ -118,6 +118,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 ;
@@ -243,6 +249,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 +64 -56
161 lines not on this page · raw message
Signature · 1 line
2.4.3
Re: [Qemu-devel] [PATCH 10/17] target-openrisc: Represent MACHI:MACLO as a single unit
Quoted 10 lines · Richard Henderson
Significantly simplifies the implementation of the use of MAC.
Signed-off-by Richard Henderson <[email protected]>--- target-openrisc/cpu.h | 3 +- target-openrisc/sys_helper.c | 13 +++++ target-openrisc/translate.c | 120 +++++++++++++++++++++++-------------------- 3 files changed, 78 insertions(+), 58 deletions(-)
Cheers,
Bastian
PATCH 11/17 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 | 200 +++++++++++++++++--------------------------- 1 file changed, 75 insertions(+), 125 deletions(-)
target-openrisc/translate.c +75 -125
@@ -112,23 +112,6 @@ void openrisc_translate_init(void) } } -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. */
@@ -152,29 +135,23 @@ static void gen_illegal_exception(DisasContext *dc) dc->is_jmp =DISAS_UPDATE ; } -/* not used yet, open it when we need or64. */ -/*#ifdef TARGET_OPENRISC64 -static void check_ob64s(DisasContext *dc) -{ -if (!(dc->flags & CPUCFGR_OB64S)) { -gen_illegal_exception(dc); -} -} +#define check_ob64s (dc) \ + do { \ + gen_illegal_exception(dc); \ + return; \ + } while (0) -static void check_of64s(DisasContext *dc) -{ -if (!(dc->flags & CPUCFGR_OF64S)) { -gen_illegal_exception(dc); -} -} +#define check_of64s (dc) \ + do { \ + gen_illegal_exception(dc); \ + return; \ + } while (0) -static void check_ov64s(DisasContext *dc) -{ -if (!(dc->flags & CPUCFGR_OV64S)) { -gen_illegal_exception(dc); -} -} -#endif*/ +#define check_ov64s (dc) \ + do { \ + gen_illegal_exception(dc); \ + return; \ + } while (0)static void gen_goto_tb (DisasContext *dc,int n,target_ulong dest) {
@@ -194,11 +171,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 */
@@ -573,7 +548,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 K16 ,K5_11 ; +int32_t I16 ,I5_11 ,N26 ;TCGMemOp mop;TCGv t0;
@@ -584,11 +560,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 */
@@ -634,12 +610,10 @@ 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,I16 ); - { -TCGv imm =tcg_const_tl (sign_extend (I16 ,16 )); -gen_mac (dc, cpu_R[ra], imm); -tcg_temp_free (imm); - } +LOG_DIS ("l.maci r%d, %d\n" , ra,I16 ); + t0 =tcg_const_tl (I16 ); +gen_mac (dc, cpu_R[ra], t0); +tcg_temp_free (t0);break ;case 0x09 :/* l.rfe */
@@ -690,52 +664,40 @@ static void dec_misc(DisasContext *dc, uint32_t insn)LOG_DIS ("l.cust8\n" );break ; -/* not used yet, open it when we need or64. */ -/*#ifdef TARGET_OPENRISC64 -case 0x20: l.ld +case 0x20 :/* l.ld */ LOG_DIS ("l.ld r%d, r%d, %d\n" , rd, ra,I16 );check_ob64s (dc); mop =MO_TEQ ; goto do_load; -#endif*/ -case 0x21 :/* l.lwz */ LOG_DIS ("l.lwz r%d, r%d, %d\n" , rd, ra,I16 ); mop =MO_TEUL ; goto do_load; -case 0x22 :/* l.lws */ LOG_DIS ("l.lws r%d, r%d, %d\n" , rd, ra,I16 ); mop =MO_TESL ; goto do_load; -case 0x23 :/* l.lbz */ LOG_DIS ("l.lbz r%d, r%d, %d\n" , rd, ra,I16 ); mop =MO_UB ; goto do_load; -case 0x24 :/* l.lbs */ LOG_DIS ("l.lbs r%d, r%d, %d\n" , rd, ra,I16 ); mop =MO_SB ; goto do_load; -case 0x25 :/* l.lhz */ LOG_DIS ("l.lhz r%d, r%d, %d\n" , rd, ra,I16 ); mop =MO_TEUW ; goto do_load; -case 0x26 :/* l.lhs */ LOG_DIS ("l.lhs r%d, r%d, %d\n" , rd, ra,I16 ); mop =MO_TESW ; goto do_load; - do_load: - { -TCGv t0 =tcg_temp_new (); -tcg_gen_addi_tl (t0, cpu_R[ra],sign_extend (I16 ,16 )); -tcg_gen_qemu_ld_tl (cpu_R[rd], t0, dc->mem_idx, mop); -tcg_temp_free (t0); - } + t0 =tcg_temp_new (); +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);break ;case 0x27 :/* l.addi */
@@ -753,18 +715,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 */
@@ -775,70 +737,57 @@ 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 ; +return ;#else -TCGv_i32 ti =tcg_const_i32 (I16 ); -if (dc->mem_idx ==MMU_USER_IDX ) { -gen_illegal_exception (dc); -return ; - } -gen_helper_mfspr (cpu_R[rd], cpu_env, cpu_R[rd], cpu_R[ra], ti); -tcg_temp_free_i32 (ti); -#endif +if (dc->mem_idx ==MMU_USER_IDX ) { +gen_illegal_exception (dc); +return ; } + t0 =tcg_const_i32 (K16 ); +gen_helper_mfspr (cpu_R[rd], cpu_env, cpu_R[rd], cpu_R[ra], t0); +tcg_temp_free (t0); +#endif 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 ; +return ;#else -TCGv_i32 im =tcg_const_i32 (tmp); -if (dc->mem_idx ==MMU_USER_IDX ) { -gen_illegal_exception (dc); -return ; - } -gen_helper_mtspr (cpu_env, cpu_R[ra], cpu_R[rb], im); -tcg_temp_free_i32 (im); -#endif +if (dc->mem_idx ==MMU_USER_IDX ) { +gen_illegal_exception (dc); +return ; } + t0 =tcg_const_tl (K5_11 ); +gen_helper_mtspr (cpu_env, cpu_R[ra], cpu_R[rb], t0); +tcg_temp_free (t0); +#endif 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); +case 0x34 :/* l.sd */ +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_qemu_st_tl (cpu_R[rb], t0, dc->mem_idx, mop); -tcg_temp_free (t0); - } + t0 =tcg_temp_new (); +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);break ;default :
@@ -875,30 +824,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 :
@@ -1007,13 +958,12 @@ 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 ra; +int32_t I16 ; op0 =extract32 (insn,21 ,5 ); ra =extract32 (insn,16 ,5 ); -I16 =extract32 (insn,0 ,16 ); - -I16 =sign_extend (I16 ,16 ); +I16 =sextract32 (insn,0 ,16 );switch (op0) {case 0x0 :/* l.sfeqi */
Signature · 1 line
2.4.3
Re: [Qemu-devel] [PATCH 11/17] target-openrisc: Rationalize immediate extraction
Quoted 8 lines · Richard Henderson
The architecture manual is consistent in using "I" for signed fields and "K" for unsigned fields. Mirror that.
Signed-off-by Richard Henderson <[email protected]>--- target-openrisc/translate.c | 200 +++++++++++++++++--------------------------- 1 file changed, 75 insertions(+), 125 deletions(-)
PATCH 12/17 target-openrisc: Enable m[tf]spr from user mode
In reply to Richard HendersonThe architecture manual doesn't say these opcodes are user only. Leaving them disabled excludes user mode from accessing interesting SPRs like MACLO/MACHI.
--- target-openrisc/helper.h | 4 +-- target-openrisc/sys_helper.c | 77 +++++++++++++++++--------------------------- target-openrisc/translate.c | 32 +++++++----------- 3 files changed, 43 insertions(+), 70 deletions(-)
target-openrisc/helper.h +2 -2
@@ -64,5 +64,5 @@ DEF_HELPER_FLAGS_1(fl1, TCG_CALL_NO_RWG_SE, tl, tl)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,TCG_CALL_NO_WG , tl, env, tl, tl, tl) +DEF_HELPER_FLAGS_3(mtspr, 0, void, env, i32, tl) +DEF_HELPER_FLAGS_2 (mfspr,TCG_CALL_NO_WG , tl, env, i32)
target-openrisc/sys_helper.c +29 -48
156 lines not on this page · raw message
target-openrisc/translate.c +12 -20
@@ -738,32 +738,24 @@ static void dec_misc(DisasContext *dc, uint32_t insn)case 0x2d :/* l.mfspr */ LOG_DIS ("l.mfspr r%d, r%d, %d\n" , rd, ra,K16 ); -#if defined(CONFIG_USER_ONLY ) -return ; -#else -if (dc->mem_idx ==MMU_USER_IDX ) { -gen_illegal_exception (dc); -return ; + { +TCGv_i32 tmp =tcg_temp_new_i32 (); +tcg_gen_trunc_tl_i32 (tmp, cpu_R[ra]); +tcg_gen_ori_i32 (tmp, tmp,K16 ); +gen_helper_mfspr (cpu_R[rd], cpu_env, tmp); +tcg_temp_free_i32 (tmp); } - t0 =tcg_const_i32 (K16 ); -gen_helper_mfspr (cpu_R[rd], cpu_env, cpu_R[rd], cpu_R[ra], t0); -tcg_temp_free (t0); -#endif break ;case 0x30 :/* l.mtspr */ LOG_DIS ("l.mtspr r%d, r%d, %d\n" , ra, rb,K5_11 ); -#if defined(CONFIG_USER_ONLY ) -return ; -#else -if (dc->mem_idx ==MMU_USER_IDX ) { -gen_illegal_exception (dc); -return ; + { +TCGv_i32 tmp =tcg_temp_new_i32 (); +tcg_gen_trunc_tl_i32 (tmp, cpu_R[ra]); +tcg_gen_ori_i32 (tmp, tmp,K5_11 ); +gen_helper_mtspr (cpu_env, tmp, cpu_R[rb]); +tcg_temp_free_i32 (tmp); } - t0 =tcg_const_tl (K5_11 ); -gen_helper_mtspr (cpu_env, cpu_R[ra], cpu_R[rb], t0); -tcg_temp_free (t0); -#endif break ;case 0x34 :/* l.sd */
Signature · 1 line
2.4.3
Re: [Qemu-devel] [PATCH 12/17] target-openrisc: Enable m[tf]spr from user mode
Quoted 5 lines · Richard Henderson
target-openrisc/translate.c +2
-3-if (dc->mem_idx ==MMU_USER_IDX ) { -gen_illegal_exception (dc); -return ; + { +TCGv_i32 tmp =tcg_temp_new_i32 ();
target-openrisc/translate.c static void dec_misc(DisasContext *dc, uint32_t insn) · line 748
Quoted 10 lines
target-openrisc/translate.c +4
-4+tcg_gen_trunc_tl_i32 (tmp, cpu_R[ra]); +tcg_gen_ori_i32 (tmp, tmp,K16 ); +gen_helper_mfspr (cpu_R[rd], cpu_env, tmp); +tcg_temp_free_i32 (tmp); } - t0 =tcg_const_i32 (K16 ); -gen_helper_mfspr (cpu_R[rd], cpu_env, cpu_R[rd], cpu_R[ra], t0); -tcg_temp_free (t0); -#endif break ;
IIRC a lot of the registers are supervisor only, e.g. VR, NPC or SR and the manual is fairly clear about that. User mode cpu ought not to read these registers unconditionally.
Quoted 11 lines
case 0x30: /* l.mtspr */ LOG_DIS("l.mtspr r%d, r%d, %d\n", ra, rb, K5_11);target-openrisc/translate.c +2
-6-#if defined(CONFIG_USER_ONLY ) -return ; -#else -if (dc->mem_idx ==MMU_USER_IDX ) { -gen_illegal_exception (dc); -return ; + { +TCGv_i32 tmp =tcg_temp_new_i32 ();
target-openrisc/translate.c static void dec_misc(DisasContext *dc, uint32_t insn) · line 759
Quoted 10 lines
target-openrisc/translate.c +4
-4+tcg_gen_trunc_tl_i32 (tmp, cpu_R[ra]); +tcg_gen_ori_i32 (tmp, tmp,K5_11 ); +gen_helper_mtspr (cpu_env, tmp, cpu_R[rb]); +tcg_temp_free_i32 (tmp); } - t0 =tcg_const_tl (K5_11 ); -gen_helper_mtspr (cpu_env, cpu_R[ra], cpu_R[rb], t0); -tcg_temp_free (t0); -#endif break ;
Same as above, unconditional write.
Cheers,
Bastian
Re: [Qemu-devel] [PATCH 12/17] target-openrisc: Enable m[tf]spr from user mode
Quoted 3 lines · Bastian Koppelmann
IIRC a lot of the registers are supervisor only, e.g. VR, NPC or SR and the manual is fairly clear about that. User mode cpu ought not to read these registers unconditionally.
When I last discussed this on the openrisc list, back in March, there was no real specification for user mode, and what bits are or should be accessible.
Looking at
http://opencores.org/or1k/Architecture_Specification
today, that still seems to be the case.
In the meantime, dropping the privilege check makes linux-user GCC tests work better.
r~
Re: [Qemu-devel] [PATCH 12/17] target-openrisc: Enable m[tf]spr from user mode
Quoted 4 lines · Richard Henderson
Quoted 3 lines · Bastian Koppelmann
IIRC a lot of the registers are supervisor only, e.g. VR, NPC or SR and the manual is fairly clear about that. User mode cpu ought not to read these registers unconditionally.
Quoted 8 lines
When I last discussed this on the openrisc list, back in March, there was no real specification for user mode, and what bits are or should be accessible.
Looking at
http://opencores.org/or1k/Architecture_Specification
today, that still seems to be the case.In the meantime, dropping the privilege check makes linux-user GCC tests work better.
Looking at the article, user mode seems to be optional, so I'm not against it, but it does look weird. How does ork1sim do it?
Cheers,
Bastian
Re: [Qemu-devel] [PATCH 12/17] target-openrisc: Enable m[tf]spr from user mode
Quoted 2 lines · Bastian Koppelmann
Looking at the article, user mode seems to be optional, so I'm not against it, but it does look weird. How does ork1sim do it?
It's haphazard. There are checks for supervisor in the l_mtspr and l_mfspr insns, but not other uses of the sprs, such as l_rfe.
In the meantime, testing of the multiply-accumulate instructions is hindered by the fact that linux-user can't read the MACHI and MACLO special registers.
r~
Re: [Qemu-devel] [PATCH 12/17] target-openrisc: Enable m[tf]spr from user mode
Quoted 5 lines · Richard Henderson
Quoted 2 lines · Bastian Koppelmann
Looking at the article, user mode seems to be optional, so I'm not against it, but it does look weird. How does ork1sim do it?
It's haphazard. There are checks for supervisor in the
l_mtsprandl_mfsprinsns, but not other uses of the sprs, such asl_rfe.
How about we make the optional user mode a feature bit? This way we are closer to ork1sim, but don't have the problem that testing is hindered.
Cheers,
Bastian
PATCH 13/17 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
@@ -1032,52 +1032,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.4.3
Re: [Qemu-devel] [PATCH 13/17] target-openrisc: Enable trap, csync, msync, psync for user mode
Quoted 7 lines · Richard Henderson
Not documented as disabled for user mode.
Signed-off-by Richard Henderson <[email protected]>--- target-openrisc/translate.c | 32 -------------------------------- 1 file changed, 32 deletions(-)
Cheers,
Bastian
PATCH 14/17 target-openrisc: Implement muld, muldu, macu, msbu
In reply to Richard Henderson--- target-openrisc/translate.c | 106 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+)
target-openrisc/translate.c +106 -0
@@ -336,6 +336,54 @@ 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); + }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); + }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 ();
@@ -362,6 +410,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 ();
@@ -388,6 +455,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 dec_calc (DisasContext *dc,uint32_t insn) {uint32_t op0, op1, op2;
@@ -523,6 +609,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]);
@@ -537,6 +628,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 ; }
@@ -807,6 +903,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.4.3
Re: [Qemu-devel] [PATCH 14/17] target-openrisc: Implement muld, muldu, macu, msbu
Quoted 5 lines · Richard Henderson
Signed-off-by Richard Henderson <[email protected]>--- target-openrisc/translate.c | 106 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+)
Cheers,
Bastian
PATCH 15/17 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
@@ -281,9 +281,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
@@ -59,7 +59,6 @@ static TCGv cpu_sr_cy; /* carry (unsigned overflow) */static TCGv cpu_sr_ov;/* signed overflow */ 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"
@@ -99,12 +98,6 @@ void openrisc_translate_init(void) cpu_mac =tcg_global_mem_new_i64 (TCG_AREG0 , offsetof(CPUOpenRISCState , mac),"mac" ); - fpmaddhi =tcg_global_mem_new (TCG_AREG0 , - offsetof(CPUOpenRISCState , fpmaddhi), -"fpmaddhi" ); - fpmaddlo =tcg_global_mem_new (TCG_AREG0 , - offsetof(CPUOpenRISCState , fpmaddlo), -"fpmaddlo" );for (i =0 ; i <32 ; i++) { cpu_R[i] =tcg_global_mem_new (TCG_AREG0 , offsetof(CPUOpenRISCState, gpr[i]),
@@ -1213,7 +1206,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 */
@@ -1298,7 +1292,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.4.3
Re: [Qemu-devel] [PATCH 15/17] target-openrisc: Fix madd
Quoted 5 lines · Richard Henderson
Note 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.
Quoted 9 lines
Signed-off-by Richard Henderson <[email protected]>--- 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(-)
Cheers,
Bastian
PATCH 16/17 target-openrisc: Write back result before FPE exception
In reply to Richard HendersonThe architecture manual is unclear about this, but the or1ksim does writeback before the exception. This requires splitting the helpers in half, with the exception raised by the second.
--- target-openrisc/fpu_helper.c | 252 +++++++++---------------------------------- target-openrisc/helper.h | 25 +++-- target-openrisc/translate.c | 118 +++++++++++--------- 3 files changed, 129 insertions(+), 266 deletions(-)
target-openrisc/fpu_helper.c +49 -203
@@ -22,121 +22,70 @@#include "exec/helper-proto.h" #include "exception.h" -static inline uint32_t ieee_ex_to_openrisc (OpenRISCCPU *cpu,int fexcp) +static int ieee_ex_to_openrisc (int fexcp) {int ret =0 ; -if (fexcp) { -if (fexcp & float_flag_invalid) { - cpu->env.fpcsr |=FPCSR_IVF ; - ret =1 ; - } -if (fexcp & float_flag_overflow) { - cpu->env.fpcsr |=FPCSR_OVF ; - ret =1 ; - } -if (fexcp & float_flag_underflow) { - cpu->env.fpcsr |=FPCSR_UNF ; - ret =1 ; - } -if (fexcp & float_flag_divbyzero) { - cpu->env.fpcsr |=FPCSR_DZF ; - ret =1 ; - } -if (fexcp & float_flag_inexact) { - cpu->env.fpcsr |=FPCSR_IXF ; - ret =1 ; - } +if (fexcp & float_flag_invalid) { + ret |=FPCSR_IVF ; + } +if (fexcp & float_flag_overflow) { + ret |=FPCSR_OVF ; + } +if (fexcp & float_flag_underflow) { + ret |=FPCSR_UNF ; + } +if (fexcp & float_flag_divbyzero) { + ret |=FPCSR_DZF ; + } +if (fexcp & float_flag_inexact) { + ret |=FPCSR_IXF ; } -return ret; } -static inline void update_fpcsr (OpenRISCCPU *cpu) +void HELPER (update_fpcsr )(CPUOpenRISCState *env) { -int tmp =ieee_ex_to_openrisc (cpu, -get_float_exception_flags (&cpu->env.fp_status)); - -SET_FP_CAUSE (cpu->env.fpcsr, tmp); -if ((GET_FP_ENABLE (cpu->env.fpcsr) & tmp) && - (cpu->env.fpcsr &FPCSR_FPEE )) { -helper_exception (&cpu->env,EXCP_FPE ); - }else { -UPDATE_FP_FLAGS (cpu->env.fpcsr, tmp); +int tmp =get_float_exception_flags (&env->fp_status); + +if (tmp) { +set_float_exception_flags (0 , &env->fp_status); + tmp =ieee_ex_to_openrisc (tmp); +if (tmp) { + env->fpcsr |= tmp; +if (env->fpcsr &FPCSR_FPEE ) { +helper_exception (env,EXCP_FPE ); + } + } } }uint64_t HELPER (itofd )(CPUOpenRISCState *env,uint64_t val) { -uint64_t itofd; -OpenRISCCPU *cpu =openrisc_env_get_cpu (env); - -set_float_exception_flags (0 , &cpu->env.fp_status); - itofd =int32_to_float64 (val, &cpu->env.fp_status); -update_fpcsr (cpu); - -return itofd; +return int32_to_float64 (val, &env->fp_status); }uint32_t HELPER (itofs )(CPUOpenRISCState *env,uint32_t val) { -uint32_t itofs; -OpenRISCCPU *cpu =openrisc_env_get_cpu (env); - -set_float_exception_flags (0 , &cpu->env.fp_status); - itofs =int32_to_float32 (val, &cpu->env.fp_status); -update_fpcsr (cpu); - -return itofs; +return int32_to_float32 (val, &env->fp_status); }uint64_t HELPER (ftoid )(CPUOpenRISCState *env,uint64_t val) { -uint64_t ftoid; -OpenRISCCPU *cpu =openrisc_env_get_cpu (env); - -set_float_exception_flags (0 , &cpu->env.fp_status); - ftoid =float32_to_int64 (val, &cpu->env.fp_status); -update_fpcsr (cpu); - -return ftoid; +return float32_to_int64 (val, &env->fp_status); }uint32_t HELPER (ftois )(CPUOpenRISCState *env,uint32_t val) { -uint32_t ftois; -OpenRISCCPU *cpu =openrisc_env_get_cpu (env); - -set_float_exception_flags (0 , &cpu->env.fp_status); - ftois =float32_to_int32 (val, &cpu->env.fp_status); -update_fpcsr (cpu); - -return ftois; +return float32_to_int32 (val, &env->fp_status); } -#define FLOAT_OP (name, p) void helper_float_##_##p(void) -#define FLOAT_CALC (name) \ uint64_t helper_float_ ## name ## _d(CPUOpenRISCState *env, \ uint64_t fdt0, uint64_t fdt1) \ -{ \ - uint64_t result; \ - OpenRISCCPU *cpu = openrisc_env_get_cpu(env); \ - set_float_exception_flags(0, &cpu->env.fp_status); \ - result = float64_ ## name(fdt0, fdt1, &cpu->env.fp_status); \ - update_fpcsr(cpu); \ - return result; \ -} \ - \ +{ return float64_ ## name(fdt0, fdt1, &env->fp_status); } \ uint32_t helper_float_ ## name ## _s(CPUOpenRISCState *env, \ uint32_t fdt0, uint32_t fdt1) \ -{ \ - uint32_t result; \ - OpenRISCCPU *cpu = openrisc_env_get_cpu(env); \ - set_float_exception_flags(0, &cpu->env.fp_status); \ - result = float32_ ## name(fdt0, fdt1, &cpu->env.fp_status); \ - update_fpcsr(cpu); \ - return result; \ -} \ +{ return float32_ ## name(fdt0, fdt1, &env->fp_status); }FLOAT_CALC (add)FLOAT_CALC (sub)
@@ -149,132 +98,29 @@ FLOAT_CALC(rem)uint64_t helper_float_madd_d (CPUOpenRISCState *env,uint64_t a,uint64_t b,uint64_t c) { -OpenRISCCPU *cpu =openrisc_env_get_cpu (env); -uint64_t result; -set_float_exception_flags (0 , &cpu->env.fp_status); -/* Note that or1ksim doesn't use merged operation. */ - result =float64_mul (b, c, &cpu->env.fp_status); - result =float64_add (result, a, &cpu->env.fp_status); -update_fpcsr (cpu); -return result; +/* Note that or1ksim doesn't use fused operation. */ + b =float64_mul (b, c, &env->fp_status); +return float64_add (a, b, &env->fp_status); }uint32_t helper_float_madd_s (CPUOpenRISCState *env,uint32_t a,uint32_t b,uint32_t c) { -OpenRISCCPU *cpu =openrisc_env_get_cpu (env); -uint32_t result; -set_float_exception_flags (0 , &cpu->env.fp_status); -/* Note that or1ksim doesn't use merged operation. */ - result =float32_mul (b, c, &cpu->env.fp_status); - result =float32_add (result, a, &cpu->env.fp_status); -update_fpcsr (cpu); -return result; +/* Note that or1ksim doesn't use fused operation. */ + b =float32_mul (b, c, &env->fp_status); +return float32_add (a, b, &env->fp_status); } -#define FLOAT_CMP (name) \ -uint64_t helper_float_ ## name ## _d(CPUOpenRISCState *env, \ - uint64_t fdt0, uint64_t fdt1) \ -{ \ - int res; \ - OpenRISCCPU *cpu = openrisc_env_get_cpu(env); \ - set_float_exception_flags(0, &cpu->env.fp_status); \ - res = float64_ ## name(fdt0, fdt1, &cpu->env.fp_status); \ - update_fpcsr(cpu); \ - return res; \ -} \ - \ -uint32_t helper_float_ ## name ## _s(CPUOpenRISCState *env, \ - uint32_t fdt0, uint32_t fdt1)\ -{ \ - int res; \ - OpenRISCCPU *cpu = openrisc_env_get_cpu(env); \ - set_float_exception_flags(0, &cpu->env.fp_status); \ - res = float32_ ## name(fdt0, fdt1, &cpu->env.fp_status); \ - update_fpcsr(cpu); \ - return res; \ -} +#define FLOAT_CMP (name, impl) \ +target_ulong helper_float_ ## name ## _d(CPUOpenRISCState *env, \ + uint64_t fdt0, uint64_t fdt1) \ +{ return float64_ ## impl(fdt0, fdt1, &env->fp_status); } \ +target_ulong helper_float_ ## name ## _s(CPUOpenRISCState *env, \ + uint32_t fdt0, uint32_t fdt1) \ +{ return float32_ ## impl(fdt0, fdt1, &env->fp_status); } -FLOAT_CMP(le) -FLOAT_CMP(eq) -FLOAT_CMP(lt) +FLOAT_CMP(le, le) +FLOAT_CMP(lt, lt) +FLOAT_CMP(eq, eq_quiet)#undef FLOAT_CMP - - -#define FLOAT_CMPNE (name) \ -uint64_t helper_float_ ## name ## _d(CPUOpenRISCState *env, \ - uint64_t fdt0, uint64_t fdt1) \ -{ \ - int res; \ - OpenRISCCPU *cpu = openrisc_env_get_cpu(env); \ - set_float_exception_flags(0, &cpu->env.fp_status); \ - res = !float64_eq_quiet(fdt0, fdt1, &cpu->env.fp_status); \ - update_fpcsr(cpu); \ - return res; \ -} \ - \ -uint32_t helper_float_ ## name ## _s(CPUOpenRISCState *env, \ - uint32_t fdt0, uint32_t fdt1) \ -{ \ - int res; \ - OpenRISCCPU *cpu = openrisc_env_get_cpu(env); \ - set_float_exception_flags(0, &cpu->env.fp_status); \ - res = !float32_eq_quiet(fdt0, fdt1, &cpu->env.fp_status); \ - update_fpcsr(cpu); \ - return res; \ -} - -FLOAT_CMPNE(ne) -#undef FLOAT_CMPNE - -#define FLOAT_CMPGT (name) \ -uint64_t helper_float_ ## name ## _d(CPUOpenRISCState *env, \ - uint64_t fdt0, uint64_t fdt1) \ -{ \ - int res; \ - OpenRISCCPU *cpu = openrisc_env_get_cpu(env); \ - set_float_exception_flags(0, &cpu->env.fp_status); \ - res = !float64_le(fdt0, fdt1, &cpu->env.fp_status); \ - update_fpcsr(cpu); \ - return res; \ -} \ - \ -uint32_t helper_float_ ## name ## _s(CPUOpenRISCState *env, \ - uint32_t fdt0, uint32_t fdt1) \ -{ \ - int res; \ - OpenRISCCPU *cpu = openrisc_env_get_cpu(env); \ - set_float_exception_flags(0, &cpu->env.fp_status); \ - res = !float32_le(fdt0, fdt1, &cpu->env.fp_status); \ - update_fpcsr(cpu); \ - return res; \ -} -FLOAT_CMPGT(gt) -#undef FLOAT_CMPGT - -#define FLOAT_CMPGE (name) \ -uint64_t helper_float_ ## name ## _d(CPUOpenRISCState *env, \ - uint64_t fdt0, uint64_t fdt1) \ -{ \ - int res; \ - OpenRISCCPU *cpu = openrisc_env_get_cpu(env); \ - set_float_exception_flags(0, &cpu->env.fp_status); \ - res = !float64_lt(fdt0, fdt1, &cpu->env.fp_status); \ - update_fpcsr(cpu); \ - return res; \ -} \ - \ -uint32_t helper_float_ ## name ## _s(CPUOpenRISCState *env, \ - uint32_t fdt0, uint32_t fdt1) \ -{ \ - int res; \ - OpenRISCCPU *cpu = openrisc_env_get_cpu(env); \ - set_float_exception_flags(0, &cpu->env.fp_status); \ - res = !float32_lt(fdt0, fdt1, &cpu->env.fp_status); \ - update_fpcsr(cpu); \ - return res; \ -} - -FLOAT_CMPGE (ge) -#undef FLOAT_CMPGE
target-openrisc/helper.h +12 -13
@@ -24,17 +24,19 @@ 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, 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) +DEF_HELPER_FLAGS_1(update_fpcsr, TCG_CALL_NO_WG, void, env) -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) +DEF_HELPER_FLAGS_2(itofd, TCG_CALL_NO_RWG, i64, env, i64) +DEF_HELPER_FLAGS_2(itofs, TCG_CALL_NO_RWG, i32, env, i32) +DEF_HELPER_FLAGS_2(ftoid, TCG_CALL_NO_RWG, i64, env, i64) +DEF_HELPER_FLAGS_2(ftois, TCG_CALL_NO_RWG, i32, env, i32) + +DEF_HELPER_FLAGS_4(float_madd_s, TCG_CALL_NO_RWG, i32, env, i32, i32, i32) +DEF_HELPER_FLAGS_4(float_madd_d, TCG_CALL_NO_RWG, i64, env, i64, i64, i64)#define FOP_CALC (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) +DEF_HELPER_FLAGS_3(float_ ## op ## _s, TCG_CALL_NO_RWG, i32, env, i32, i32) \ +DEF_HELPER_FLAGS_3(float_ ## op ## _d, TCG_CALL_NO_RWG, i64, env, i64, i64) FOP_CALC(add) FOP_CALC(sub) FOP_CALC(mul)
@@ -43,14 +45,11 @@ FOP_CALC(rem)#undef FOP_CALC#define FOP_CMP (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) +DEF_HELPER_FLAGS_3(float_ ## op ## _s, TCG_CALL_NO_RWG, tl, env, i32, i32) \ +DEF_HELPER_FLAGS_3(float_ ## op ## _d, TCG_CALL_NO_RWG, tl, env, i64, i64) FOP_CMP(eq) FOP_CMP(lt) FOP_CMP(le) -FOP_CMP(ne) -FOP_CMP(gt) -FOP_CMP(ge)#undef FOP_CMP/* int */
target-openrisc/translate.c +68 -50
243 lines not on this page · raw message
Signature · 1 line
2.4.3
Re: [Qemu-devel] [PATCH 16/17] target-openrisc: Write back result before FPE exception
Quoted 11 lines · Richard Henderson
The architecture manual is unclear about this, but the or1ksim does writeback before the exception. This requires splitting the helpers in half, with the exception raised by the second.
Signed-off-by Richard Henderson <[email protected]>--- target-openrisc/fpu_helper.c | 252 +++++++++---------------------------------- target-openrisc/helper.h | 25 +++-- target-openrisc/translate.c | 118 +++++++++++--------- 3 files changed, 129 insertions(+), 266 deletions(-)
Cheers,
Bastian
PATCH 17/17 target-openrisc: Implement lwa, swa
In reply to Richard Henderson--- linux-user/main.c | 45 ++++++++++++++++++++++++ target-openrisc/cpu.c | 1 + target-openrisc/cpu.h | 9 +++++ target-openrisc/interrupt.c | 1 + target-openrisc/interrupt_helper.c | 1 + target-openrisc/mmu.c | 1 + target-openrisc/translate.c | 70 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 128 insertions(+)
linux-user/main.c +45 -0
@@ -2644,6 +2644,48 @@ error:#endif #ifdef TARGET_OPENRISC +static void do_store_exclusive (CPUOpenRISCState *env) +{ +target_ulong addr, val, tmp; +target_siginfo_t info; +int ret =0 ; + + addr = env->lock_addr; + tmp = env->lock_st_addr; + env->lock_addr =-1 ; + env->lock_st_addr =0 ; + +start_exclusive (); +mmap_lock (); + +if (addr == tmp) { +if (get_user_u32 (val, addr)) { + goto do_sigsegv; + } +if (val == env->lock_value) { +if (put_user_u32 (env->lock_st_value, addr)) { + goto do_sigsegv; + } + ret =1 ; + } + } + env->sr_f = ret; + env->pc +=4 ; + +mmap_unlock (); +end_exclusive (); +return ; + + do_sigsegv: +mmap_unlock (); +end_exclusive (); + + info.si_signo =TARGET_SIGSEGV ; + info.si_errno =0 ; + info.si_code =TARGET_SEGV_MAPERR ; + info._sifields._sigfault._addr = addr; +queue_signal (env,TARGET_SIGSEGV , &info); +}void cpu_loop (CPUOpenRISCState *env) {
@@ -2713,6 +2755,9 @@ void cpu_loop(CPUOpenRISCState *env)case EXCP_NR :qemu_log ("\nNR\n" );break ; +case EXCP_SWA : +do_store_exclusive (env); +break ;default :qemu_log ("\nqemu: unhandled CPU exception %#x - aborting\n" , trapnr);
target-openrisc/cpu.c +1 -0
@@ -52,6 +52,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 +9 -0
@@ -171,6 +171,8 @@ enum {EXCP_FPE =0xd ,EXCP_TRAP =0xe ,EXCP_NR , +/* For usermode emulation. */ + EXCP_SWA, };/* Supervisor register */
@@ -297,6 +299,13 @@ typedef struct CPUOpenRISCState {uint32_t fpcsr;/* Float register */ float_status fp_status; +target_ulong lock_addr; +target_ulong lock_value; +#ifdef CONFIG_USER_ONLY +target_ulong lock_st_addr; +target_ulong lock_st_value; +#endif +uint32_t flags;/* cpu_flags, we only use it for exception in solt so far. */
target-openrisc/interrupt.c +1 -0
@@ -53,6 +53,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
@@ -32,6 +32,7 @@ void HELPER(rfe)(CPUOpenRISCState *env) 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 ;#ifndef CONFIG_USER_ONLY if (cpu->env.sr &SR_DME ) {
target-openrisc/mmu.c +1 -0
@@ -172,6 +172,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 +70 -0
100 lines not on this page · raw message
Signature · 1 line
2.4.3
Re: [Qemu-devel] [PATCH 17/17] target-openrisc: Implement lwa, swa
Quoted 10 lines · Richard Henderson
Signed-off-by Richard Henderson <[email protected]>--- linux-user/main.c | 45 ++++++++++++++++++++++++ target-openrisc/cpu.c | 1 + target-openrisc/cpu.h | 9 +++++ target-openrisc/interrupt.c | 1 + target-openrisc/interrupt_helper.c | 1 + target-openrisc/mmu.c | 1 + target-openrisc/translate.c | 70 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 128 insertions(+)
This looks good to me. However I don't feel confident enough to give a rb.
Cheers,
Bastian