| Message ID | 20191216221158.29572-28-richard.henderson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | cputlb: Remove support for MMU_MODE*_SUFFIX | expand |
Richard Henderson <richard.henderson@linaro.org> writes: > All users have now been converted to cpu_*_mmuidx_ra. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > --- > include/exec/cpu_ldst.h | 230 ---------------------------------------- > 1 file changed, 230 deletions(-) > > diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h > index 0f3c49a005..cf4652bf48 100644 > --- a/include/exec/cpu_ldst.h > +++ b/include/exec/cpu_ldst.h > @@ -271,236 +271,6 @@ void cpu_stl_mmuidx_ra(CPUArchState *env, abi_ptr addr, uint32_t val, > void cpu_stq_mmuidx_ra(CPUArchState *env, abi_ptr addr, uint64_t val, > int mmu_idx, uintptr_t retaddr); > > -#ifdef MMU_MODE0_SUFFIX > -#define CPU_MMU_INDEX 0 > -#define MEMSUFFIX MMU_MODE0_SUFFIX > -#define DATA_SIZE 1 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 2 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 4 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 8 > -#include "exec/cpu_ldst_template.h" > -#undef CPU_MMU_INDEX > -#undef MEMSUFFIX > -#endif > - > -#if (NB_MMU_MODES >= 2) && defined(MMU_MODE1_SUFFIX) > -#define CPU_MMU_INDEX 1 > -#define MEMSUFFIX MMU_MODE1_SUFFIX > -#define DATA_SIZE 1 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 2 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 4 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 8 > -#include "exec/cpu_ldst_template.h" > -#undef CPU_MMU_INDEX > -#undef MEMSUFFIX > -#endif > - > -#if (NB_MMU_MODES >= 3) && defined(MMU_MODE2_SUFFIX) > - > -#define CPU_MMU_INDEX 2 > -#define MEMSUFFIX MMU_MODE2_SUFFIX > -#define DATA_SIZE 1 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 2 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 4 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 8 > -#include "exec/cpu_ldst_template.h" > -#undef CPU_MMU_INDEX > -#undef MEMSUFFIX > -#endif /* (NB_MMU_MODES >= 3) */ > - > -#if (NB_MMU_MODES >= 4) && defined(MMU_MODE3_SUFFIX) > - > -#define CPU_MMU_INDEX 3 > -#define MEMSUFFIX MMU_MODE3_SUFFIX > -#define DATA_SIZE 1 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 2 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 4 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 8 > -#include "exec/cpu_ldst_template.h" > -#undef CPU_MMU_INDEX > -#undef MEMSUFFIX > -#endif /* (NB_MMU_MODES >= 4) */ > - > -#if (NB_MMU_MODES >= 5) && defined(MMU_MODE4_SUFFIX) > - > -#define CPU_MMU_INDEX 4 > -#define MEMSUFFIX MMU_MODE4_SUFFIX > -#define DATA_SIZE 1 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 2 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 4 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 8 > -#include "exec/cpu_ldst_template.h" > -#undef CPU_MMU_INDEX > -#undef MEMSUFFIX > -#endif /* (NB_MMU_MODES >= 5) */ > - > -#if (NB_MMU_MODES >= 6) && defined(MMU_MODE5_SUFFIX) > - > -#define CPU_MMU_INDEX 5 > -#define MEMSUFFIX MMU_MODE5_SUFFIX > -#define DATA_SIZE 1 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 2 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 4 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 8 > -#include "exec/cpu_ldst_template.h" > -#undef CPU_MMU_INDEX > -#undef MEMSUFFIX > -#endif /* (NB_MMU_MODES >= 6) */ > - > -#if (NB_MMU_MODES >= 7) && defined(MMU_MODE6_SUFFIX) > - > -#define CPU_MMU_INDEX 6 > -#define MEMSUFFIX MMU_MODE6_SUFFIX > -#define DATA_SIZE 1 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 2 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 4 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 8 > -#include "exec/cpu_ldst_template.h" > -#undef CPU_MMU_INDEX > -#undef MEMSUFFIX > -#endif /* (NB_MMU_MODES >= 7) */ > - > -#if (NB_MMU_MODES >= 8) && defined(MMU_MODE7_SUFFIX) > - > -#define CPU_MMU_INDEX 7 > -#define MEMSUFFIX MMU_MODE7_SUFFIX > -#define DATA_SIZE 1 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 2 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 4 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 8 > -#include "exec/cpu_ldst_template.h" > -#undef CPU_MMU_INDEX > -#undef MEMSUFFIX > -#endif /* (NB_MMU_MODES >= 8) */ > - > -#if (NB_MMU_MODES >= 9) && defined(MMU_MODE8_SUFFIX) > - > -#define CPU_MMU_INDEX 8 > -#define MEMSUFFIX MMU_MODE8_SUFFIX > -#define DATA_SIZE 1 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 2 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 4 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 8 > -#include "exec/cpu_ldst_template.h" > -#undef CPU_MMU_INDEX > -#undef MEMSUFFIX > -#endif /* (NB_MMU_MODES >= 9) */ > - > -#if (NB_MMU_MODES >= 10) && defined(MMU_MODE9_SUFFIX) > - > -#define CPU_MMU_INDEX 9 > -#define MEMSUFFIX MMU_MODE9_SUFFIX > -#define DATA_SIZE 1 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 2 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 4 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 8 > -#include "exec/cpu_ldst_template.h" > -#undef CPU_MMU_INDEX > -#undef MEMSUFFIX > -#endif /* (NB_MMU_MODES >= 10) */ > - > -#if (NB_MMU_MODES >= 11) && defined(MMU_MODE10_SUFFIX) > - > -#define CPU_MMU_INDEX 10 > -#define MEMSUFFIX MMU_MODE10_SUFFIX > -#define DATA_SIZE 1 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 2 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 4 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 8 > -#include "exec/cpu_ldst_template.h" > -#undef CPU_MMU_INDEX > -#undef MEMSUFFIX > -#endif /* (NB_MMU_MODES >= 11) */ > - > -#if (NB_MMU_MODES >= 12) && defined(MMU_MODE11_SUFFIX) > - > -#define CPU_MMU_INDEX 11 > -#define MEMSUFFIX MMU_MODE11_SUFFIX > -#define DATA_SIZE 1 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 2 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 4 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 8 > -#include "exec/cpu_ldst_template.h" > -#undef CPU_MMU_INDEX > -#undef MEMSUFFIX > -#endif /* (NB_MMU_MODES >= 12) */ > - > -#if (NB_MMU_MODES > 12) > -#error "NB_MMU_MODES > 12 is not supported for now" > -#endif /* (NB_MMU_MODES > 12) */ > - > /* these access are slower, they must be as rare as possible */ > #define CPU_MMU_INDEX (cpu_mmu_index(env, false)) > #define MEMSUFFIX _data -- Alex Bennée
diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h index 0f3c49a005..cf4652bf48 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -271,236 +271,6 @@ void cpu_stl_mmuidx_ra(CPUArchState *env, abi_ptr addr, uint32_t val, void cpu_stq_mmuidx_ra(CPUArchState *env, abi_ptr addr, uint64_t val, int mmu_idx, uintptr_t retaddr); -#ifdef MMU_MODE0_SUFFIX -#define CPU_MMU_INDEX 0 -#define MEMSUFFIX MMU_MODE0_SUFFIX -#define DATA_SIZE 1 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 2 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 4 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 8 -#include "exec/cpu_ldst_template.h" -#undef CPU_MMU_INDEX -#undef MEMSUFFIX -#endif - -#if (NB_MMU_MODES >= 2) && defined(MMU_MODE1_SUFFIX) -#define CPU_MMU_INDEX 1 -#define MEMSUFFIX MMU_MODE1_SUFFIX -#define DATA_SIZE 1 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 2 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 4 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 8 -#include "exec/cpu_ldst_template.h" -#undef CPU_MMU_INDEX -#undef MEMSUFFIX -#endif - -#if (NB_MMU_MODES >= 3) && defined(MMU_MODE2_SUFFIX) - -#define CPU_MMU_INDEX 2 -#define MEMSUFFIX MMU_MODE2_SUFFIX -#define DATA_SIZE 1 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 2 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 4 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 8 -#include "exec/cpu_ldst_template.h" -#undef CPU_MMU_INDEX -#undef MEMSUFFIX -#endif /* (NB_MMU_MODES >= 3) */ - -#if (NB_MMU_MODES >= 4) && defined(MMU_MODE3_SUFFIX) - -#define CPU_MMU_INDEX 3 -#define MEMSUFFIX MMU_MODE3_SUFFIX -#define DATA_SIZE 1 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 2 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 4 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 8 -#include "exec/cpu_ldst_template.h" -#undef CPU_MMU_INDEX -#undef MEMSUFFIX -#endif /* (NB_MMU_MODES >= 4) */ - -#if (NB_MMU_MODES >= 5) && defined(MMU_MODE4_SUFFIX) - -#define CPU_MMU_INDEX 4 -#define MEMSUFFIX MMU_MODE4_SUFFIX -#define DATA_SIZE 1 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 2 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 4 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 8 -#include "exec/cpu_ldst_template.h" -#undef CPU_MMU_INDEX -#undef MEMSUFFIX -#endif /* (NB_MMU_MODES >= 5) */ - -#if (NB_MMU_MODES >= 6) && defined(MMU_MODE5_SUFFIX) - -#define CPU_MMU_INDEX 5 -#define MEMSUFFIX MMU_MODE5_SUFFIX -#define DATA_SIZE 1 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 2 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 4 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 8 -#include "exec/cpu_ldst_template.h" -#undef CPU_MMU_INDEX -#undef MEMSUFFIX -#endif /* (NB_MMU_MODES >= 6) */ - -#if (NB_MMU_MODES >= 7) && defined(MMU_MODE6_SUFFIX) - -#define CPU_MMU_INDEX 6 -#define MEMSUFFIX MMU_MODE6_SUFFIX -#define DATA_SIZE 1 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 2 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 4 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 8 -#include "exec/cpu_ldst_template.h" -#undef CPU_MMU_INDEX -#undef MEMSUFFIX -#endif /* (NB_MMU_MODES >= 7) */ - -#if (NB_MMU_MODES >= 8) && defined(MMU_MODE7_SUFFIX) - -#define CPU_MMU_INDEX 7 -#define MEMSUFFIX MMU_MODE7_SUFFIX -#define DATA_SIZE 1 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 2 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 4 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 8 -#include "exec/cpu_ldst_template.h" -#undef CPU_MMU_INDEX -#undef MEMSUFFIX -#endif /* (NB_MMU_MODES >= 8) */ - -#if (NB_MMU_MODES >= 9) && defined(MMU_MODE8_SUFFIX) - -#define CPU_MMU_INDEX 8 -#define MEMSUFFIX MMU_MODE8_SUFFIX -#define DATA_SIZE 1 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 2 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 4 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 8 -#include "exec/cpu_ldst_template.h" -#undef CPU_MMU_INDEX -#undef MEMSUFFIX -#endif /* (NB_MMU_MODES >= 9) */ - -#if (NB_MMU_MODES >= 10) && defined(MMU_MODE9_SUFFIX) - -#define CPU_MMU_INDEX 9 -#define MEMSUFFIX MMU_MODE9_SUFFIX -#define DATA_SIZE 1 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 2 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 4 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 8 -#include "exec/cpu_ldst_template.h" -#undef CPU_MMU_INDEX -#undef MEMSUFFIX -#endif /* (NB_MMU_MODES >= 10) */ - -#if (NB_MMU_MODES >= 11) && defined(MMU_MODE10_SUFFIX) - -#define CPU_MMU_INDEX 10 -#define MEMSUFFIX MMU_MODE10_SUFFIX -#define DATA_SIZE 1 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 2 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 4 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 8 -#include "exec/cpu_ldst_template.h" -#undef CPU_MMU_INDEX -#undef MEMSUFFIX -#endif /* (NB_MMU_MODES >= 11) */ - -#if (NB_MMU_MODES >= 12) && defined(MMU_MODE11_SUFFIX) - -#define CPU_MMU_INDEX 11 -#define MEMSUFFIX MMU_MODE11_SUFFIX -#define DATA_SIZE 1 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 2 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 4 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 8 -#include "exec/cpu_ldst_template.h" -#undef CPU_MMU_INDEX -#undef MEMSUFFIX -#endif /* (NB_MMU_MODES >= 12) */ - -#if (NB_MMU_MODES > 12) -#error "NB_MMU_MODES > 12 is not supported for now" -#endif /* (NB_MMU_MODES > 12) */ - /* these access are slower, they must be as rare as possible */ #define CPU_MMU_INDEX (cpu_mmu_index(env, false)) #define MEMSUFFIX _data
All users have now been converted to cpu_*_mmuidx_ra. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- include/exec/cpu_ldst.h | 230 ---------------------------------------- 1 file changed, 230 deletions(-) -- 2.20.1