Deleted Added
full compact
cpu_machdep.c (8427) cpu_machdep.c (8456)
1/*-
2 * Copyright (c) 1992 Terrence R. Lambert.
3 * Copyright (c) 1982, 1987, 1990 The Regents of the University of California.
4 * All rights reserved.
5 *
6 * This code is derived from software contributed to Berkeley by
7 * William Jolitz.
8 *

--- 21 unchanged lines hidden (view full) ---

30 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
31 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
32 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
35 * SUCH DAMAGE.
36 *
37 * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
1/*-
2 * Copyright (c) 1992 Terrence R. Lambert.
3 * Copyright (c) 1982, 1987, 1990 The Regents of the University of California.
4 * All rights reserved.
5 *
6 * This code is derived from software contributed to Berkeley by
7 * William Jolitz.
8 *

--- 21 unchanged lines hidden (view full) ---

30 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
31 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
32 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
35 * SUCH DAMAGE.
36 *
37 * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
38 * $Id: machdep.c,v 1.123 1995/05/11 00:12:54 wollman Exp $
38 * $Id: machdep.c,v 1.124 1995/05/11 00:16:36 wollman Exp $
39 */
40
41#include "npx.h"
42#include "isa.h"
43
44#include <sys/param.h>
45#include <sys/systm.h>
46#include <sys/signalvar.h>

--- 480 unchanged lines hidden (view full) ---

527 printf("-class CPU)\n");
528#if defined(I486_CPU) || defined(I586_CPU)
529 if(*cpu_vendor)
530 printf(" Origin = \"%s\"",cpu_vendor);
531 if(cpu_id)
532 printf(" Id = 0x%lx",cpu_id);
533
534 if (!strcmp(cpu_vendor, "GenuineIntel")) {
39 */
40
41#include "npx.h"
42#include "isa.h"
43
44#include <sys/param.h>
45#include <sys/systm.h>
46#include <sys/signalvar.h>

--- 480 unchanged lines hidden (view full) ---

527 printf("-class CPU)\n");
528#if defined(I486_CPU) || defined(I586_CPU)
529 if(*cpu_vendor)
530 printf(" Origin = \"%s\"",cpu_vendor);
531 if(cpu_id)
532 printf(" Id = 0x%lx",cpu_id);
533
534 if (!strcmp(cpu_vendor, "GenuineIntel")) {
535 printf(" Stepping=%d", cpu_id & 0xf);
535 printf(" Stepping=%ld", cpu_id & 0xf);
536 if (cpu_high > 0) {
537#define FEATUREFMT "\020\001FPU\002VME\003PSE\004MCE\005CX8\006APIC"
538 printf("\n Features=0x%b", cpu_feature, FEATUREFMT);
539 }
540 }
541 /* Avoid ugly blank lines: only print newline when we have to. */
542 if (*cpu_vendor || cpu_id)
543 printf("\n");

--- 812 unchanged lines hidden (view full) ---

1356
1357 /*
1358 * Print a warning if the official BIOS interface disagrees
1359 * with the hackish interface used above. Eventually only
1360 * the official interface should be used.
1361 */
1362 if (bootinfo.bi_memsizes_valid) {
1363 if (bootinfo.bi_basemem != biosbasemem)
536 if (cpu_high > 0) {
537#define FEATUREFMT "\020\001FPU\002VME\003PSE\004MCE\005CX8\006APIC"
538 printf("\n Features=0x%b", cpu_feature, FEATUREFMT);
539 }
540 }
541 /* Avoid ugly blank lines: only print newline when we have to. */
542 if (*cpu_vendor || cpu_id)
543 printf("\n");

--- 812 unchanged lines hidden (view full) ---

1356
1357 /*
1358 * Print a warning if the official BIOS interface disagrees
1359 * with the hackish interface used above. Eventually only
1360 * the official interface should be used.
1361 */
1362 if (bootinfo.bi_memsizes_valid) {
1363 if (bootinfo.bi_basemem != biosbasemem)
1364 printf("BIOS basemem (%dK) != RTC basemem (%dK)\n",
1364 printf("BIOS basemem (%ldK) != RTC basemem (%dK)\n",
1365 bootinfo.bi_basemem, biosbasemem);
1366 if (bootinfo.bi_extmem != biosextmem)
1365 bootinfo.bi_basemem, biosbasemem);
1366 if (bootinfo.bi_extmem != biosextmem)
1367 printf("BIOS extmem (%dK) != RTC extmem (%dK)\n",
1367 printf("BIOS extmem (%ldK) != RTC extmem (%dK)\n",
1368 bootinfo.bi_extmem, biosextmem);
1369 }
1370
1371 /*
1372 * If BIOS tells us that it has more than 640k in the basemem,
1373 * don't believe it - set it to 640k.
1374 */
1375 if (biosbasemem > 640)

--- 387 unchanged lines hidden ---
1368 bootinfo.bi_extmem, biosextmem);
1369 }
1370
1371 /*
1372 * If BIOS tells us that it has more than 640k in the basemem,
1373 * don't believe it - set it to 640k.
1374 */
1375 if (biosbasemem > 640)

--- 387 unchanged lines hidden ---