diff options
| author | Andrew Thoelke <andrew.thoelke@arm.com> | 2014-04-28 12:33:52 +0100 |
|---|---|---|
| committer | Andrew Thoelke <andrew.thoelke@arm.com> | 2014-05-07 11:29:50 +0100 |
| commit | 228a9f0b443196a9172f89facdd8a40ea43767a2 (patch) | |
| tree | d615361da4101f397421f5a49c949975d8f987d0 /lib/aarch64 | |
| parent | 7935d0a59d439c993b79814ab414d37e4a90d9a6 (diff) | |
Remove unused or invalid asm helper functions
There are a small number of non-EL specific helper functions
which are no longer used, and also some unusable helper
functions for non-existant registers.
This change removes all of these functions.
Change-Id: Idd656cef3b59cf5c46fe2be4029d72288b649c24
Diffstat (limited to 'lib/aarch64')
| -rw-r--r-- | lib/aarch64/misc_helpers.S | 44 | ||||
| -rw-r--r-- | lib/aarch64/sysreg_helpers.S | 40 |
2 files changed, 0 insertions, 84 deletions
diff --git a/lib/aarch64/misc_helpers.S b/lib/aarch64/misc_helpers.S index bccc936..e7ee015 100644 --- a/lib/aarch64/misc_helpers.S +++ b/lib/aarch64/misc_helpers.S @@ -46,22 +46,18 @@ .globl read_daif .globl write_daif - .globl read_spsr .globl read_spsr_el1 .globl read_spsr_el2 .globl read_spsr_el3 - .globl write_spsr .globl write_spsr_el1 .globl write_spsr_el2 .globl write_spsr_el3 - .globl read_elr .globl read_elr_el1 .globl read_elr_el2 .globl read_elr_el3 - .globl write_elr .globl write_elr_el1 .globl write_elr_el2 .globl write_elr_el3 @@ -153,16 +149,6 @@ func write_daif ret -func read_spsr - mrs x0, CurrentEl - cmp x0, #(MODE_EL1 << MODE_EL_SHIFT) - b.eq read_spsr_el1 - cmp x0, #(MODE_EL2 << MODE_EL_SHIFT) - b.eq read_spsr_el2 - cmp x0, #(MODE_EL3 << MODE_EL_SHIFT) - b.eq read_spsr_el3 - - func read_spsr_el1 mrs x0, spsr_el1 ret @@ -178,16 +164,6 @@ func read_spsr_el3 ret -func write_spsr - mrs x1, CurrentEl - cmp x1, #(MODE_EL1 << MODE_EL_SHIFT) - b.eq write_spsr_el1 - cmp x1, #(MODE_EL2 << MODE_EL_SHIFT) - b.eq write_spsr_el2 - cmp x1, #(MODE_EL3 << MODE_EL_SHIFT) - b.eq write_spsr_el3 - - func write_spsr_el1 msr spsr_el1, x0 ret @@ -203,16 +179,6 @@ func write_spsr_el3 ret -func read_elr - mrs x0, CurrentEl - cmp x0, #(MODE_EL1 << MODE_EL_SHIFT) - b.eq read_elr_el1 - cmp x0, #(MODE_EL2 << MODE_EL_SHIFT) - b.eq read_elr_el2 - cmp x0, #(MODE_EL3 << MODE_EL_SHIFT) - b.eq read_elr_el3 - - func read_elr_el1 mrs x0, elr_el1 ret @@ -228,16 +194,6 @@ func read_elr_el3 ret -func write_elr - mrs x1, CurrentEl - cmp x1, #(MODE_EL1 << MODE_EL_SHIFT) - b.eq write_elr_el1 - cmp x1, #(MODE_EL2 << MODE_EL_SHIFT) - b.eq write_elr_el2 - cmp x1, #(MODE_EL3 << MODE_EL_SHIFT) - b.eq write_elr_el3 - - func write_elr_el1 msr elr_el1, x0 ret diff --git a/lib/aarch64/sysreg_helpers.S b/lib/aarch64/sysreg_helpers.S index 1d73ba9..376da49 100644 --- a/lib/aarch64/sysreg_helpers.S +++ b/lib/aarch64/sysreg_helpers.S @@ -125,10 +125,7 @@ .globl write_ttbr0_el3 .globl read_ttbr1_el1 - .globl read_ttbr1_el2 - .globl write_ttbr1 .globl write_ttbr1_el1 - .globl write_ttbr1_el2 .globl read_cpacr .globl write_cpacr @@ -160,8 +157,6 @@ #if SUPPORT_VFP .globl enable_vfp - .globl read_fpexc - .globl write_fpexc #endif @@ -577,11 +572,6 @@ func write_tcr_el3 * CPTR accessors * ----------------------------------------------------- */ -func read_cptr_el1 - b read_cptr_el1 - ret - - func read_cptr_el2 mrs x0, cptr_el2 ret @@ -592,10 +582,6 @@ func read_cptr_el3 ret -func write_cptr_el1 - b write_cptr_el1 - - func write_cptr_el2 msr cptr_el2, x0 ret @@ -649,27 +635,11 @@ func read_ttbr1_el1 ret -func read_ttbr1_el2 - b read_ttbr1_el2 - - -func read_ttbr1_el3 - b read_ttbr1_el3 - - func write_ttbr1_el1 msr ttbr1_el1, x0 ret -func write_ttbr1_el2 - b write_ttbr1_el2 - - -func write_ttbr1_el3 - b write_ttbr1_el3 - - func read_hcr mrs x0, hcr_el2 ret @@ -762,14 +732,4 @@ func enable_vfp isb ret - -func read_fpexc - b read_fpexc - ret - - -func write_fpexc - b write_fpexc - ret - #endif |