| Message ID | 20230502160846.1289975-17-richard.henderson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | tcg: Remove TARGET_ALIGNED_ONLY | expand |
On 2/5/23 18:08, Richard Henderson wrote: > All uses have now been expunged. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > include/exec/memop.h | 13 ++----------- > include/exec/poison.h | 1 - > tcg/tcg.c | 5 ----- > 3 files changed, 2 insertions(+), 17 deletions(-) > diff --git a/tcg/tcg.c b/tcg/tcg.c > index cfd3262a4a..2ce9dba25c 100644 > --- a/tcg/tcg.c > +++ b/tcg/tcg.c > @@ -2071,13 +2071,8 @@ static const char * const ldst_name[] = > }; > > static const char * const alignment_name[(MO_AMASK >> MO_ASHIFT) + 1] = { > -#ifdef TARGET_ALIGNED_ONLY > - [MO_UNALN >> MO_ASHIFT] = "un+", Maybe we want to keep the "un+" prefix. Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > - [MO_ALIGN >> MO_ASHIFT] = "", > -#else > [MO_UNALN >> MO_ASHIFT] = "", > [MO_ALIGN >> MO_ASHIFT] = "al+", > -#endif > [MO_ALIGN_2 >> MO_ASHIFT] = "al2+", > [MO_ALIGN_4 >> MO_ASHIFT] = "al4+", > [MO_ALIGN_8 >> MO_ASHIFT] = "al8+",
On 5/10/23 15:43, Philippe Mathieu-Daudé wrote: > On 2/5/23 18:08, Richard Henderson wrote: >> All uses have now been expunged. >> >> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> >> --- >> include/exec/memop.h | 13 ++----------- >> include/exec/poison.h | 1 - >> tcg/tcg.c | 5 ----- >> 3 files changed, 2 insertions(+), 17 deletions(-) > > >> diff --git a/tcg/tcg.c b/tcg/tcg.c >> index cfd3262a4a..2ce9dba25c 100644 >> --- a/tcg/tcg.c >> +++ b/tcg/tcg.c >> @@ -2071,13 +2071,8 @@ static const char * const ldst_name[] = >> }; >> static const char * const alignment_name[(MO_AMASK >> MO_ASHIFT) + 1] = { >> -#ifdef TARGET_ALIGNED_ONLY >> - [MO_UNALN >> MO_ASHIFT] = "un+", > > Maybe we want to keep the "un+" prefix. > > Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > >> - [MO_ALIGN >> MO_ASHIFT] = "", >> -#else >> [MO_UNALN >> MO_ASHIFT] = "", >> [MO_ALIGN >> MO_ASHIFT] = "al+", Done. r~
diff --git a/include/exec/memop.h b/include/exec/memop.h index 25d027434a..07f5f88188 100644 --- a/include/exec/memop.h +++ b/include/exec/memop.h @@ -47,8 +47,6 @@ typedef enum MemOp { * MO_UNALN accesses are never checked for alignment. * MO_ALIGN accesses will result in a call to the CPU's * do_unaligned_access hook if the guest address is not aligned. - * The default depends on whether the target CPU defines - * TARGET_ALIGNED_ONLY. * * Some architectures (e.g. ARMv8) need the address which is aligned * to a size more than the size of the memory access. @@ -65,21 +63,14 @@ typedef enum MemOp { */ MO_ASHIFT = 5, MO_AMASK = 0x7 << MO_ASHIFT, -#ifdef NEED_CPU_H -#ifdef TARGET_ALIGNED_ONLY - MO_ALIGN = 0, - MO_UNALN = MO_AMASK, -#else - MO_ALIGN = MO_AMASK, - MO_UNALN = 0, -#endif -#endif + MO_UNALN = 0, MO_ALIGN_2 = 1 << MO_ASHIFT, MO_ALIGN_4 = 2 << MO_ASHIFT, MO_ALIGN_8 = 3 << MO_ASHIFT, MO_ALIGN_16 = 4 << MO_ASHIFT, MO_ALIGN_32 = 5 << MO_ASHIFT, MO_ALIGN_64 = 6 << MO_ASHIFT, + MO_ALIGN = MO_AMASK, /* Combinations of the above, for ease of use. */ MO_UB = MO_8, diff --git a/include/exec/poison.h b/include/exec/poison.h index 140daa4a85..256736e11a 100644 --- a/include/exec/poison.h +++ b/include/exec/poison.h @@ -35,7 +35,6 @@ #pragma GCC poison TARGET_TRICORE #pragma GCC poison TARGET_XTENSA -#pragma GCC poison TARGET_ALIGNED_ONLY #pragma GCC poison TARGET_HAS_BFLT #pragma GCC poison TARGET_NAME #pragma GCC poison TARGET_SUPPORTS_MTTCG diff --git a/tcg/tcg.c b/tcg/tcg.c index cfd3262a4a..2ce9dba25c 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -2071,13 +2071,8 @@ static const char * const ldst_name[] = }; static const char * const alignment_name[(MO_AMASK >> MO_ASHIFT) + 1] = { -#ifdef TARGET_ALIGNED_ONLY - [MO_UNALN >> MO_ASHIFT] = "un+", - [MO_ALIGN >> MO_ASHIFT] = "", -#else [MO_UNALN >> MO_ASHIFT] = "", [MO_ALIGN >> MO_ASHIFT] = "al+", -#endif [MO_ALIGN_2 >> MO_ASHIFT] = "al2+", [MO_ALIGN_4 >> MO_ASHIFT] = "al4+", [MO_ALIGN_8 >> MO_ASHIFT] = "al8+",
All uses have now been expunged. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- include/exec/memop.h | 13 ++----------- include/exec/poison.h | 1 - tcg/tcg.c | 5 ----- 3 files changed, 2 insertions(+), 17 deletions(-)