From 2c4739364d31eba77b32cd2953a0b5c56841dfeb Mon Sep 17 00:00:00 2001
From: Miod Vallat <miod@cvs.openbsd.org>
Date: Sun, 9 Dec 2007 19:57:52 +0000
Subject: I honestly do not remember what 88110 errata convinced me to disable
 out-of-order (superscalar) execution on these processors.

Since OoO brings a nice 50% to 250% speedup (as shown by ``openssl speed''),
it is definitely worth enabling.
---
 sys/arch/m88k/m88k/db_sstep.c     | 5 ++---
 sys/arch/m88k/m88k/m88k_machdep.c | 6 +-----
 2 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'sys/arch/m88k')

diff --git a/sys/arch/m88k/m88k/db_sstep.c b/sys/arch/m88k/m88k/db_sstep.c
index a645ff52314..6fb585bb86f 100644
--- a/sys/arch/m88k/m88k/db_sstep.c
+++ b/sys/arch/m88k/m88k/db_sstep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_sstep.c,v 1.5 2006/05/03 18:12:52 miod Exp $	*/
+/*	$OpenBSD: db_sstep.c,v 1.6 2007/12/09 19:57:50 miod Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -257,8 +257,7 @@ db_clear_single_step(regs)
 {
 #ifdef M88110
 	if (CPU_IS88110) {
-		/* do not remove PSR_SER as we don't enable OoO */
-		regs->epsr &= ~PSR_TRACE;
+		regs->epsr &= ~(PSR_TRACE | PSR_SER);
 	}
 #endif
 #ifdef M88100
diff --git a/sys/arch/m88k/m88k/m88k_machdep.c b/sys/arch/m88k/m88k/m88k_machdep.c
index 4f2f01af9f5..2a8cd14b131 100644
--- a/sys/arch/m88k/m88k/m88k_machdep.c
+++ b/sys/arch/m88k/m88k/m88k_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m88k_machdep.c,v 1.38 2007/12/05 22:09:14 miod Exp $	*/
+/*	$OpenBSD: m88k_machdep.c,v 1.39 2007/12/09 19:57:50 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -136,10 +136,6 @@ setregs(p, pack, stack, retval)
 		 * graphics unit, fp enabled
 		 */
 		tf->tf_epsr = PSR_SRM | PSR_SFD;
-		/*
-		 * XXX disable OoO for now...
-		 */
-		tf->tf_epsr |= PSR_SER;
 	}
 #endif
 #ifdef M88100
-- 
cgit v1.2.3