* [PATCH] target/arm: Remove duplicate 'plus1' function from Neon and SVE decode
@ 2021-07-15 9:53 Peter Maydell
2021-07-15 15:54 ` Richard Henderson
2021-07-15 18:23 ` Philippe Mathieu-Daudé
0 siblings, 2 replies; 3+ messages in thread
From: Peter Maydell @ 2021-07-15 9:53 UTC (permalink / raw)
To: qemu-arm, qemu-devel
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 <peter.maydell@linaro.org>
---
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(-)
diff --git a/target/arm/neon-ls.decode b/target/arm/neon-ls.decode
index 0a2a0e15db5..c5f364cbc00 100644
--- a/target/arm/neon-ls.decode
+++ b/target/arm/neon-ls.decode
@@ -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
diff --git a/target/arm/neon-shared.decode b/target/arm/neon-shared.decode
index df80e6ebf66..8e6bd0b61f0 100644
--- a/target/arm/neon-shared.decode
+++ b/target/arm/neon-shared.decode
@@ -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
diff --git a/target/arm/sve.decode b/target/arm/sve.decode
index a62c169f1a8..c60b9f0fec5 100644
--- a/target/arm/sve.decode
+++ b/target/arm/sve.decode
@@ -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
diff --git a/target/arm/translate-neon.c b/target/arm/translate-neon.c
index a45616cb631..c53ab20fa48 100644
--- a/target/arm/translate-neon.c
+++ b/target/arm/translate-neon.c
@@ -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 */
diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c
index 35d838aa068..bc91a641711 100644
--- a/target/arm/translate-sve.c
+++ b/target/arm/translate-sve.c
@@ -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)
{
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] target/arm: Remove duplicate 'plus1' function from Neon and SVE decode
2021-07-15 9:53 [PATCH] target/arm: Remove duplicate 'plus1' function from Neon and SVE decode Peter Maydell
@ 2021-07-15 15:54 ` Richard Henderson
2021-07-15 18:23 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 3+ messages in thread
From: Richard Henderson @ 2021-07-15 15:54 UTC (permalink / raw)
To: Peter Maydell, qemu-arm, qemu-devel
On 7/15/21 2:53 AM, Peter Maydell wrote:
> 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<peter.maydell@linaro.org>
> ---
> 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 <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] target/arm: Remove duplicate 'plus1' function from Neon and SVE decode
2021-07-15 9:53 [PATCH] target/arm: Remove duplicate 'plus1' function from Neon and SVE decode Peter Maydell
2021-07-15 15:54 ` Richard Henderson
@ 2021-07-15 18:23 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-07-15 18:23 UTC (permalink / raw)
To: Peter Maydell, qemu-arm, qemu-devel
On 7/15/21 11:53 AM, Peter Maydell wrote:
> 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 <peter.maydell@linaro.org>
> ---
> 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é <f4bug@amsat.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-07-15 18:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-15 9:53 [PATCH] target/arm: Remove duplicate 'plus1' function from Neon and SVE decode Peter Maydell
2021-07-15 15:54 ` Richard Henderson
2021-07-15 18:23 ` Philippe Mathieu-Daudé
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.