d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Treat 6x86MX CPU as 686-class CPU instead of 586-class CPU.

Browse Source
This commit is contained in:
kato 1997-07-24 14:19:25 +00:00
parent c51924a1cb
commit b4ed1c780b
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/amd64/amd64/identcpu.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp
* $Id: identcpu.c,v 1.25 1997/06/24 09:45:35 kato Exp $
* $Id: identcpu.c,v 1.26 1997/07/20 08:37:18 bde Exp $
*/
#include "opt_cpu.h"
@ -83,7 +83,7 @@ static struct cpu_nameclass i386_cpus[] = {
{ "Cyrix 5x86", CPUCLASS_486 }, /* CPU_M1SC */
{ "Cyrix 6x86", CPUCLASS_486 }, /* CPU_M1 */
{ "Blue Lightning", CPUCLASS_486 }, /* CPU_BLUE */
{ "Cyrix 6x86MX", CPUCLASS_586 }, /* CPU_M2 */
{ "Cyrix 6x86MX", CPUCLASS_686 }, /* CPU_M2 */
{ "NexGen 586", CPUCLASS_386 }, /* CPU_NX586 (XXX) */
{ "Cyrix 486S/DX", CPUCLASS_486 }, /* CPU_CY486DX */
};

10
sys/amd64/amd64/initcpu.c
View File

@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: initcpu.c,v 1.5 1997/05/31 08:45:24 kato Exp $
* $Id: initcpu.c,v 1.6 1997/06/27 13:46:19 kato Exp $
*/
#include "opt_cpu.h"
@ -52,7 +52,7 @@ static void init_i486_on_386(void);
static void init_6x86(void);
#endif /* I486_CPU */
#ifdef I586_CPU
#ifdef I686_CPU
static void init_6x86MX(void);
#endif
@ -352,7 +352,7 @@ init_6x86(void)
}
#endif /* I486_CPU */
#ifdef I586_CPU
#ifdef I686_CPU
/*
* Cyrix 6x86MX (code-named M2)
*
@ -405,7 +405,7 @@ init_6x86MX(void)
write_eflags(eflags);
}
#endif /* I586_CPU */
#endif /* I686_CPU */
void
initializecpu(void)
@ -434,7 +434,7 @@ initializecpu(void)
init_6x86();
break;
#endif /* I486_CPU */
#ifdef I586_CPU
#ifdef I686_CPU
case CPU_M2:
init_6x86MX();
break;

4
sys/i386/i386/identcpu.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp
* $Id: identcpu.c,v 1.25 1997/06/24 09:45:35 kato Exp $
* $Id: identcpu.c,v 1.26 1997/07/20 08:37:18 bde Exp $
*/
#include "opt_cpu.h"
@ -83,7 +83,7 @@ static struct cpu_nameclass i386_cpus[] = {
{ "Cyrix 5x86", CPUCLASS_486 }, /* CPU_M1SC */
{ "Cyrix 6x86", CPUCLASS_486 }, /* CPU_M1 */
{ "Blue Lightning", CPUCLASS_486 }, /* CPU_BLUE */
{ "Cyrix 6x86MX", CPUCLASS_586 }, /* CPU_M2 */
{ "Cyrix 6x86MX", CPUCLASS_686 }, /* CPU_M2 */
{ "NexGen 586", CPUCLASS_386 }, /* CPU_NX586 (XXX) */
{ "Cyrix 486S/DX", CPUCLASS_486 }, /* CPU_CY486DX */
};

10
sys/i386/i386/initcpu.c
View File

@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: initcpu.c,v 1.5 1997/05/31 08:45:24 kato Exp $
* $Id: initcpu.c,v 1.6 1997/06/27 13:46:19 kato Exp $
*/
#include "opt_cpu.h"
@ -52,7 +52,7 @@ static void init_i486_on_386(void);
static void init_6x86(void);
#endif /* I486_CPU */
#ifdef I586_CPU
#ifdef I686_CPU
static void init_6x86MX(void);
#endif
@ -352,7 +352,7 @@ init_6x86(void)
}
#endif /* I486_CPU */
#ifdef I586_CPU
#ifdef I686_CPU
/*
* Cyrix 6x86MX (code-named M2)
*
@ -405,7 +405,7 @@ init_6x86MX(void)
write_eflags(eflags);
}
#endif /* I586_CPU */
#endif /* I686_CPU */
void
initializecpu(void)
@ -434,7 +434,7 @@ initializecpu(void)
init_6x86();
break;
#endif /* I486_CPU */
#ifdef I586_CPU
#ifdef I686_CPU
case CPU_M2:
init_6x86MX();
break;