[src/netbsd-1-5]: src/sys/arch/i386/i386 Pull up revision 1.226 (requested by...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ff66c3f075e1
branches:  netbsd-1-5
changeset: 491384:ff66c3f075e1
user:      he <he%NetBSD.org@localhost>
date:      Wed Apr 25 09:30:42 2001 +0000

description:
Pull up revision 1.226 (requested by jdolecek):
  Add ``const'' to cpu tables.
  Properly identify and distinguish newer Intel CPUs using Brand
  ID information.

diffstat:

 sys/arch/i386/i386/locore.s |  8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diffs (36 lines):

diff -r 642e441d7bb4 -r ff66c3f075e1 sys/arch/i386/i386/locore.s
--- a/sys/arch/i386/i386/locore.s       Wed Apr 25 09:30:19 2001 +0000
+++ b/sys/arch/i386/i386/locore.s       Wed Apr 25 09:30:42 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.222.2.1 2000/08/16 23:18:21 thorpej Exp $ */
+/*     $NetBSD: locore.s,v 1.222.2.2 2001/04/25 09:30:42 he Exp $      */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -216,6 +216,7 @@
 
        .globl  _C_LABEL(cpu),_C_LABEL(cpu_id),_C_LABEL(cpu_vendor)
        .globl  _C_LABEL(cpuid_level),_C_LABEL(cpu_feature)
+       .globl  _C_LABEL(cpu_brand_id)
        .globl  _C_LABEL(esym),_C_LABEL(boothowto)
        .globl  _C_LABEL(bootinfo),_C_LABEL(atdevbase)
 #ifdef COMPAT_OLDBOOT
@@ -236,6 +237,7 @@
                                        #   instruction
 _C_LABEL(cpu_vendor):  .space  16      # vendor string returned by `cpuid'
                                        #   instruction
+_C_LABEL(cpu_brand_id):        .long   0       # brand ID from 'cpuid' instruction
 _C_LABEL(esym):                .long   0       # ptr to end of syms
 _C_LABEL(atdevbase):   .long   0       # location of start of iomem in virtual
 _C_LABEL(proc0paddr):  .long   0
@@ -498,6 +500,10 @@
        movl    %eax,RELOC(cpu_id)      # store cpu_id and features
        movl    %edx,RELOC(cpu_feature)
 
+       /* Brand ID is bits 0-7 of %ebx */
+       andl    $255,%ebx
+       movl    %ebx,RELOC(cpu_brand_id)
+
 2:
        /*
         * Finished with old stack; load new %esp now instead of later so we