diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2006-03-19 22:00:30 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2006-03-19 22:00:30 +0000 |
| commit | 1a848a5e36fd023919b60fcf1f283c69cecf3254 (patch) | |
| tree | e7332f114e35ef372bb9fac3f0ffe8dcce5317ea /sys/arch/alpha | |
| parent | b3a5f9a84c8bf8778405d381b384153ba27f4970 (diff) | |
Do not compile misaligned access recovery code if option SMALL_KERNEL;
ok deraadt@
Diffstat (limited to 'sys/arch/alpha')
| -rw-r--r-- | sys/arch/alpha/alpha/trap.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/sys/arch/alpha/alpha/trap.c b/sys/arch/alpha/alpha/trap.c index bec1273e8b5..1b867f144a0 100644 --- a/sys/arch/alpha/alpha/trap.c +++ b/sys/arch/alpha/alpha/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.49 2005/12/25 00:22:45 miod Exp $ */ +/* $OpenBSD: trap.c,v 1.50 2006/03/19 22:00:29 miod Exp $ */ /* $NetBSD: trap.c,v 1.52 2000/05/24 16:48:33 thorpej Exp $ */ /*- @@ -128,6 +128,8 @@ void userret(struct proc *, u_int64_t, u_quad_t); +#ifndef SMALL_KERNEL + unsigned long Sfloat_to_reg(unsigned int); unsigned int reg_to_Sfloat(unsigned long); unsigned long Tfloat_reg_cvt(unsigned long); @@ -139,6 +141,8 @@ unsigned long Gfloat_reg_cvt(unsigned long); int unaligned_fixup(unsigned long, unsigned long, unsigned long, struct proc *); +#endif /* SMALL_KERNEL */ + int handle_opdec(struct proc *p, u_int64_t *ucodep); #ifndef NO_IEEE @@ -325,8 +329,10 @@ trap(a0, a1, a2, entry, framep) * and per-process unaligned-access-handling flags). */ if (user) { +#ifndef SMALL_KERNEL if ((i = unaligned_fixup(a0, a1, a2, p)) == 0) goto out; +#endif ucode = a0; /* VA */ break; @@ -801,6 +807,7 @@ ast(framep) * Unaligned access handler. It's not clear that this can get much slower... * */ + const static int reg_to_framereg[32] = { FRAME_V0, FRAME_T0, FRAME_T1, FRAME_T2, FRAME_T3, FRAME_T4, FRAME_T5, FRAME_T6, @@ -816,6 +823,8 @@ const static int reg_to_framereg[32] = { ((reg_to_framereg[(reg)] == -1) ? NULL : \ &(p)->p_md.md_tf->tf_regs[reg_to_framereg[(reg)]]) +#ifndef SMALL_KERNEL + #define frp(p, reg) \ (&(p)->p_addr->u_pcb.pcb_fp.fpr_regs[(reg)]) @@ -1162,6 +1171,8 @@ out: return (signal); } +#endif /* SMALL_KERNEL */ + /* * Reserved/unimplemented instruction (opDec fault) handler * @@ -1218,11 +1229,15 @@ handle_opdec(p, ucodep) if (inst.mem_format.opcode == op_ldwu || inst.mem_format.opcode == op_stw) { if (memaddr & 0x01) { +#ifndef SMALL_KERNEL sig = unaligned_fixup(memaddr, inst.mem_format.opcode, inst.mem_format.ra, p); if (sig) goto unaligned_fixup_sig; +#else + goto sigill; +#endif break; } } @@ -1319,7 +1334,9 @@ sigill: sigsegv: sig = SIGSEGV; p->p_md.md_tf->tf_regs[FRAME_PC] = inst_pc; /* re-run instr. */ +#ifndef SMALL_KERNEL unaligned_fixup_sig: +#endif *ucodep = memaddr; /* faulting address */ return (sig); } |