diff options
| author |   miod <miod@openbsd.org> | 2013-06-29 13:00:35 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2013-06-29 13:00:35 +0000 |
| commit | 4ed919d663616f038b92f3a7cfc0363089f1e3c7 (patch) | |
| tree | 933518a57fba35899fe433272994917df55841f4 | |
| parent | Turn mfpr() and mtpr() into inline functions. (diff) | |
| download | wireguard-openbsd-4ed919d663616f038b92f3a7cfc0363089f1e3c7.tar.xz wireguard-openbsd-4ed919d663616f038b92f3a7cfc0363089f1e3c7.zip | |
Minor fixes to let this build with gcc 3.
| -rw-r--r-- | sys/arch/vax/vax/machdep.c | 18 | ||||
| -rw-r--r-- | sys/arch/vax/vax/pmap.c | 10 |
2 files changed, 14 insertions, 14 deletions
diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c index 9a24ae75527..e1a269e4cc0 100644 --- a/sys/arch/vax/vax/machdep.c +++ b/sys/arch/vax/vax/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.124 2013/06/11 16:42:13 deraadt Exp $ */ +/* $OpenBSD: machdep.c,v 1.125 2013/06/29 13:00:35 miod Exp $ */ /* $NetBSD: machdep.c,v 1.108 2000/09/13 15:00:23 thorpej Exp $ */ /* @@ -573,14 +573,14 @@ haltsys: * rely on that. */ #ifdef notyet - asm(" movl sp, (0x80000200) - movl 0x80000200, sp - mfpr $0x10, -(sp) # PR_PCBB - mfpr $0x11, -(sp) # PR_SCBB - mfpr $0xc, -(sp) # PR_SBR - mfpr $0xd, -(sp) # PR_SLR - mtpr $0, $0x38 # PR_MAPEN - "); + asm(" movl sp, (0x80000200);" + " movl 0x80000200, sp;" + " mfpr $0x10, -(sp); # PR_PCBB" + " mfpr $0x11, -(sp); # PR_SCBB" + " mfpr $0xc, -(sp); # PR_SBR" + " mfpr $0xd, -(sp); # PR_SLR" + " mtpr $0, $0x38; # PR_MAPEN" + ); #endif if (dep_call->cpu_reboot) diff --git a/sys/arch/vax/vax/pmap.c b/sys/arch/vax/vax/pmap.c index 78f0a9127ca..31dd0ebaa17 100644 --- a/sys/arch/vax/vax/pmap.c +++ b/sys/arch/vax/vax/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.56 2013/06/09 15:47:33 miod Exp $ */ +/* $OpenBSD: pmap.c,v 1.57 2013/06/29 13:00:35 miod Exp $ */ /* $NetBSD: pmap.c,v 1.74 1999/11/13 21:32:25 matt Exp $ */ /* * Copyright (c) 1994, 1998, 1999 Ludd, University of Lule}, Sweden. @@ -230,8 +230,8 @@ pmap_bootstrap() pmap->ref_count = 1; /* Activate the kernel pmap. */ - mtpr(pcb->P1BR = pmap->pm_p1br, PR_P1BR); - mtpr(pcb->P0BR = pmap->pm_p0br, PR_P0BR); + mtpr((register_t)(pcb->P1BR = pmap->pm_p1br), PR_P1BR); + mtpr((register_t)(pcb->P0BR = pmap->pm_p0br), PR_P0BR); mtpr(pcb->P1LR = pmap->pm_p1lr, PR_P1LR); mtpr(pcb->P0LR = pmap->pm_p0lr, PR_P0LR); @@ -1251,9 +1251,9 @@ if(startpmapdebug) printf("pmap_activate: p %p\n", p); pcb->P1LR = pmap->pm_p1lr; if (p == curproc) { - mtpr(pmap->pm_p0br, PR_P0BR); + mtpr((register_t)pmap->pm_p0br, PR_P0BR); mtpr(pmap->pm_p0lr, PR_P0LR); - mtpr(pmap->pm_p1br, PR_P1BR); + mtpr((register_t)pmap->pm_p1br, PR_P1BR); mtpr(pmap->pm_p1lr, PR_P1LR); } mtpr(0, PR_TBIA); |