target/arm: Fix FPCXT_NS accesses when FPU disabled
cover target/arm: Fix FPCXT_NS accesses when FPU disabled
This patchseries fixes some bugs in v8.1M M-profile sysreg accesses:
(1) When the FPU is disabled and there is no active FP context (as defined by the pseudocode fpInactive flag), accesses to FPCXT_NS should not fail with a NOCP exception
(2) For cases where VLDR/VSTR sysreg don't perform a memory access (VLDR/VSTR of VPR when unprivileged, and VLDR to FPCXT_NS when fpInactive), the "side effects" of the load (update of writeback base register, and stack limit check) still need to happen, but we were skipping them
This patchseries fixes those bugs. Since these were detected by running tests from the gcc testsuite, I've marked the first four patches as cc: stable. The last three are a refactoring which isn't part of the bugfix proper.
Note for backport to stable: the patchset has a semantic dependency on commit 9a486856e9173af, which was not marked as cc-stable because we didn't know we'd need it for a for-stable bugfix. So that needs to be taken as well if this series goes to stable.
thanks
-- PMM
Peter Maydell (7):
target/arm/translate-vfp.c: Whitespace fixes
target/arm: Handle FPU being disabled in FPCXT_NS accesses target/arm: Don't NOCP fault for FPCXT_NS accesses target/arm: Handle writeback in VLDR/VSTR sysreg with no memory access target/arm: Factor FP context update code out into helper function target/arm: Split vfp_access_check() into A and M versions target/arm: Handle FPU check for FPCXT_NS insns via
vfp_access_check_m()
target/arm/translate-a32.h | 1 + target/arm/m-nocp.decode | 24 ++ target/arm/vfp.decode | 14 - target/arm/translate-m-nocp.c | 550 ++++++++++++++++++++++++++++ target/arm/translate-vfp.c | 664 ++++++---------------------------- 5 files changed, 681 insertions(+), 572 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/7 target/arm/translate-vfp.c: Whitespace fixes
In the code for handling VFP system register accesses there is some stray whitespace after a unary '-' operator, and also some incorrect indent in a couple of function prototypes. We're about to move this code to another file, so fix the code style issues first so checkpatch doesn't complain about the code-movement patch.
--- target/arm/translate-vfp.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
target/arm/translate-vfp.c +5 -6
@@ -771,9 +771,8 @@ static void gen_branch_fpInactive(DisasContext *s, TCGCond cond, }static bool gen_M_fp_sysreg_write (DisasContext *s,int regno, -fp_sysreg_loadfn *loadfn, -void *opaque) +void *opaque) {/* Do a write to an M-profile floating point system register */ TCGv_i32 tmp;
@@ -874,8 +873,8 @@ static bool gen_M_fp_sysreg_write(DisasContext *s, int regno, }static bool gen_M_fp_sysreg_read (DisasContext *s,int regno, -fp_sysreg_storefn *storefn, -void *opaque) +fp_sysreg_storefn *storefn, +void *opaque) {/* Do a read from an M-profile floating point system register */ TCGv_i32 tmp;
@@ -1207,7 +1206,7 @@ static void fp_sysreg_to_memory(DisasContext *s, void *opaque, TCGv_i32 value)TCGv_i32 addr;if (!a->a) { - offset = - offset; + offset = -offset; } addr =load_reg (s, a->rn);
@@ -1242,7 +1241,7 @@ static TCGv_i32 memory_to_fp_sysreg(DisasContext *s, void *opaque)TCGv_i32 value =tcg_temp_new_i32 ();if (!a->a) { - offset = - offset; + offset = -offset; } addr =load_reg (s, a->rn);
Signature · 1 line
2.20.1
Re: [PATCH 1/7] target/arm/translate-vfp.c: Whitespace fixes
Quoted 11 lines · Peter Maydell
In the code for handling VFP system register accesses there is some stray whitespace after a unary '-' operator, and also some incorrect indent in a couple of function prototypes. We're about to move this code to another file, so fix the code style issues first so checkpatch doesn't complain about the code-movement patch.
Signed-off-by Peter Maydell<[email protected]>--- target/arm/translate-vfp.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
r~
PATCH 2/7 target/arm: Handle FPU being disabled in FPCXT_NS accesses
In reply to Peter MaydellIf the guest makes an FPCXT_NS access when the FPU is disabled, one of two things happens:
* if there is no active FP context, then the insn behaves the same way as if the FPU was enabled: writes ignored, reads same value as FPDSCR_NS
* if there is an active FP context, then we take a NOCP exception
Add code to the sysreg read/write functions which emits code to take the NOCP exception in the latter case.
At the moment this will never be used, because the NOCP checks in m-nocp.decode happen first, and so the trans functions are never called when the FPU is disabled. The code will be needed when we move the sysreg access insns to before the NOCP patterns in the following commit.
---
The "check for exception; then call gen_preserve_fp_state()" is a little repetitive. We'll clean this up in a bit of refactoring at the end of the patchseries, because the nicest way to do it involves restructuring vfp_access_check().
--- target/arm/translate-vfp.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-)
target/arm/translate-vfp.c +30 -2
@@ -821,7 +821,21 @@ static bool gen_M_fp_sysreg_write(DisasContext *s, int regno, lab_end =gen_new_label ();/* fpInactive case: write is a NOP, so branch to end */ gen_branch_fpInactive (s,TCG_COND_NE , lab_end); -/* !fpInactive: PreserveFPState(), and reads same as FPCXT_S */ +/* +* !fpInactive: if FPU disabled, take NOCP exception; +* otherwise PreserveFPState(), and then FPCXT_NS writes +* behave the same as FPCXT_S writes. +*/ +if (s->fp_excp_el) { +gen_exception_insn (s, s->pc_curr,EXCP_NOCP , +syn_uncategorized (), s->fp_excp_el); +/* +* This was only a conditional exception, so override +* gen_exception_insn()'s default to DISAS_NORETURN +*/ + s->base.is_jmp =DISAS_NEXT ; +break ; + }gen_preserve_fp_state (s);/* fall through */ case ARM_VFP_FPCXT_S :
@@ -961,7 +975,21 @@ static bool gen_M_fp_sysreg_read(DisasContext *s, int regno,tcg_gen_br (lab_end);gen_set_label (lab_active); -/* !fpInactive: Reads the same as FPCXT_S, but side effects differ */ +/* +* !fpInactive: if FPU disabled, take NOCP exception; +* otherwise PreserveFPState(), and then FPCXT_NS +* reads the same as FPCXT_S. +*/ +if (s->fp_excp_el) { +gen_exception_insn (s, s->pc_curr,EXCP_NOCP , +syn_uncategorized (), s->fp_excp_el); +/* +* This was only a conditional exception, so override +* gen_exception_insn()'s default to DISAS_NORETURN +*/ + s->base.is_jmp =DISAS_NEXT ; +break ; + }gen_preserve_fp_state (s); tmp =tcg_temp_new_i32 (); sfpa =tcg_temp_new_i32 ();
Signature · 1 line
2.20.1
Re: [PATCH 2/7] target/arm: Handle FPU being disabled in FPCXT_NS accesses
Quoted 17 lines · Peter Maydell
If the guest makes an
FPCXT_NSaccess when the FPU is disabled, one of two things happens:
* if there is no active FP context, then the insn behaves the same way as if the FPU was enabled: writes ignored, reads same value asFPDSCR_NS
* if there is an active FP context, then we take a NOCP exceptionAdd code to the sysreg read/write functions which emits code to take the NOCP exception in the latter case.
At the moment this will never be used, because the NOCP checks in m-nocp.decode happen first, and so the trans functions are never called when the FPU is disabled. The code will be needed when we move the sysreg access insns to before the NOCP patterns in the following commit.
Quoted 3 lines
Signed-off-by Peter Maydell<[email protected]>---
r~
PATCH 3/7 target/arm: Don't NOCP fault for FPCXT_NS accesses
In reply to Peter MaydellThe M-profile architecture requires that accesses to FPCXT_NS when there is no active FP state must not take a NOCP fault even if the FPU is disabled. We were not implementing this correctly, because in our decode we catch the NOCP faults early in m-nocp.decode.
Fix this bug by moving all the handling of M-profile FP system register accesses from vfp.decode into m-nocp.decode and putting it above the NOCP blocks. This provides the correct behaviour:
* for accesses other than FPCXT_NS the trans functions call vfp_access_check(), which will check for FPU disabled and raise a NOCP exception if necessary
* for FPCXT_NS we have the special case code that doesn't call vfp_access_check()
* when these trans functions want to raise an UNDEF they return false, so the decoder will fall through into the NOCP blocks. This means that NOCP correctly takes precedence over UNDEF for these insns. (This is a difference from the other insns handled by m-nocp.decode, where UNDEF takes precedence and which we implement by having those trans functions call unallocated_encoding() in the appropriate places.)
[Note for backport to stable: this commit has a semantic dependency on commit 9a486856e9173af, which was not marked as cc-stable because we didn't know we'd need it for a for-stable bugfix.]
---
A big patch, but it's almost entirely code movement.
--- target/arm/translate-a32.h | 1 + target/arm/m-nocp.decode | 24 ++ target/arm/vfp.decode | 14 - target/arm/translate-m-nocp.c | 514 +++++++++++++++++++++++++++++++++ target/arm/translate-vfp.c | 517 +--------------------------------- 5 files changed, 542 insertions(+), 528 deletions(-)
target/arm/translate-a32.h +1 -0
@@ -32,6 +32,7 @@ bool disas_neon_shared(DisasContext *s, uint32_t insn);void load_reg_var (DisasContext *s,TCGv_i32 var,int reg);void arm_gen_condlabel (DisasContext *s);bool vfp_access_check (DisasContext *s); +void gen_preserve_fp_state (DisasContext *s);void read_neon_element32 (TCGv_i32 dest,int reg,int ele,MemOp memop);void read_neon_element64 (TCGv_i64 dest,int reg,int ele,MemOp memop);void write_neon_element32 (TCGv_i32 src,int reg,int ele,MemOp memop);
target/arm/m-nocp.decode +24 -0
@@ -34,6 +34,14 @@ &nocp cp +# M-profile VLDR/VSTR to sysreg +%vldr_sysreg 22:1 13:3 +%imm7_0x4 0:7 !function=times_4 + +&vldr_sysreg rn reg imm a w p +@vldr_sysreg .... ... . a:1 . . . rn:4 ... . ... .. ....... \ + reg=%vldr_sysreg imm=%imm7_0x4 &vldr_sysreg + { # Special cases which do not take an early NOCP: VLLDM and VLSTM VLLDM_VLSTM 1110 1100 001 l:1 rn:4 0000 1010 op:1 000 0000
@@ -41,6 +49,22 @@ VSCCLRM 1110 1100 1.01 1111 .... 1011 imm:7 0 vd=%vd_dp size=3 VSCCLRM 1110 1100 1.01 1111 .... 1010 imm:8 vd=%vd_sp size=2 + # FP system register accesses: these are a special case because accesses + # to FPCXT_NS succeed even if the FPU is disabled. We therefore need + # to handle them before the big NOCP blocks. Note that within these + # insns NOCP still has higher priority than UNDEFs; this is implemented + # by their returning 'false' for UNDEF so as to fall through into the + # NOCP check (in contrast to VLLDM etc, which call unallocated_encoding() + # for the UNDEFs there that must take precedence over NOCP.) + + VMSR_VMRS ---- 1110 111 l:1 reg:4 rt:4 1010 0001 0000 + + # P=0 W=0 is SEE "Related encodings", so split into two patterns + VLDR_sysreg ---- 110 1 . . w:1 1 .... ... 0 111 11 ....... @vldr_sysreg p=1 + VLDR_sysreg ---- 110 0 . . 1 1 .... ... 0 111 11 ....... @vldr_sysreg p=0 w=1 + VSTR_sysreg ---- 110 1 . . w:1 0 .... ... 0 111 11 ....... @vldr_sysreg p=1 + VSTR_sysreg ---- 110 0 . . 1 0 .... ... 0 111 11 ....... @vldr_sysreg p=0 w=1 + NOCP 111- 1110 ---- ---- ---- cp:4 ---- ---- &nocp NOCP 111- 110- ---- ---- ---- cp:4 ---- ---- &nocp # From v8.1M onwards this range will also NOCP:
target/arm/vfp.decode +0 -14
@@ -84,20 +84,6 @@ VLDR_VSTR_hp ---- 1101 u:1 .0 l:1 rn:4 .... 1001 imm:8 vd=%vd_sp VLDR_VSTR_sp ---- 1101 u:1 .0 l:1 rn:4 .... 1010 imm:8 vd=%vd_sp VLDR_VSTR_dp ---- 1101 u:1 .0 l:1 rn:4 .... 1011 imm:8 vd=%vd_dp -# M-profile VLDR/VSTR to sysreg -%vldr_sysreg 22:1 13:3 -%imm7_0x4 0:7 !function=times_4 - -&vldr_sysreg rn reg imm a w p -@vldr_sysreg .... ... . a:1 . . . rn:4 ... . ... .. ....... \ - reg=%vldr_sysreg imm=%imm7_0x4 &vldr_sysreg - -# P=0 W=0 is SEE "Related encodings", so split into two patterns -VLDR_sysreg ---- 110 1 . . w:1 1 .... ... 0 111 11 ....... @vldr_sysreg p=1 -VLDR_sysreg ---- 110 0 . . 1 1 .... ... 0 111 11 ....... @vldr_sysreg p=0 w=1 -VSTR_sysreg ---- 110 1 . . w:1 0 .... ... 0 111 11 ....... @vldr_sysreg p=1 -VSTR_sysreg ---- 110 0 . . 1 0 .... ... 0 111 11 ....... @vldr_sysreg p=0 w=1 - # We split the load/store multiple up into two patterns to avoid # overlap with other insns in the "Advanced SIMD load/store and 64-bit move" # grouping:
target/arm/translate-m-nocp.c +514 -0
526 lines not on this page · raw message
target/arm/translate-vfp.c +3 -514
541 lines not on this page · raw message
Signature · 1 line
2.20.1
Re: [PATCH 3/7] target/arm: Don't NOCP fault for FPCXT_NS accesses
Quoted 25 lines · Peter Maydell
The M-profile architecture requires that accesses to
FPCXT_NSwhen there is no active FP state must not take a NOCP fault even if the FPU is disabled. We were not implementing this correctly, because in our decode we catch the NOCP faults early in m-nocp.decode.Fix this bug by moving all the handling of M-profile FP system register accesses from vfp.decode into m-nocp.decode and putting it above the NOCP blocks. This provides the correct behaviour:
* for accesses other thanFPCXT_NSthe trans functions callvfp_access_check(), which will check for FPU disabled and raise a NOCP exception if necessary
* forFPCXT_NSwe have the special case code that doesn't callvfp_access_check()
* when these trans functions want to raise an UNDEF they return false, so the decoder will fall through into the NOCP blocks. This means that NOCP correctly takes precedence over UNDEF for these insns. (This is a difference from the other insns handled by m-nocp.decode, where UNDEF takes precedence and which we implement by having those trans functions callunallocated_encoding()in the appropriate places.)[Note for backport to stable: this commit has a semantic dependency on commit
9a486856e9173af, which was not marked as cc-stable because we didn't know we'd need it for a for-stable bugfix.]
Quoted 5 lines
Signed-off-by Peter Maydell<[email protected]>---
A big patch, but it's almost entirely code movement.
---
r~
PATCH 4/7 target/arm: Handle writeback in VLDR/VSTR sysreg with no memory access
In reply to Peter MaydellA few subcases of VLDR/VSTR sysreg succeed but do not perform a memory access:
* VSTR of VPR when unprivileged
* VLDR to VPR when unprivileged
* VLDR to FPCXT_NS when fpInactive
In these cases, even though we don't do the memory access we should still update the base register and perform the stack limit check if the insn's addressing mode specifies writeback. Our implementation failed to do this, because we handle these side-effects inside the memory_to_fp_sysreg() and fp_sysreg_to_memory() callback functions, which are only called if there's something to load or store.
Fix this by adding an extra argument to the callbacks which is set to true to actually perform the access and false to only do side effects like writeback, and calling the callback with do_access = false for the three cases listed above.
This produces slightly suboptimal code for the case of a write to FPCXT_NS when the FPU is inactive and the insn didn't have side effects (ie no writeback, or via VMSR), in which case we'll generate a conditional branch over an unconditional branch. But this doesn't seem to be important enough to merit requiring the callback to report back whether it generated any code or not.
--- target/arm/translate-m-nocp.c | 102 ++++++++++++++++++++++++---------- 1 file changed, 72 insertions(+), 30 deletions(-)
target/arm/translate-m-nocp.c +72 -30
@@ -207,14 +207,20 @@ static bool trans_VSCCLRM(DisasContext *s, arg_VSCCLRM *a)/* * Emit code to store the sysreg to its final destination; frees the -* TCG temp 'value' it is passed. +* TCG temp 'value' it is passed. do_access is true to do the store, +* and false to skip it and only perform side-effects like base +* register writeback. */ -typedef void fp_sysreg_storefn (DisasContext *s,void *opaque,TCGv_i32 value); +typedef void fp_sysreg_storefn (DisasContext *s,void *opaque,TCGv_i32 value, +bool do_access);/* * Emit code to load the value to be copied to the sysreg; returns -* a new TCG temporary +* a new TCG temporary. do_access is true to do the store, +* and false to skip it and only perform side-effects like base +* register writeback. */ -typedef TCGv_i32 fp_sysreg_loadfn (DisasContext *s,void *opaque); +typedef TCGv_i32 fp_sysreg_loadfn (DisasContext *s,void *opaque, +bool do_access);/* Common decode/access checks for fp sysreg read/write */ typedef enum FPSysRegCheckResult {
@@ -318,7 +324,7 @@ static bool gen_M_fp_sysreg_write(DisasContext *s, int regno,switch (regno) {case ARM_VFP_FPSCR : - tmp =loadfn (s, opaque); + tmp =loadfn (s, opaque, true);gen_helper_vfp_set_fpscr (cpu_env, tmp);tcg_temp_free_i32 (tmp);gen_lookup_tb (s);
@@ -326,7 +332,7 @@ static bool gen_M_fp_sysreg_write(DisasContext *s, int regno,case ARM_VFP_FPSCR_NZCVQC : {TCGv_i32 fpscr; - tmp =loadfn (s, opaque); + tmp =loadfn (s, opaque, true);if (dc_isar_feature (aa32_mve, s)) {/* QC is only present for MVE; otherwise RES0 */ TCGv_i32 qc =tcg_temp_new_i32 ();
@@ -347,9 +353,19 @@ static bool gen_M_fp_sysreg_write(DisasContext *s, int regno,break ; }case ARM_VFP_FPCXT_NS : + { +TCGLabel *lab_active =gen_new_label (); + lab_end =gen_new_label (); -/* fpInactive case: write is a NOP, so branch to end */ -gen_branch_fpInactive (s,TCG_COND_NE , lab_end); +gen_branch_fpInactive (s,TCG_COND_EQ , lab_active); +/* +* fpInactive case: write is a NOP, so only do side effects +* like register writeback before we branch to end +*/ +loadfn (s, opaque, false); +tcg_gen_br (lab_end); + +gen_set_label (lab_active);/* * !fpInactive: if FPU disabled, take NOCP exception; * otherwise PreserveFPState(), and then FPCXT_NS writes
@@ -366,7 +382,8 @@ static bool gen_M_fp_sysreg_write(DisasContext *s, int regno,break ; }gen_preserve_fp_state (s); -/* fall through */ + } +/* fall through */ case ARM_VFP_FPCXT_S : {TCGv_i32 sfpa, control;
@@ -374,7 +391,7 @@ static bool gen_M_fp_sysreg_write(DisasContext *s, int regno,* Set FPSCR and CONTROL.SFPA from value; the new FPSCR takes * bits [27:0] from value and zeroes bits [31:28]. */ - tmp =loadfn (s, opaque); + tmp =loadfn (s, opaque, true); sfpa =tcg_temp_new_i32 ();tcg_gen_shri_i32 (sfpa, tmp,31 ); control =load_cpu_field (v7m.control[M_REG_S ]);
@@ -390,15 +407,16 @@ static bool gen_M_fp_sysreg_write(DisasContext *s, int regno,case ARM_VFP_VPR :/* Behaves as NOP if not privileged */ if (IS_USER (s)) { +loadfn (s, opaque, false);break ; } - tmp =loadfn (s, opaque); + tmp =loadfn (s, opaque, true);store_cpu_field (tmp, v7m.vpr);break ;case ARM_VFP_P0 : {TCGv_i32 vpr; - tmp =loadfn (s, opaque); + tmp =loadfn (s, opaque, true); vpr =load_cpu_field (v7m.vpr);tcg_gen_deposit_i32 (vpr, vpr, tmp,R_V7M_VPR_P0_SHIFT ,R_V7M_VPR_P0_LENGTH );
@@ -442,13 +460,13 @@ static bool gen_M_fp_sysreg_read(DisasContext *s, int regno,case ARM_VFP_FPSCR : tmp =tcg_temp_new_i32 ();gen_helper_vfp_get_fpscr (tmp, cpu_env); -storefn (s, opaque, tmp); +storefn (s, opaque, tmp, true);break ;case ARM_VFP_FPSCR_NZCVQC : tmp =tcg_temp_new_i32 ();gen_helper_vfp_get_fpscr (tmp, cpu_env);tcg_gen_andi_i32 (tmp, tmp,FPCR_NZCVQC_MASK ); -storefn (s, opaque, tmp); +storefn (s, opaque, tmp, true);break ;case QEMU_VFP_FPSCR_NZCV :/*
@@ -457,7 +475,7 @@ static bool gen_M_fp_sysreg_read(DisasContext *s, int regno,*/ tmp =load_cpu_field (vfp.xregs[ARM_VFP_FPSCR ]);tcg_gen_andi_i32 (tmp, tmp,FPCR_NZCV_MASK ); -storefn (s, opaque, tmp); +storefn (s, opaque, tmp, true);break ;case ARM_VFP_FPCXT_S : {
@@ -476,7 +494,7 @@ static bool gen_M_fp_sysreg_read(DisasContext *s, int regno,* Store result before updating FPSCR etc, in case * it is a memory write which causes an exception. */ -storefn (s, opaque, tmp); +storefn (s, opaque, tmp, true);/* * Now we must reset FPSCR from FPDSCR_NS, and clear * CONTROL.SFPA; so we'll end the TB here.
@@ -499,7 +517,7 @@ static bool gen_M_fp_sysreg_read(DisasContext *s, int regno,gen_branch_fpInactive (s,TCG_COND_EQ , lab_active);/* fpInactive case: reads as FPDSCR_NS */ TCGv_i32 tmp =load_cpu_field (v7m.fpdscr[M_REG_NS ]); -storefn (s, opaque, tmp); +storefn (s, opaque, tmp, true); lab_end =gen_new_label ();tcg_gen_br (lab_end);
@@ -531,7 +549,7 @@ static bool gen_M_fp_sysreg_read(DisasContext *s, int regno,tcg_gen_or_i32 (tmp, tmp, sfpa);tcg_temp_free_i32 (control);/* Store result before updating FPSCR, in case it faults */ -storefn (s, opaque, tmp); +storefn (s, opaque, tmp, true);/* If SFPA is zero then set FPSCR from FPDSCR_NS */ fpdscr =load_cpu_field (v7m.fpdscr[M_REG_NS ]); zero =tcg_const_i32 (0 );
@@ -546,15 +564,16 @@ static bool gen_M_fp_sysreg_read(DisasContext *s, int regno,case ARM_VFP_VPR :/* Behaves as NOP if not privileged */ if (IS_USER (s)) { +storefn (s, opaque,NULL , false);break ; } tmp =load_cpu_field (v7m.vpr); -storefn (s, opaque, tmp); +storefn (s, opaque, tmp, true);break ;case ARM_VFP_P0 : tmp =load_cpu_field (v7m.vpr);tcg_gen_extract_i32 (tmp, tmp,R_V7M_VPR_P0_SHIFT ,R_V7M_VPR_P0_LENGTH ); -storefn (s, opaque, tmp); +storefn (s, opaque, tmp, true);break ;default :g_assert_not_reached ();
@@ -569,10 +588,15 @@ static bool gen_M_fp_sysreg_read(DisasContext *s, int regno,return true; } -static void fp_sysreg_to_gpr (DisasContext *s,void *opaque,TCGv_i32 value) +static void fp_sysreg_to_gpr (DisasContext *s,void *opaque,TCGv_i32 value, +bool do_access) {arg_VMSR_VMRS *a = opaque; +if (!do_access) { +return ; + } +if (a->rt ==15 ) {/* Set the 4 flag bits in the CPSR */ gen_set_nzcv (value);
@@ -582,10 +606,13 @@ static void fp_sysreg_to_gpr(DisasContext *s, void *opaque, TCGv_i32 value) } } -static TCGv_i32 gpr_to_fp_sysreg (DisasContext *s,void *opaque) +static TCGv_i32 gpr_to_fp_sysreg (DisasContext *s,void *opaque,bool do_access) {arg_VMSR_VMRS *a = opaque; +if (!do_access) { +return NULL ; + }return load_reg (s, a->rt); }
@@ -614,7 +641,8 @@ static bool trans_VMSR_VMRS(DisasContext *s, arg_VMSR_VMRS *a) } } -static void fp_sysreg_to_memory (DisasContext *s,void *opaque,TCGv_i32 value) +static void fp_sysreg_to_memory (DisasContext *s,void *opaque,TCGv_i32 value, +bool do_access) {arg_vldr_sysreg *a = opaque;uint32_t offset = a->imm;
@@ -624,6 +652,10 @@ static void fp_sysreg_to_memory(DisasContext *s, void *opaque, TCGv_i32 value) offset = -offset; } +if (!do_access && !a->w) { +return ; + } + addr =load_reg (s, a->rn);if (a->p) {tcg_gen_addi_i32 (addr, addr, offset);
@@ -633,9 +665,11 @@ static void fp_sysreg_to_memory(DisasContext *s, void *opaque, TCGv_i32 value)gen_helper_v8m_stackcheck (cpu_env, addr); } -gen_aa32_st_i32 (s, value, addr,get_mem_index (s), -MO_UL |MO_ALIGN | s->be_data); -tcg_temp_free_i32 (value); +if (do_access) { +gen_aa32_st_i32 (s, value, addr,get_mem_index (s), +MO_UL |MO_ALIGN | s->be_data); +tcg_temp_free_i32 (value); + }if (a->w) {/* writeback */
@@ -648,17 +682,22 @@ static void fp_sysreg_to_memory(DisasContext *s, void *opaque, TCGv_i32 value) } } -static TCGv_i32 memory_to_fp_sysreg (DisasContext *s,void *opaque) +static TCGv_i32 memory_to_fp_sysreg (DisasContext *s,void *opaque, +bool do_access) {arg_vldr_sysreg *a = opaque;uint32_t offset = a->imm;TCGv_i32 addr; -TCGv_i32 value =tcg_temp_new_i32 (); +TCGv_i32 value =NULL ;if (!a->a) { offset = -offset; } +if (!do_access && !a->w) { +return NULL ; + } + addr =load_reg (s, a->rn);if (a->p) {tcg_gen_addi_i32 (addr, addr, offset);
@@ -668,8 +707,11 @@ static TCGv_i32 memory_to_fp_sysreg(DisasContext *s, void *opaque)gen_helper_v8m_stackcheck (cpu_env, addr); } -gen_aa32_ld_i32 (s, value, addr,get_mem_index (s), -MO_UL |MO_ALIGN | s->be_data); +if (do_access) { + value =tcg_temp_new_i32 (); +gen_aa32_ld_i32 (s, value, addr,get_mem_index (s), +MO_UL |MO_ALIGN | s->be_data); + }if (a->w) {/* writeback */
Signature · 1 line
2.20.1
Re: [PATCH 4/7] target/arm: Handle writeback in VLDR/VSTR sysreg with no memory access
target/arm/translate-m-nocp.c static void fp_sysreg_to_memory(DisasContext *s, void *opaque, TCGv_i32 value) · line 672
Quoted 12 lines · Peter Maydell
target/arm/translate-m-nocp.c +5
-3@@ -633,9 +665,11 @@ static void fp_sysreg_to_memory(DisasContext *s, void *opaque, TCGv_i32 value)gen_helper_v8m_stackcheck (cpu_env, addr); } -gen_aa32_st_i32 (s, value, addr,get_mem_index (s), -MO_UL |MO_ALIGN | s->be_data); -tcg_temp_free_i32 (value); +if (do_access) { +gen_aa32_st_i32 (s, value, addr,get_mem_index (s), +MO_UL |MO_ALIGN | s->be_data); +tcg_temp_free_i32 (value); + }
So, this bit looked funny at first glance -- are we missing the free of value? But of course value == NULL when !do_access. Which made me wonder if it wouldn't be better to just use value == NULL and not add the extra argument?
Either way,
r~
Re: [PATCH 4/7] target/arm: Handle writeback in VLDR/VSTR sysreg with no memory access
Quoted 6 lines · Richard Henderson
Quoted 4 lines · Peter Maydell
target/arm/translate-m-nocp.c +0
-0@@ -633,9 +665,11 @@ static void fp_sysreg_to_memory(DisasContext *s, void *opaque, TCGv_i32 value)gen_helper_v8m_stackcheck (cpu_env, addr); }
Quoted 12 lines
target/arm/translate-m-nocp.c static void fp_sysreg_to_memory(DisasContext *s, void *opaque, TCGv_i32 value) · line 672
Quoted 8 lines
target/arm/translate-m-nocp.c +5
-3-gen_aa32_st_i32 (s, value, addr,get_mem_index (s), -MO_UL |MO_ALIGN | s->be_data); -tcg_temp_free_i32 (value); +if (do_access) { +gen_aa32_st_i32 (s, value, addr,get_mem_index (s), +MO_UL |MO_ALIGN | s->be_data); +tcg_temp_free_i32 (value); + }So, this bit looked funny at first glance -- are we missing the free of value? But of course value == NULL when !do_access. Which made me wonder if it wouldn't be better to just use value == NULL and not add the extra argument?
That was how I thought I'd do it initially, but of course you can't do that for the fp_memory_to_sysreg callbacks, and I preferred to be consistent across the two.
-- PMM
PATCH 5/7 target/arm: Factor FP context update code out into helper function
In reply to Peter MaydellFactor the code in full_vfp_access_check() which updates the ownership of the FP context and creates a new FP context out into its own function.
--- target/arm/translate-vfp.c | 104 +++++++++++++++++++++---------------- 1 file changed, 58 insertions(+), 46 deletions(-)
target/arm/translate-vfp.c +58 -46
@@ -131,6 +131,62 @@ void gen_preserve_fp_state(DisasContext *s) } } +/* +* Generate code for M-profile FP context handling: update the +* ownership of the FP context, and create a new context if +* necessary. This corresponds to the parts of the pseudocode +* ExecuteFPCheck() after the inital PreserveFPState() call. +*/ +static void gen_update_fp_context (DisasContext *s) +{ +/* Update ownership of FP context: set FPCCR.S to match current state */ +if (s->v8m_fpccr_s_wrong) { +TCGv_i32 tmp; + + tmp =load_cpu_field (v7m.fpccr[M_REG_S ]); +if (s->v8m_secure) { +tcg_gen_ori_i32 (tmp, tmp,R_V7M_FPCCR_S_MASK ); + }else { +tcg_gen_andi_i32 (tmp, tmp, ~R_V7M_FPCCR_S_MASK ); + } +store_cpu_field (tmp, v7m.fpccr[M_REG_S ]); +/* Don't need to do this for any further FP insns in this TB */ + s->v8m_fpccr_s_wrong = false; + } + +if (s->v7m_new_fp_ctxt_needed) { +/* +* Create new FP context by updating CONTROL.FPCA, CONTROL.SFPA, +* the FPSCR, and VPR. +*/ +TCGv_i32 control, fpscr; +uint32_t bits =R_V7M_CONTROL_FPCA_MASK ; + + fpscr =load_cpu_field (v7m.fpdscr[s->v8m_secure]); +gen_helper_vfp_set_fpscr (cpu_env, fpscr); +tcg_temp_free_i32 (fpscr); +if (dc_isar_feature (aa32_mve, s)) { +TCGv_i32 z32 =tcg_const_i32 (0 ); +store_cpu_field (z32, v7m.vpr); + } + +/* +* We don't need to arrange to end the TB, because the only +* parts of FPSCR which we cache in the TB flags are the VECLEN +* and VECSTRIDE, and those don't exist for M-profile. +*/ + +if (s->v8m_secure) { + bits |=R_V7M_CONTROL_SFPA_MASK ; + } + control =load_cpu_field (v7m.control[M_REG_S ]); +tcg_gen_ori_i32 (control, control, bits); +store_cpu_field (control, v7m.control[M_REG_S ]); +/* Don't need to do this for any further FP insns in this TB */ + s->v7m_new_fp_ctxt_needed = false; + } +} +/* * Check that VFP access is enabled. If it is, do the necessary * M-profile lazy-FP handling and then return true.
@@ -173,52 +229,8 @@ static bool full_vfp_access_check(DisasContext *s, bool ignore_vfp_enabled)/* Trigger lazy-state preservation if necessary */ gen_preserve_fp_state (s); -/* Update ownership of FP context: set FPCCR.S to match current state */ -if (s->v8m_fpccr_s_wrong) { -TCGv_i32 tmp; - - tmp =load_cpu_field (v7m.fpccr[M_REG_S ]); -if (s->v8m_secure) { -tcg_gen_ori_i32 (tmp, tmp,R_V7M_FPCCR_S_MASK ); - }else { -tcg_gen_andi_i32 (tmp, tmp, ~R_V7M_FPCCR_S_MASK ); - } -store_cpu_field (tmp, v7m.fpccr[M_REG_S ]); -/* Don't need to do this for any further FP insns in this TB */ - s->v8m_fpccr_s_wrong = false; - } - -if (s->v7m_new_fp_ctxt_needed) { -/* -* Create new FP context by updating CONTROL.FPCA, CONTROL.SFPA, -* the FPSCR, and VPR. -*/ -TCGv_i32 control, fpscr; -uint32_t bits =R_V7M_CONTROL_FPCA_MASK ; - - fpscr =load_cpu_field (v7m.fpdscr[s->v8m_secure]); -gen_helper_vfp_set_fpscr (cpu_env, fpscr); -tcg_temp_free_i32 (fpscr); -if (dc_isar_feature (aa32_mve, s)) { -TCGv_i32 z32 =tcg_const_i32 (0 ); -store_cpu_field (z32, v7m.vpr); - } - -/* -* We don't need to arrange to end the TB, because the only -* parts of FPSCR which we cache in the TB flags are the VECLEN -* and VECSTRIDE, and those don't exist for M-profile. -*/ - -if (s->v8m_secure) { - bits |=R_V7M_CONTROL_SFPA_MASK ; - } - control =load_cpu_field (v7m.control[M_REG_S ]); -tcg_gen_ori_i32 (control, control, bits); -store_cpu_field (control, v7m.control[M_REG_S ]); -/* Don't need to do this for any further FP insns in this TB */ - s->v7m_new_fp_ctxt_needed = false; - } +/* Update ownership of FP context and create new FP context if needed */ +gen_update_fp_context (s); }return true;
Signature · 1 line
2.20.1
Re: [PATCH 5/7] target/arm: Factor FP context update code out into helper function
Quoted 8 lines · Peter Maydell
Factor the code in
full_vfp_access_check()which updates the ownership of the FP context and creates a new FP context out into its own function.Signed-off-by Peter Maydell<[email protected]>--- target/arm/translate-vfp.c | 104 +++++++++++++++++++++---------------- 1 file changed, 58 insertions(+), 46 deletions(-)
r~
PATCH 6/7 target/arm: Split vfp_access_check() into A and M versions
In reply to Peter Maydellvfp_access_check and its helper routine full_vfp_access_check() has gradually grown and is now an awkward mix of A-profile only and M-profile only pieces. Refactor it into an A-profile only and an M-profile only version, taking advantage of the fact that now the only direct call to full_vfp_access_check() is in A-profile-only code.
--- target/arm/translate-vfp.c | 79 +++++++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 31 deletions(-)
target/arm/translate-vfp.c +48 -31
@@ -188,32 +188,19 @@ static void gen_update_fp_context(DisasContext *s) }/* -* Check that VFP access is enabled. If it is, do the necessary -* M-profile lazy-FP handling and then return true. -* If not, emit code to generate an appropriate exception and -* return false. +* Check that VFP access is enabled, A-profile specific version. +* +* If VFP is enabled, return true. If not, emit code to generate an +* appropriate exception and return false. * The ignore_vfp_enabled argument specifies that we should ignore -* whether VFP is enabled via FPEXC[EN]: this should be true for FMXR/FMRX +* whether VFP is enabled via FPEXC.EN: this should be true for FMXR/FMRX * accesses to FPSID, FPEXC, MVFR0, MVFR1, MVFR2, and false for all other insns. */ -static bool full_vfp_access_check (DisasContext *s,bool ignore_vfp_enabled) +static bool vfp_access_check_a (DisasContext *s,bool ignore_vfp_enabled) {if (s->fp_excp_el) { -if (arm_dc_feature (s,ARM_FEATURE_M )) { -/* -* M-profile mostly catches the "FPU disabled" case early, in -* disas_m_nocp(), but a few insns (eg LCTP, WLSTP, DLSTP) -* which do coprocessor-checks are outside the large ranges of -* the encoding space handled by the patterns in m-nocp.decode, -* and for them we may need to raise NOCP here. -*/ -gen_exception_insn (s, s->pc_curr,EXCP_NOCP , -syn_uncategorized (), s->fp_excp_el); - }else { -gen_exception_insn (s, s->pc_curr,EXCP_UDEF , -syn_fp_access_trap (1 ,0xe , false), - s->fp_excp_el); - } +gen_exception_insn (s, s->pc_curr,EXCP_UDEF , +syn_fp_access_trap (1 ,0xe , false), s->fp_excp_el);return false; }
@@ -222,17 +209,39 @@ static bool full_vfp_access_check(DisasContext *s, bool ignore_vfp_enabled)unallocated_encoding (s);return false; } +return true; +} -if (arm_dc_feature (s,ARM_FEATURE_M )) { -/* Handle M-profile lazy FP state mechanics */ - -/* Trigger lazy-state preservation if necessary */ -gen_preserve_fp_state (s); - -/* Update ownership of FP context and create new FP context if needed */ -gen_update_fp_context (s); +/* +* Check that VFP access is enabled, M-profile specific version. +* +* If VFP is enabled, do the necessary M-profile lazy-FP handling and then +* return true. If not, emit code to generate an appropriate exception and +* return false. +*/ +static bool vfp_access_check_m (DisasContext *s) +{ +if (s->fp_excp_el) { +/* +* M-profile mostly catches the "FPU disabled" case early, in +* disas_m_nocp(), but a few insns (eg LCTP, WLSTP, DLSTP) +* which do coprocessor-checks are outside the large ranges of +* the encoding space handled by the patterns in m-nocp.decode, +* and for them we may need to raise NOCP here. +*/ +gen_exception_insn (s, s->pc_curr,EXCP_NOCP , +syn_uncategorized (), s->fp_excp_el); +return false; } +/* Handle M-profile lazy FP state mechanics */ + +/* Trigger lazy-state preservation if necessary */ +gen_preserve_fp_state (s); + +/* Update ownership of FP context and create new FP context if needed */ +gen_update_fp_context (s); +return true; }
@@ -242,7 +251,11 @@ static bool full_vfp_access_check(DisasContext *s, bool ignore_vfp_enabled)*/ bool vfp_access_check (DisasContext *s) { -return full_vfp_access_check (s, false); +if (arm_dc_feature (s,ARM_FEATURE_M )) { +return vfp_access_check_m (s); + }else { +return vfp_access_check_a (s, false); + } }static bool trans_VSEL (DisasContext *s,arg_VSEL *a)
@@ -732,7 +745,11 @@ static bool trans_VMSR_VMRS(DisasContext *s, arg_VMSR_VMRS *a)return false; } -if (!full_vfp_access_check (s, ignore_vfp_enabled)) { +/* +* Call vfp_access_check_a() directly, because we need to tell +* it to ignore FPEXC.EN for some register accesses. +*/ +if (!vfp_access_check_a (s, ignore_vfp_enabled)) {return true; }
Signature · 1 line
2.20.1
Re: [PATCH 6/7] target/arm: Split vfp_access_check() into A and M versions
Quoted 11 lines · Peter Maydell
vfp_access_checkand its helper routinefull_vfp_access_check()has gradually grown and is now an awkward mix of A-profile only and M-profile only pieces. Refactor it into an A-profile only and an M-profile only version, taking advantage of the fact that now the only direct call tofull_vfp_access_check()is in A-profile-only code.Signed-off-by Peter Maydell<[email protected]>--- target/arm/translate-vfp.c | 79 +++++++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 31 deletions(-)
r~
PATCH 7/7 target/arm: Handle FPU check for FPCXT_NS insns via vfp_access_check_m()
In reply to Peter MaydellInstead of open-coding the "take NOCP exception if FPU disabled, otherwise call gen_preserve_fp_state()" code in the accessors for FPCXT_NS, add an argument to vfp_access_check_m() which tells it to skip the gen_update_fp_context() call, so we can use it for the FPCXT_NS case.
--- target/arm/translate-a32.h | 2 +- target/arm/translate-m-nocp.c | 10 ++-------- target/arm/translate-vfp.c | 13 ++++++++----- 3 files changed, 11 insertions(+), 14 deletions(-)
target/arm/translate-a32.h +1 -1
@@ -32,7 +32,7 @@ bool disas_neon_shared(DisasContext *s, uint32_t insn);void load_reg_var (DisasContext *s,TCGv_i32 var,int reg);void arm_gen_condlabel (DisasContext *s);bool vfp_access_check (DisasContext *s); -void gen_preserve_fp_state (DisasContext *s); +bool vfp_access_check_m (DisasContext *s,bool skip_context_update);void read_neon_element32 (TCGv_i32 dest,int reg,int ele,MemOp memop);void read_neon_element64 (TCGv_i64 dest,int reg,int ele,MemOp memop);void write_neon_element32 (TCGv_i32 src,int reg,int ele,MemOp memop);
target/arm/translate-m-nocp.c +2 -8
@@ -371,9 +371,7 @@ static bool gen_M_fp_sysreg_write(DisasContext *s, int regno,* otherwise PreserveFPState(), and then FPCXT_NS writes * behave the same as FPCXT_S writes. */ -if (s->fp_excp_el) { -gen_exception_insn (s, s->pc_curr,EXCP_NOCP , -syn_uncategorized (), s->fp_excp_el); +if (!vfp_access_check_m (s, true)) {/* * This was only a conditional exception, so override * gen_exception_insn()'s default to DISAS_NORETURN
@@ -381,7 +379,6 @@ static bool gen_M_fp_sysreg_write(DisasContext *s, int regno, s->base.is_jmp =DISAS_NEXT ;break ; } -gen_preserve_fp_state (s); }/* fall through */ case ARM_VFP_FPCXT_S :
@@ -527,9 +524,7 @@ static bool gen_M_fp_sysreg_read(DisasContext *s, int regno,* otherwise PreserveFPState(), and then FPCXT_NS * reads the same as FPCXT_S. */ -if (s->fp_excp_el) { -gen_exception_insn (s, s->pc_curr,EXCP_NOCP , -syn_uncategorized (), s->fp_excp_el); +if (!vfp_access_check_m (s, true)) {/* * This was only a conditional exception, so override * gen_exception_insn()'s default to DISAS_NORETURN
@@ -537,7 +532,6 @@ static bool gen_M_fp_sysreg_read(DisasContext *s, int regno, s->base.is_jmp =DISAS_NEXT ;break ; } -gen_preserve_fp_state (s); tmp =tcg_temp_new_i32 (); sfpa =tcg_temp_new_i32 (); fpscr =tcg_temp_new_i32 ();
target/arm/translate-vfp.c +8 -5
@@ -109,7 +109,7 @@ static inline long vfp_f16_offset(unsigned reg, bool top)* Generate code for M-profile lazy FP state preservation if needed; * this corresponds to the pseudocode PreserveFPState() function. */ -void gen_preserve_fp_state (DisasContext *s) +static void gen_preserve_fp_state (DisasContext *s) {if (s->v7m_lspact) {/*
@@ -218,8 +218,9 @@ static bool vfp_access_check_a(DisasContext *s, bool ignore_vfp_enabled)* If VFP is enabled, do the necessary M-profile lazy-FP handling and then * return true. If not, emit code to generate an appropriate exception and * return false. +* skip_context_update is true to skip the "update FP context" part of this. */ -static bool vfp_access_check_m (DisasContext *s) +bool vfp_access_check_m (DisasContext *s,bool skip_context_update) {if (s->fp_excp_el) {/*
@@ -239,8 +240,10 @@ static bool vfp_access_check_m(DisasContext *s)/* Trigger lazy-state preservation if necessary */ gen_preserve_fp_state (s); -/* Update ownership of FP context and create new FP context if needed */ -gen_update_fp_context (s); +if (!skip_context_update) { +/* Update ownership of FP context and create new FP context if needed */ +gen_update_fp_context (s); + }return true; }
@@ -252,7 +255,7 @@ static bool vfp_access_check_m(DisasContext *s)bool vfp_access_check (DisasContext *s) {if (arm_dc_feature (s,ARM_FEATURE_M )) { -return vfp_access_check_m (s); +return vfp_access_check_m (s, false); }else {return vfp_access_check_a (s, false); }
Signature · 1 line
2.20.1
Re: [PATCH 7/7] target/arm: Handle FPU check for FPCXT_NS insns via vfp_access_check_m()
Quoted 6 lines · Peter Maydell
Instead of open-coding the "take NOCP exception if FPU disabled, otherwise call
gen_preserve_fp_state()" code in the accessors forFPCXT_NS, add an argument tovfp_access_check_m()which tells it to skip thegen_update_fp_context()call, so we can use it for theFPCXT_NScase.
Quoted 6 lines
Signed-off-by Peter Maydell<[email protected]>--- target/arm/translate-a32.h | 2 +- target/arm/translate-m-nocp.c | 10 ++-------- target/arm/translate-vfp.c | 13 ++++++++----- 3 files changed, 11 insertions(+), 14 deletions(-)
r~