diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2000-01-10 03:55:40 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2000-01-10 03:55:40 +0000 |
| commit | 28100039e1f0137c4d7c12f19db829f2abda51b0 (patch) | |
| tree | ecaad7ad7ac61dba89a213274739d3f49e8b7dae /sys/arch/kbus/fpu/fpu.c | |
| parent | c4d7e35492666ec7f56d61b18509cda8859943e2 (diff) | |
Fix some -Wall complaints
pmap_enter() now takes an extra arg
trapsignal() now takes a union sigval as the last arg
A kbus kernel now links but is untested--much more remains to be done.
Diffstat (limited to 'sys/arch/kbus/fpu/fpu.c')
| -rw-r--r-- | sys/arch/kbus/fpu/fpu.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/arch/kbus/fpu/fpu.c b/sys/arch/kbus/fpu/fpu.c index 2eaef3290b1..e72048bc90a 100644 --- a/sys/arch/kbus/fpu/fpu.c +++ b/sys/arch/kbus/fpu/fpu.c @@ -110,9 +110,11 @@ fpu_cleanup(p, fs) { register int i, fsr = fs->fs_fsr, error; union instr instr; - caddr_t pc = (caddr_t)p->p_md.md_tf->tf_pc; /* XXX only approximate */ + union sigval sv; struct fpemu fe; + sv.sival_int = p->p_md.md_tf->tf_pc; /* XXX only approximate */ + switch ((fsr >> FSR_FTT_SHIFT) & FSR_FTT_MASK) { case FSR_TT_NONE: @@ -122,7 +124,7 @@ fpu_cleanup(p, fs) case FSR_TT_IEEE: if ((i = fsr & FSR_CX) == 0) panic("fpu ieee trap, but no exception"); - trapsignal(p, SIGFPE, fpu_codes[i - 1], fpu_types[i - i], pc); + trapsignal(p, SIGFPE, fpu_codes[i - 1], fpu_types[i - i], sv); break; /* XXX should return, but queue remains */ case FSR_TT_UNFIN: @@ -139,7 +141,7 @@ fpu_cleanup(p, fs) log(LOG_ERR, "fpu hardware error (%s[%d])\n", p->p_comm, p->p_pid); uprintf("%s[%d]: fpu hardware error\n", p->p_comm, p->p_pid); - trapsignal(p, SIGFPE, -1, FPE_FLTINV, pc); /* ??? */ + trapsignal(p, SIGFPE, -1, FPE_FLTINV, sv); /* ??? */ goto out; default: @@ -164,11 +166,11 @@ fpu_cleanup(p, fs) case FPE: trapsignal(p, SIGFPE, fpu_codes[(fs->fs_fsr & FSR_CX) - 1], - fpu_types[(fs->fs_fsr & FSR_CX) - 1], pc); + fpu_types[(fs->fs_fsr & FSR_CX) - 1], sv); break; case NOTFPU: - trapsignal(p, SIGILL, 0, ILL_COPROC, pc); + trapsignal(p, SIGILL, 0, ILL_COPROC, sv); break; default: |