Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-28 16:11:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge changes I9eba2e34,Iab2a2a2f into integration

Browse source 
* changes:
  refactor(cpus): replace adr with adr_l
  refactor(build): introduce adr_l macro
This commit is contained in:
Manish Pandey 2024-05-03 14:55:36 +02:00 • committed by TrustedFirmware Code Review
commit 2c746960ee
4 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bl31/aarch64/runtime_exceptions.S
View file

@ -450,7 +450,7 @@ sync_handler64:
* *
* handler = (base + off) + (index << log2(size)) * handler = (base + off) + (index << log2(size))
*/ */
adr x11, (__RT_SVC_DESCS_START__ + RT_SVC_DESC_HANDLE) adr_l x11, (__RT_SVC_DESCS_START__ + RT_SVC_DESC_HANDLE)
lsl w10, w15, #RT_SVC_SIZE_LOG2 lsl w10, w15, #RT_SVC_SIZE_LOG2
ldr x15, [x11, w10, uxtw] ldr x15, [x11, w10, uxtw]

9
include/arch/aarch32/asm_macros.S
View file

@ -241,4 +241,13 @@ div2:
cmp \temp, \bot cmp \temp, \bot
bhs div2 bhs div2
.endm .endm
/*
* Helper macro to instruction adr <reg>, <symbol> where <symbol> is
* within the range +/- 4 GB.
*/
.macro adr_l, dst, sym
adrp \dst, \sym
add \dst, \dst, :lo12:\sym
.endm
#endif /* ASM_MACROS_S */ #endif /* ASM_MACROS_S */

8
include/arch/aarch64/asm_macros.S
View file

@ -317,4 +317,12 @@
#endif #endif
.endm .endm
/*
* Helper macro to instruction adr <reg>, <symbol> where <symbol> is
* within the range +/- 4 GB.
*/
.macro adr_l, dst, sym
adrp \dst, \sym
add \dst, \dst, :lo12:\sym
.endm
#endif /* ASM_MACROS_S */ #endif /* ASM_MACROS_S */

4
lib/cpus/aarch64/cpu_helpers.S
View file

@ -165,13 +165,13 @@ func get_cpu_ops_ptr
and w2, w2, w3 and w2, w2, w3
/* Get the cpu_ops end location */ /* Get the cpu_ops end location */
adr x5, (__CPU_OPS_END__ + CPU_MIDR) adr_l x5, (__CPU_OPS_END__ + CPU_MIDR)
/* Initialize the return parameter */ /* Initialize the return parameter */
mov x0, #0 mov x0, #0
1: 1:
/* Get the cpu_ops start location */ /* Get the cpu_ops start location */
adr x4, (__CPU_OPS_START__ + CPU_MIDR) adr_l x4, (__CPU_OPS_START__ + CPU_MIDR)
2: 2:
/* Check if we have reached end of list */ /* Check if we have reached end of list */