target/arm: Remove duplicate 'plus1' function from Neon and SVE decode
PATCH 1/1 target/arm: Remove duplicate 'plus1' function from Neon and SVE decode
The Neon and SVE decoders use private 'plus1' functions to implement "add one" for the !function decoder syntax. We have a generic "plus_1" function in translate.h, so use that instead.
Signed-off-by Peter Maydell <[email protected]>
--- target/arm/neon-ls.decode | 4 ++-- target/arm/neon-shared.decode | 2 +- target/arm/sve.decode | 2 +- target/arm/translate-neon.c | 5 ----- target/arm/translate-sve.c | 5 ----- 5 files changed, 4 insertions(+), 14 deletions(-)
target/arm/neon-ls.decode +2 -2
@@ -41,8 +41,8 @@ VLD_all_lanes 1111 0100 1 . 1 0 rn:4 .... 11 n:2 size:2 t:1 a:1 rm:4 \ vd=%vd_dp # Neon load/store single structure to one lane -%imm1_5_p1 5:1 !function=plus1 -%imm1_6_p1 6:1 !function=plus1 +%imm1_5_p1 5:1 !function=plus_1 +%imm1_6_p1 6:1 !function=plus_1 VLDST_single 1111 0100 1 . l:1 0 rn:4 .... 00 n:2 reg_idx:3 align:1 rm:4 \ vd=%vd_dp size=0 stride=1
target/arm/neon-shared.decode +1 -1
@@ -38,7 +38,7 @@ # which is 0 for fp16 and 1 for fp32 into a MO_* constant. # (Note that this is the reverse of the sense of the 1-bit size # field in the 3same_fp Neon insns.) -%vcadd_size 20:1 !function=plus1 +%vcadd_size 20:1 !function=plus_1 VCMLA 1111 110 rot:2 . 1 . .... .... 1000 . q:1 . 0 .... \ vm=%vm_dp vn=%vn_dp vd=%vd_dp size=%vcadd_size
target/arm/sve.decode +1 -1
@@ -22,7 +22,7 @@ ########################################################################### # Named fields. These are primarily for disjoint fields. -%imm4_16_p1 16:4 !function=plus1 +%imm4_16_p1 16:4 !function=plus_1 %imm6_22_5 22:1 5:5 %imm7_22_16 22:2 16:5 %imm8_16_10 16:5 10:3
target/arm/translate-neon.c +0 -5
@@ -28,11 +28,6 @@#include "translate.h" #include "translate-a32.h" -static inline int plus1 (DisasContext *s,int x) -{ -return x +1 ; -} -static inline int neon_3same_fp_size (DisasContext *s,int x) {/* Convert 0==fp32, 1==fp16 into a MO_* value */
target/arm/translate-sve.c +0 -5
@@ -70,11 +70,6 @@ static int tszimm_shl(DisasContext *s, int x)return x - (8 <<tszimm_esz (s, x)); } -static inline int plus1 (DisasContext *s,int x) -{ -return x +1 ; -} -/* The SH bit is in bit 8. Extract the low 8 and shift. */ static inline int expand_imm_sh8s (DisasContext *s,int x) {
Signature · 1 line
2.20.1
Quoted 4 lines · Peter Maydell
The Neon and SVE decoders use private 'plus1' functions to implement "add one" for the !function decoder syntax. We have a generic "
plus_1" function intranslate.h, so use that instead.
Quoted 8 lines
Signed-off-by Peter Maydell<[email protected]>--- target/arm/neon-ls.decode | 4 ++-- target/arm/neon-shared.decode | 2 +- target/arm/sve.decode | 2 +- target/arm/translate-neon.c | 5 ----- target/arm/translate-sve.c | 5 ----- 5 files changed, 4 insertions(+), 14 deletions(-)
Reviewed-by Richard Henderson <[email protected]>
r~
Quoted 4 lines · Peter Maydell
The Neon and SVE decoders use private 'plus1' functions to implement "add one" for the !function decoder syntax. We have a generic "
plus_1" function intranslate.h, so use that instead.
Quoted 8 lines
Signed-off-by Peter Maydell <[email protected]>--- target/arm/neon-ls.decode | 4 ++-- target/arm/neon-shared.decode | 2 +- target/arm/sve.decode | 2 +- target/arm/translate-neon.c | 5 ----- target/arm/translate-sve.c | 5 ----- 5 files changed, 4 insertions(+), 14 deletions(-)
Reviewed-by Philippe Mathieu-Daudé <[email protected]>