Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Assume that if curpcb is NULL, we're already running with alignment

Browse Source 
faults enabled.
This commit is contained in:
scw 2003-10-26 11:34:29 +00:00
parent a45cfadaff
commit 4d7283b3ec
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/arch/arm/arm32/exception.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: exception.S,v 1.10 2003/10/25 21:51:31 scw Exp $ */
/* $NetBSD: exception.S,v 1.11 2003/10/26 11:34:29 scw Exp $ */
/*
* Copyright (c) 1994-1997 Mark Brinicombe.
@ -84,8 +84,9 @@
#endif
#define ENABLE_ALIGNMENT_FAULTS \
GET_CURPCB ;\
ldr r1, [r1, #PCB_FLAGS] /* Fetch curpcb->pcb_flags */ ;\
tst r1, #PCB_NOALIGNFLT ;\
cmp r1, #0x00 /* curpcb NULL? ;\
ldrne r1, [r1, #PCB_FLAGS] /* Fetch curpcb->pcb_flags */ ;\
tstne r1, #PCB_NOALIGNFLT ;\
beq 1f /* Alignment faults already enabled */ ;\
GET_CPUINFO ;\
ldr r2, .Lcpufuncs ;\
@ -141,8 +142,9 @@ Lexception_exit_loop:
#else
ldr r1, [r6]
#endif
ldr r1, [r1, #PCB_FLAGS] /* Fetch curpcb->pcb_flags */
tst r1, #PCB_NOALIGNFLT
cmp r1, #0x00 /* curpcb NULL? */
ldrne r1, [r1, #PCB_FLAGS] /* Fetch curpcb->pcb_flags */
tstne r1, #PCB_NOALIGNFLT
beq 1f /* Keep alignment faults enabled */
ldr r1, [r7, #CI_CTRL] /* Fetch control register */
ldr r2, .Lcpufuncs
@ -226,8 +228,9 @@ ASENTRY_NP(swi_entry)
#else
ldr r1, [r6]
#endif
ldr r1, [r1, #PCB_FLAGS] /* Fetch curpcb->pcb_flags */
tst r1, #PCB_NOALIGNFLT
cmp r1, #0x00 /* curpcb NULL? */
ldrne r1, [r1, #PCB_FLAGS] /* Fetch curpcb->pcb_flags */
tstne r1, #PCB_NOALIGNFLT
beq 1f /* Keep alignment faults enabled */
ldr r1, [r7, #CI_CTRL] /* Fetch control register */
ldr r2, .Lcpufuncs
@ -433,8 +436,9 @@ ASENTRY_NP(undefined_entry)
ldr r7, .Lcpu_info_store
ldr r1, [r6]
#endif
ldr r1, [r1, #PCB_FLAGS] /* Fetch curpcb->pcb_flags */
tst r1, #PCB_NOALIGNFLT
cmp r1, #0x00 /* curpcb NULL? */
ldrne r1, [r1, #PCB_FLAGS] /* Fetch curpcb->pcb_flags */
tstne r1, #PCB_NOALIGNFLT
beq 1f /* Keep alignment faults enabled */
ldr r1, [r7, #CI_CTRL] /* Fetch control register */
ldr r2, .Lcpufuncs

12
sys/arch/arm/arm32/irq_dispatch.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: irq_dispatch.S,v 1.3 2003/10/25 20:42:49 scw Exp $ */
/* $NetBSD: irq_dispatch.S,v 1.4 2003/10/26 11:34:29 scw Exp $ */
/*
* Copyright (c) 2002 Fujitsu Component Limited
@ -113,8 +113,9 @@
#endif
#define ENABLE_ALIGNMENT_FAULTS \
GET_CURPCB ;\
ldr r1, [r1, #PCB_FLAGS] /* Fetch curpcb->pcb_flags */ ;\
tst r1, #PCB_NOALIGNFLT ;\
cmp r1, #0x00 /* curpcb NULL? */ ;\
ldrne r1, [r1, #PCB_FLAGS] /* Fetch curpcb->pcb_flags */ ;\
tstne r1, #PCB_NOALIGNFLT ;\
beq 1f /* Alignment faults already enabled */ ;\
GET_CPUINFO ;\
ldr r2, .Lcpufuncs ;\
@ -202,8 +203,9 @@ ASENTRY_NP(irq_entry)
#else
ldr r1, [r6]
#endif
ldr r1, [r1, #PCB_FLAGS] /* Fetch curpcb->pcb_flags */
tst r1, #PCB_NOALIGNFLT
cmp r1, #0x00 /* curpcb NULL? */
ldrne r1, [r1, #PCB_FLAGS] /* Fetch curpcb->pcb_flags */
tstne r1, #PCB_NOALIGNFLT
beq 1f /* Keep alignment faults enabled */
ldr r1, [r7, #CI_CTRL] /* Fetch control register */
ldr r2, .Lcpufuncs