diff options
| author |   jsg <jsg@openbsd.org> | 2016-04-25 12:16:20 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2016-04-25 12:16:20 +0000 |
| commit | fc9a374aec7b6e11dc94c5aca12be86b84817d19 (patch) | |
| tree | e8eb1843520bd6b5f9dd6136c0230c069bc9e179 | |
| parent | Stop embedding the build time in the Perl binary. (diff) | |
| download | wireguard-openbsd-fc9a374aec7b6e11dc94c5aca12be86b84817d19.tar.xz wireguard-openbsd-fc9a374aec7b6e11dc94c5aca12be86b84817d19.zip | |
use the cps instructions introduced with armv6 instead of mrs/msr
ok patrick@
| -rw-r--r-- | sys/arch/arm/arm/cpuswitch7.S | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/sys/arch/arm/arm/cpuswitch7.S b/sys/arch/arm/arm/cpuswitch7.S index ac22e8ee53d..9529da79af2 100644 --- a/sys/arch/arm/arm/cpuswitch7.S +++ b/sys/arch/arm/arm/cpuswitch7.S @@ -1,4 +1,4 @@ -/* $OpenBSD: cpuswitch7.S,v 1.9 2016/04/25 06:49:46 jsg Exp $ */ +/* $OpenBSD: cpuswitch7.S,v 1.10 2016/04/25 12:16:20 jsg Exp $ */ /* $NetBSD: cpuswitch.S,v 1.41 2003/11/15 08:44:18 scw Exp $ */ /* @@ -95,14 +95,10 @@ * XXX: This is not necessary if the vector table is relocated. */ #define IRQdisableALL \ - mrs r14, cpsr ; \ - orr r14, r14, #(PSR_I | PSR_F) ; \ - msr cpsr_c, r14 + cpsid if #define IRQenableALL \ - mrs r14, cpsr ; \ - bic r14, r14, #(PSR_I | PSR_F) ; \ - msr cpsr_c, r14 + cpsie if .text @@ -211,14 +207,8 @@ ENTRY(cpu_switchto) /* Get the user structure for the new process in r9 */ ldr r9, [r6, #(P_ADDR)] - /* - * This can be optimised... We know we want to go from SVC32 - * mode to UND32 mode - */ mrs r3, cpsr - bic r2, r3, #(PSR_MODE) - orr r2, r2, #(PSR_UND32_MODE | PSR_I) - msr cpsr_c, r2 + cpsid i, #(PSR_UND32_MODE) #ifdef notworthit teq r0, #0x00000000 @@ -340,14 +330,8 @@ ENTRY(cpu_switchto) /* rem: r6 = new proc */ /* rem: r9 = new PCB */ - /* - * This can be optimised... We know we want to go from SVC32 - * mode to UND32 mode - */ mrs r3, cpsr - bic r2, r3, #(PSR_MODE) - orr r2, r2, #(PSR_UND32_MODE) - msr cpsr_c, r2 + cps #(PSR_UND32_MODE) ldr sp, [r9, #(PCB_UND_SP)] @@ -407,9 +391,7 @@ ENTRY(proc_trampoline) mov pc, r4 /* Kill irq's */ - mrs r0, cpsr - orr r0, r0, #(PSR_I) - msr cpsr_c, r0 + cpsid i PULLFRAME |