From ef95efc18deed3dac4cd340172b3cc06000775ad Mon Sep 17 00:00:00 2001 From: Michael Knudsen Date: Sun, 13 Aug 2006 13:38:18 +0000 Subject: Fix EV6 processor minor type: 0 is reserved and thus all entries were off by one. Also add a bunch of minor types for EV6 and tables for PCA57 and EV67. The present tables should now be complete as per Alpha Architecture Reference Manual v4. ok miod --- sys/arch/alpha/alpha/cpu.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'sys') diff --git a/sys/arch/alpha/alpha/cpu.c b/sys/arch/alpha/alpha/cpu.c index 6d5c8a9d347..b774ec93758 100644 --- a/sys/arch/alpha/alpha/cpu.c +++ b/sys/arch/alpha/alpha/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.19 2004/06/13 21:49:11 niklas Exp $ */ +/* $OpenBSD: cpu.c,v 1.20 2006/08/13 13:38:17 mk Exp $ */ /* $NetBSD: cpu.c,v 1.44 2000/05/23 05:12:53 thorpej Exp $ */ /*- @@ -137,11 +137,20 @@ static const char *ev4minor[] = { }, *ev56minor[] = { "", "pass 1", "pass 2", 0 }, *ev6minor[] = { - "pass 1", "pass 2", "pass 2.2", "pass 2.3", "pass 3", 0 + "", "pass 1", "pass 2 or 2.1", "pass 2.2", "pass 2.3", "pass 3", + "pass 2.4", "pass 2.5", 0 }, *pca56minor[] = { "", "pass 1", 0 +}, *pca57minor[] = { + "", "pass 1", 0 +}, *ev67minor[] = { + "", "pass 1", "pass 2.1", "pass 2.2", "pass 2.1.1", + "pass 2.2.1", "pass 2.3 or 2.4", "pass 2.1.2", "pass 2.2.2", + "pass 2.2.3 or 2.2.5", "pass 2.2.4", "pass 2.5", "pass 2.4.1", + "pass 2.5.1", "pass 2.6", 0 }; + struct cputable_struct { int cpu_major_code; const char *cpu_major_name; @@ -156,8 +165,8 @@ struct cputable_struct { { PCS_PROC_EV56, "21164A", ev56minor }, { PCS_PROC_EV6, "21264", ev6minor }, { PCS_PROC_PCA56, "PCA56", pca56minor }, - { PCS_PROC_PCA57, "PCA57", NULL }, - { PCS_PROC_EV67, "21264A", NULL }, + { PCS_PROC_PCA57, "PCA57", pca57minor }, + { PCS_PROC_EV67, "21264A", ev67minor }, { PCS_PROC_EV68CB, "21264C", NULL }, { PCS_PROC_EV68AL, "21264B", NULL }, { PCS_PROC_EV68CX, "21264D", NULL }, -- cgit v1.2.3