From a27ec33d1363f78d9f41cb60c4e0732c7f9fe9fa Mon Sep 17 00:00:00 2001
From: Miod Vallat <miod@cvs.openbsd.org>
Date: Sat, 25 Aug 2001 16:15:16 +0000
Subject: Remove workarounds for old compiler bugs, and fix a few style issues.
 millert@ ok

---
 sys/arch/hp300/hp300/machdep.c |  7 ++-----
 sys/arch/hp300/hp300/trap.c    | 16 ++++++++--------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/sys/arch/hp300/hp300/machdep.c b/sys/arch/hp300/hp300/machdep.c
index 58a34f441ab..d87d827bb76 100644
--- a/sys/arch/hp300/hp300/machdep.c
+++ b/sys/arch/hp300/hp300/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.60 2001/08/25 11:37:26 espie Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.61 2001/08/25 16:15:15 miod Exp $	*/
 /*	$NetBSD: machdep.c,v 1.121 1999/03/26 23:41:29 mycroft Exp $	*/
 
 /*
@@ -748,9 +748,6 @@ void
 boot(howto)
 	int howto;
 {
-#if __GNUC__	/* XXX work around lame compiler problem (gcc 2.7.2) */
-	(void)&howto;
-#endif
 	/* take a snap shot before clobbering any registers */
 	if (curproc && curproc->p_addr)
 		savectx(&curproc->p_addr->u_pcb);
@@ -784,7 +781,7 @@ boot(howto)
 	if (howto & RB_DUMP)
 		dumpsys();
 
- haltsys:
+haltsys:
 	/* Run any shutdown hooks. */
 	doshutdownhooks();
 
diff --git a/sys/arch/hp300/hp300/trap.c b/sys/arch/hp300/hp300/trap.c
index 47765be5339..2f3700697ba 100644
--- a/sys/arch/hp300/hp300/trap.c
+++ b/sys/arch/hp300/hp300/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.26 2001/08/25 11:37:26 espie Exp $	*/
+/*	$OpenBSD: trap.c,v 1.27 2001/08/25 16:15:15 miod Exp $	*/
 /*	$NetBSD: trap.c,v 1.57 1998/02/16 20:58:31 thorpej Exp $	*/
 
 /*
@@ -302,7 +302,7 @@ trap(type, code, v, frame)
 	struct proc *p;
 	int i, s;
 	u_int ucode;
-	u_quad_t sticks = 0 /* XXX initializer works around compiler bug */;
+	u_quad_t sticks;
 	int typ = 0;
 	union sigval sv;
 
@@ -326,7 +326,7 @@ trap(type, code, v, frame)
 	switch (type) {
 
 	default:
-	dopanic:
+dopanic:
 		printf("trap type %d, code = 0x%x, v = 0x%x\n", type, code, v);
 		printf("%s program counter = 0x%x\n",
 		    (type & T_USER) ? "user" : "kernel", frame.f_pc);
@@ -521,12 +521,12 @@ trap(type, code, v, frame)
 	 * XXX: Trace traps are a nightmare.
 	 *
 	 *	HP-UX uses trap #1 for breakpoints,
-	 *	NetBSD/m68k uses trap #2,
+	 *	OpenBSD/m68k uses trap #2,
 	 *	SUN 3.x uses trap #15,
 	 *	DDB and KGDB uses trap #15 (for kernel breakpoints;
 	 *	handled elsewhere).
 	 *
-	 * NetBSD and HP-UX traps both get mapped by locore.s into T_TRACE.
+	 * OpenBSD and HP-UX traps both get mapped by locore.s into T_TRACE.
 	 * SUN 3.x traps get passed through as T_TRAP15 and are not really
 	 * supported yet.
 	 *
@@ -575,7 +575,7 @@ trap(type, code, v, frame)
 		 * IPL while processing the SIR.
 		 */
 		spl1();
-		/* fall into... */
+		/* FALLTHROUGH */
 
 	case T_SSIR:		/* software interrupt */
 	case T_SSIR|T_USER:
@@ -612,7 +612,7 @@ trap(type, code, v, frame)
 		if (p->p_addr->u_pcb.pcb_onfault == fubail ||
 		    p->p_addr->u_pcb.pcb_onfault == subail)
 			goto copyfault;
-		/* fall into ... */
+		/* FALLTHROUGH */
 
 	case T_MMUFLT|T_USER:	/* page fault */
 	    {
@@ -1160,7 +1160,7 @@ syscall(code, frame)
 		/* nothing to do */
 		break;
 	default:
-	bad:
+bad:
 		if (p->p_emul->e_errno)
 			error = p->p_emul->e_errno[error];
 		frame.f_regs[D0] = error;
-- 
cgit v1.2.3