diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2011-04-16 21:55:50 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2011-04-16 21:55:50 +0000 |
| commit | 4d014fad845afdd32bfa5c6627ad3e82ee39b6fe (patch) | |
| tree | 650435ef0c56b1f410d7288a069f9518ec3043f0 | |
| parent | e9c7672b086d9666b700aa198316a7edac9b0d49 (diff) | |
Initialize %cr30 for proc0 with the address of proc0fpstate. Shouldn't really
matter, since we shouldn't be using the FPU inside the kernel, but we need to
initialize %cr30 with something, and this is more consistent than using the
address of the pcb.
| -rw-r--r-- | sys/arch/hppa/hppa/locore.S | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/arch/hppa/hppa/locore.S b/sys/arch/hppa/hppa/locore.S index 7011bc9e498..12ccee81dfc 100644 --- a/sys/arch/hppa/hppa/locore.S +++ b/sys/arch/hppa/hppa/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.184 2010/12/30 15:10:54 kettenis Exp $ */ +/* $OpenBSD: locore.S,v 1.185 2011/04/16 21:55:49 kettenis Exp $ */ /* * Copyright (c) 1998-2004 Michael Shalayeff @@ -95,6 +95,7 @@ .import cpu_info, data .import proc0, data .import proc0paddr, data + .import proc0fpstate, data .import panic, code #define EMRG_STACKSIZE (1*NBPG) @@ -175,7 +176,6 @@ $start_zero_tf * arg0 will be available space for hppa_init() */ ldo NBPG+TRAPFRAME_SIZEOF(arg3), sp - mtctl arg3, cr30 stw r0, U_PCB+PCB_ONFAULT(arg3) stw r0, U_PCB+PCB_SPACE(arg3) /* XXX HPPA_SID_KERNEL == 0 */ ldil L%(USPACE+NBPG), arg0 /* normal U plus red zone */ @@ -189,7 +189,10 @@ $start_zero_tf ldil L%TFF_LAST, t1 stw t1, TF_FLAGS-TRAPFRAME_SIZEOF(sp) - stw arg3, TF_CR30-TRAPFRAME_SIZEOF(sp) + ldil L%proc0fpstate, t1 + ldo R%proc0fpstate(t1), t1 + stw t1, TF_CR30-TRAPFRAME_SIZEOF(sp) + mtctl t1, cr30 /* * disable all coprocessors |