From 4941bfbf11eae05c92aa3242e353d173974ce7bf Mon Sep 17 00:00:00 2001 From: Julien Grall Date: Mon, 22 Jul 2019 22:39:24 +0100 Subject: [PATCH] xen/arm64: macros: Introduce an assembly macro to alias x30 The return address of a function is always stored in x30. For convenience, introduce a register alias so "lr" can be used in assembly. This is defined in asm-arm/arm64/macros.h to allow all assembly files to use it. Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/entry.S | 5 ----- xen/include/asm-arm/arm64/macros.h | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/arm64/entry.S b/xen/arch/arm/arm64/entry.S index 97b05f53ea..2d9a2713a1 100644 --- a/xen/arch/arm/arm64/entry.S +++ b/xen/arch/arm/arm64/entry.S @@ -6,11 +6,6 @@ #include #include -/* - * Register aliases. - */ -lr .req x30 /* link register */ - /* * Stack pushing/popping (register pairs only). Equivalent to store decrement * before, load increment after. diff --git a/xen/include/asm-arm/arm64/macros.h b/xen/include/asm-arm/arm64/macros.h index 9c5e676b37..f981b4f43e 100644 --- a/xen/include/asm-arm/arm64/macros.h +++ b/xen/include/asm-arm/arm64/macros.h @@ -21,5 +21,10 @@ ldr \dst, [\dst, \tmp] .endm +/* + * Register aliases. + */ +lr .req x30 /* link register */ + #endif /* __ASM_ARM_ARM64_MACROS_H */ -- 2.30.2