| Message ID | 20250404223521.38781-6-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | target/arm: Remove some TARGET_AARCH64 uses (MTE & gdbstub) | expand |
On 4/4/25 15:35, Philippe Mathieu-Daudé wrote: > address_with_allocation_tag() is only used in mte_helper.c, > move it there. > > Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org> > --- > target/arm/internals.h | 5 ----- > target/arm/tcg/mte_helper.c | 5 +++++ > 2 files changed, 5 insertions(+), 5 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
diff --git a/target/arm/internals.h b/target/arm/internals.h index 01408e40a34..0728e5c5348 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1701,11 +1701,6 @@ static inline int allocation_tag_from_addr(uint64_t ptr) return extract64(ptr, 56, 4); } -static inline uint64_t address_with_allocation_tag(uint64_t ptr, int rtag) -{ - return deposit64(ptr, 56, 4, rtag); -} - /* Return true if tbi bits mean that the access is checked. */ static inline bool tbi_check(uint32_t desc, int bit55) { diff --git a/target/arm/tcg/mte_helper.c b/target/arm/tcg/mte_helper.c index 9dcdc1d91c1..8a6e6e4719d 100644 --- a/target/arm/tcg/mte_helper.c +++ b/target/arm/tcg/mte_helper.c @@ -205,6 +205,11 @@ static uint8_t *allocation_tag_mem(CPUARMState *env, int ptr_mmu_idx, ptr_size, tag_access, false, ra); } +static inline uint64_t address_with_allocation_tag(uint64_t ptr, int rtag) +{ + return deposit64(ptr, 56, 4, rtag); +} + uint64_t HELPER(irg)(CPUARMState *env, uint64_t rn, uint64_t rm) { uint16_t exclude = extract32(rm | env->cp15.gcr_el1, 0, 16);
address_with_allocation_tag() is only used in mte_helper.c, move it there. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- target/arm/internals.h | 5 ----- target/arm/tcg/mte_helper.c | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-)