d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up the style of the LEAVE_HYP macro.

Browse Source
This commit is contained in:
Andrew Turner 2015-08-31 09:39:16 +00:00
parent 98d3afa551
commit f05a5be590
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/arm/arm/locore-v6.S
View File

@ -67,23 +67,23 @@ __FBSDID("$FreeBSD$");
.align 2
#if __ARM_ARCH >= 7
#define LEAVE_HYP \
/* Leave HYP mode */ ;\
mrs r0, cpsr ;\
and r0, r0, #(PSR_MODE) /* Mode is in the low 5 bits of CPSR */ ;\
teq r0, #(PSR_HYP32_MODE) /* Hyp Mode? */ ;\
bne 1f ;\
/* Ensure that IRQ, FIQ and Aborts will be disabled after eret */;\
mrs r0, spsr ;\
orr r0, r0, #(PSR_I | PSR_F | PSR_A) ;\
msr spsr, r0 ;\
/* Exit hypervisor mode */ ;\
adr lr, 1f ;\
MSR_ELR_HYP(14) ;\
ERET ;\
#define LEAVE_HYP \
/* Leave HYP mode */ ;\
mrs r0, cpsr ;\
and r0, r0, #(PSR_MODE) /* Mode is in the low 5 bits of CPSR */ ;\
teq r0, #(PSR_HYP32_MODE) /* Hyp Mode? */ ;\
bne 1f ;\
/* Ensure that IRQ, FIQ and Aborts will be disabled after eret */ ;\
mrs r0, spsr ;\
orr r0, r0, #(PSR_I | PSR_F | PSR_A) ;\
msr spsr, r0 ;\
/* Exit hypervisor mode */ ;\
adr lr, 1f ;\
MSR_ELR_HYP(14) ;\
ERET ;\
1:
#else
#define LEAVE_HYP
#define LEAVE_HYP
#endif /* __ARM_ARCH >= 7 */
/*