Use the MI random() for all cases; no need for a MD version since it

has never been performance sensitive.
Running on all platforms, discussed with millert and kettenis, ok toby

2 files changed, 1 insertions, 66 deletions

diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 2eb74d13a7c..21b51d2a205 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.i386,v 1.182 2008/07/08 05:22:00 dlg Exp $
+#	$OpenBSD: files.i386,v 1.183 2008/10/10 20:21:38 deraadt Exp $
 #
 # new style config file for i386 architecture
 #
@@ -35,7 +35,6 @@ file	arch/i386/i386/powernow-k7.c	!small_kernel
 file	arch/i386/i386/powernow-k8.c	!small_kernel
 file	arch/i386/i386/process_machdep.c
 file	arch/i386/i386/procfs_machdep.c	procfs
-file	arch/i386/i386/random.s
 file	arch/i386/i386/sys_machdep.c
 file	arch/i386/i386/trap.c
 file	arch/i386/i386/vm_machdep.c
diff --git a/sys/arch/i386/i386/random.s b/sys/arch/i386/i386/random.s
deleted file mode 100644
index c40bad195b8..00000000000
--- a/sys/arch/i386/i386/random.s
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$OpenBSD: random.s,v 1.4 2003/04/17 03:42:14 drahn Exp $	*/
-/*	$NetBSD: random.s,v 1.5 1995/01/15 23:20:33 mycroft Exp $	*/
-
-/*
- * Copyright (c) 1995 Charles Hannum.
- * Copyright (c) 1990,1993 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Here is a very good random number generator.  This implementation is
- * based on ``Two Fast Implementations of the "Minimal Standard" Random
- * Number Generator'', David G. Carta, Communications of the ACM, Jan 1990,
- * Vol 33 No 1.  Do NOT modify this code unless you have a very thorough
- * understanding of the algorithm.  It's trickier than you think.  If
- * you do change it, make sure that its 10,000'th invocation returns
- * 1043618065.
- *
- * Here is easier-to-decipher pseudocode:
- *
- * p = (16807*seed)<30:0>	# e.g., the low 31 bits of the product
- * q = (16807*seed)<62:31>	# e.g., the high 31 bits starting at bit 32
- * if (p + q < 2^31)
- * 	seed = p + q
- * else
- *	seed = ((p + q) & (2^31 - 1)) + 1
- * return (seed);
- *
- * The result is in (0,2^31), e.g., it's always positive.
- */
-#include <machine/asm.h>
-
-	.data
-	.globl	_C_LABEL(_randseed)
-_C_LABEL(_randseed):
-	.long	1
-	.text
-ENTRY(random)
-	movl	$16807,%eax
-	imull	_C_LABEL(_randseed)
-	shld	$1,%eax,%edx
-	andl	$0x7fffffff,%eax
-	addl	%edx,%eax
-	js	1f
-	movl	%eax,_C_LABEL(_randseed)
-	ret
-1:
-	subl	$0x7fffffff,%eax
-	movl	%eax,_C_LABEL(_randseed)
-	ret