summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authordg <dg@FreeBSD.org>1996-04-06 01:06:06 +0000
committerdg <dg@FreeBSD.org>1996-04-06 01:06:06 +0000
commitecbbba2d2cd1916ea87c2ee41e48d5b94a9529d2 (patch)
treec77234f399b351489e6020e8949bb5dc08cd89af /sys
parentcee099d9b026d72d1ef813af34a1c5c2feb81def (diff)
downloadFreeBSD-src-ecbbba2d2cd1916ea87c2ee41e48d5b94a9529d2.zip
FreeBSD-src-ecbbba2d2cd1916ea87c2ee41e48d5b94a9529d2.tar.gz
Switch 586/686 back to generic_bzero and #if 0'd the "optimized" code. It
turns out that it actually reduces performance in real-world cases. Noticed by: bde
Diffstat (limited to 'sys')
-rw-r--r--sys/amd64/amd64/machdep.c4
-rw-r--r--sys/amd64/amd64/support.S4
-rw-r--r--sys/amd64/amd64/support.s4
-rw-r--r--sys/i386/i386/machdep.c4
-rw-r--r--sys/i386/i386/support.s4
5 files changed, 11 insertions, 9 deletions
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index acf456c..d513292 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
- * $Id: machdep.c,v 1.179 1996/03/26 19:57:51 wollman Exp $
+ * $Id: machdep.c,v 1.180 1996/04/05 03:36:02 ache Exp $
*/
#include "npx.h"
@@ -578,7 +578,6 @@ identifycpu()
((100 * i586_ctr_rate) >> I586_CTR_RATE_SHIFT) / 100,
((100 * i586_ctr_rate) >> I586_CTR_RATE_SHIFT) % 100);
printf("586");
- bzero = i586_bzero;
break;
#endif
#if defined(I686_CPU)
@@ -587,7 +586,6 @@ identifycpu()
((100 * i586_ctr_rate) >> I586_CTR_RATE_SHIFT) / 100,
((100 * i586_ctr_rate) >> I586_CTR_RATE_SHIFT) % 100);
printf("686");
- bzero = i686_bzero;
break;
#endif
default:
diff --git a/sys/amd64/amd64/support.S b/sys/amd64/amd64/support.S
index df32d00..91a3b96 100644
--- a/sys/amd64/amd64/support.S
+++ b/sys/amd64/amd64/support.S
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: support.s,v 1.31 1995/12/28 23:14:40 davidg Exp $
+ * $Id: support.s,v 1.32 1996/03/31 04:05:03 bde Exp $
*/
#include "assym.s" /* system definitions */
@@ -169,6 +169,7 @@ do0:
ret
#endif
+#if 0 /* Actually lowers performance in real-world cases */
#if defined(I586_CPU) || defined(I686_CPU)
ALTENTRY(i586_bzero)
ENTRY(i686_bzero)
@@ -227,6 +228,7 @@ ENTRY(i686_bzero)
popl %edi
ret
#endif
+#endif
/* fillw(pat, base, cnt) */
ENTRY(fillw)
diff --git a/sys/amd64/amd64/support.s b/sys/amd64/amd64/support.s
index df32d00..91a3b96 100644
--- a/sys/amd64/amd64/support.s
+++ b/sys/amd64/amd64/support.s
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: support.s,v 1.31 1995/12/28 23:14:40 davidg Exp $
+ * $Id: support.s,v 1.32 1996/03/31 04:05:03 bde Exp $
*/
#include "assym.s" /* system definitions */
@@ -169,6 +169,7 @@ do0:
ret
#endif
+#if 0 /* Actually lowers performance in real-world cases */
#if defined(I586_CPU) || defined(I686_CPU)
ALTENTRY(i586_bzero)
ENTRY(i686_bzero)
@@ -227,6 +228,7 @@ ENTRY(i686_bzero)
popl %edi
ret
#endif
+#endif
/* fillw(pat, base, cnt) */
ENTRY(fillw)
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index acf456c..d513292 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
- * $Id: machdep.c,v 1.179 1996/03/26 19:57:51 wollman Exp $
+ * $Id: machdep.c,v 1.180 1996/04/05 03:36:02 ache Exp $
*/
#include "npx.h"
@@ -578,7 +578,6 @@ identifycpu()
((100 * i586_ctr_rate) >> I586_CTR_RATE_SHIFT) / 100,
((100 * i586_ctr_rate) >> I586_CTR_RATE_SHIFT) % 100);
printf("586");
- bzero = i586_bzero;
break;
#endif
#if defined(I686_CPU)
@@ -587,7 +586,6 @@ identifycpu()
((100 * i586_ctr_rate) >> I586_CTR_RATE_SHIFT) / 100,
((100 * i586_ctr_rate) >> I586_CTR_RATE_SHIFT) % 100);
printf("686");
- bzero = i686_bzero;
break;
#endif
default:
diff --git a/sys/i386/i386/support.s b/sys/i386/i386/support.s
index df32d00..91a3b96 100644
--- a/sys/i386/i386/support.s
+++ b/sys/i386/i386/support.s
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: support.s,v 1.31 1995/12/28 23:14:40 davidg Exp $
+ * $Id: support.s,v 1.32 1996/03/31 04:05:03 bde Exp $
*/
#include "assym.s" /* system definitions */
@@ -169,6 +169,7 @@ do0:
ret
#endif
+#if 0 /* Actually lowers performance in real-world cases */
#if defined(I586_CPU) || defined(I686_CPU)
ALTENTRY(i586_bzero)
ENTRY(i686_bzero)
@@ -227,6 +228,7 @@ ENTRY(i686_bzero)
popl %edi
ret
#endif
+#endif
/* fillw(pat, base, cnt) */
ENTRY(fillw)
OpenPOWER on IntegriCloud