Chameleon Commit Details - 1887 - Chameleon open source boot loader project.

Date:

2012-03-13 16:10:23 (12 years 1 month ago)

Author:

armel cadet-petit

Commit:

1887

Parents:

1886

Message:

bug fix

Changes:

D	/branches/cparm/i386/libsa/lzss.c
A	/branches/cparm/i386/libsaio/lzss.c
A	/branches/cparm/i386/libsaio/CoreHash.c
A	/branches/cparm/i386/libsaio/CoreHash.h
M	/branches/cparm/i386/libsaio/platform.c
M	/branches/cparm/i386/boot2/prompt.c
M	/branches/cparm/Chameleon.xcodeproj/project.pbxproj
M	/branches/cparm/i386/libsaio/saio_internal.h
M	/branches/cparm/i386/libsaio/Makefile
M	/branches/cparm/i386/libsaio/cpu_intel_amd.c
M	/branches/cparm/i386/libsa/Makefile
M	/branches/cparm/i386/boot2/boot.c
M	/branches/cparm/i386/libsa/libsa.h
M	/branches/cparm/i386/libsaio/modules.c
M	/branches/cparm/i386/libsaio/bootstruct.c
M	/branches/cparm/TODO

File differences

-1
2 2
3 3
4 
5 
6 4
7 5
8 6
+TODO List for Chameleon Boot Loader␊
====================================␊
␊
- Update cpu_intel_amd.c␊
␊
- Implement the bundles␊
␊
- Implement a pool allocator, so each module will run and allocate memory in there own pool, de-alloc all allocated memory by the module, ␊
 TODO List for Chameleon Boot Loader␊
 ====================================␊
 ␊
-- Update cpu_intel_amd.c␊
-␊
 - Implement the bundles␊
 ␊
 - Implement a pool allocator, so each module will run and allocate memory in there own pool, de-alloc all allocated memory by the module, ␊

-41
42 42
43 43
44 
44
45 45
46 46
47 47
+        cpu.o platform.o \␊
        fake_efi.o \␊
␉␉device_inject.o pci_root.o \␊
        convert.o acpi_tools.o smbios.o smp-imps.o uterror.o␊
        convert.o acpi_tools.o smbios.o smp-imps.o uterror.o lzss.o␊
␊
# example for AcpiCodec␊
#SAIO_OBJS += acpi_codec.o acpicode.o ACPICodec.o acpidecode.o␊
         cpu.o platform.o \␊
         fake_efi.o \␊
 ␉␉device_inject.o pci_root.o \␊
-        convert.o acpi_tools.o smbios.o smp-imps.o uterror.o␊
+        convert.o acpi_tools.o smbios.o smp-imps.o uterror.o lzss.o␊
 ␊
 # example for AcpiCodec␊
 #SAIO_OBJS += acpi_codec.o acpicode.o ACPICodec.o acpidecode.o␊

-391
392 392
393 393
394 
395 
394
395
396 396
397 397
398 398
399 399
400 
401 
402 
400
401
402
403
404
405
406
407
408
403 409
404 
405 
410
411
406 412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
407 439
408 
409 
440
441
410 442
411 
443
412 444
413 445
414 446
415 447
416 
448
417 449
418 450
419 451
... ...
421 453
422 454
423 455
424 
456
425 457
426 458
427 459
428 460
429 
461
430 462
431 463
432 464
... ...
444 476
445 477
446 478
447 
479
448 480
449 
481
450 482
451 483
452 484
453 485
454 486
455 
487
456 488
457 489
458 490
... ...
461 493
462 494
463 495
464 
496
465 497
466 498
467 499
468 
500
469 501
470 502
471 
503
472 504
473 505
474 
475 
476 
477 
478 
479 
480 
481 
506
507
508
509
510
511
512
513
482 514
483 515
484 
485 
486 
487 
516
517
518
519
488 520
489 
521
490 522
491 523
492 524
493 525
494 526
495 
527
496 528
497 529
498 
530
499 531
500 532
501 533
502 534
503 
535
504 536
505 537
506 538
507 539
508 
540
509 541
510 542
511 
543
512 544
513 545
514 
546
515 547
516 548
517 549
518 
550
519 551
520 552
521 553
522 554
523 555
524 
556
525 557
526 
558
527 559
528 
560
529 561
530 562
531 563
532 564
533 565
534 566
535 
567
536 568
537 569
538 570
539 571
540 
572
541 573
542 
574
543 575
544 576
545 
577
546 578
547 579
548 
580
549 581
550 
582
551 583
552 584
553 585
554 586
555 587
556 
557 
558 
588
589
590
559 591
560 592
561 
562 
593
594
563 595
564 596
565 597
566 598
567 599
568 
600
569 601
570 602
571 603
... ...
573 605
574 606
575 607
576 
577 
608
609
578 610
579 611
580 612
... ...
586 618
587 619
588 620
589 
590 
621
622
591 623
592 624
593 625
594 626
595 627
596 628
597 
629
598 630
599 
631
600 632
601 633
602 634
603 
635
604 636
605 637
606 638
607 639
608 640
609 
610 
641
642
611 643
612 644
613 645
614 646
615 
647
616 648
617 649
618 
650
619 651
620 652
621 
653
622 654
623 655
624 656
625 657
626 
658
627 659
628 
660
629 661
630 662
631 
663
632 664
633 
665
634 666
635 667
636 668
... ...
648 680
649 681
650 682
651 
683
652 684
653 685
654 686
... ...
673 705
674 706
675 707
676 
708
677 709
678 710
679 711
680 712
681 713
682 714
683 
684 
715
716
685 717
686 
718
687 719
688 720
689 721
690 
691 
722
723
692 724
693 
725
694 726
695 727
696 728
... ...
698 730
699 731
700 732
701 
733
702 734
703 735
704 
736
705 737
706 738
707 739
... ...
711 743
712 744
713 745
714 
746
715 747
716 
717 
748
749
718 750
719 
751
720 752
721 
753
722 754
723 
724 
725 
755
756
757
726 758
727 
728 
759
760
729 761
730 762
731 
732 
733 
734 
735 
736 
737 
738 
739 
763
764
765
766
767
768
769
770
771
740 772
741 773
742 774
... ...
783 815
784 816
785 817
786 
818
787 819
788 820
789 821
790 
822
791 823
792 824
793 
825
794 826
795 827
796 828
797 829
798 830
799 
831
800 832
801 
833
802 834
803 835
804 836
805 
837
806 838
807 839
808 840
809 
841
810 842
811 843
812 844
... ...
820 852
821 853
822 854
823 
824 
855
856
825 857
826 858
827 859
... ...
839 871
840 872
841 873
842 
874
843 875
844 876
845 877
846 
878
847 879
848 880
849 881
850 882
851 
883
852 884
853 885
854 886
855 
887
856 888
857 889
858 890
... ...
863 895
864 896
865 897
866 
898
867 899
868 900
869 901
870 
902
871 903
872 904
873 905
874 906
875 907
876 908
877 
909
878 910
879 911
880 912
881 
913
882 914
883 915
884 916
... ...
891 923
892 924
893 925
894 
895 
926
927
896 928
897 929
898 
930
899 931
900 932
901 933
902 934
903 935
904 
936
905 937
906 938
907 
939
908 940
909 941
910 942
911 
943
912 944
913 945
914 
915 
946
947
916 948
917 
918 
919 
920 
921 
922 
923 
924 
949
950
951
952
953
954
955
956
957
958
925 959
926 
927 
928 
929 
930 
931 
932 
933 
934 
935 
936 
937 
938 
939 
940 
941 
942 
943 
944 
945 
946 
947 
948 
949 
950 
960
961
951 962
952 
953 
954 
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
955 978
979
980
981
982
983
984
985
986
956 987
+ * - multi. is read from a specific MSR. In the case of Intel, there is:␊
 *     a max multi. (used to calculate the FSB freq.),␊
 *     and a current multi. (used to calculate the CPU freq.)␊
 * - fsbFrequency = tscFrequency / multi␊
 * - cpuFrequency = fsbFrequency * multi␊
 * - FSBFreq = TSCFreq / multi␊
 * - CPUFreq = FSBFreq * multi␊
 */␊
␊
void scan_cpu(PlatformInfo_t *p)␊
{␊
␉uint64_t␉tscFrequency = 0, fsbFrequency = 0, cpuFrequency = 0;␊
␉uint64_t␉msr;␊
␉uint8_t␉␉maxcoef = 0, maxdiv = 0, currcoef = 0, currdiv = 0;␊
␉uint64_t␉msr = 0;        ␊
    ␊
    ␊
    uint64_t␉Features = 0;␉␉// CPU Features like MMX, SSE2, VT ...␊
␉uint64_t␉ExtFeatures = 0;    // CPU Extended Features like SYSCALL, XD, EM64T, LAHF ...␊
    uint64_t␉TSCFreq = 0 ;␊
    uint64_t    FSBFreq = 0 ;    ␊
    uint64_t    CPUFreq = 0;␊
    ␊
    uint32_t␉reg[4];␊
    uint32_t        cores_per_package = 0;␊
    uint32_t        logical_per_package = 0;    ␊
    uint32_t    cores_per_package = 0;␊
    uint32_t    logical_per_package = 0;␊
    ␊
    uint32_t␉Vendor = 0;␉␉␉// Vendor␊
␉uint32_t␉Signature = 0;␉␉// Signature␊
␉uint8_t     Stepping = 0;␉␉// Stepping␊
␉uint8_t     Model = 0;␉␉␉// Model␊
␉uint8_t     ExtModel = 0;␉␉// Extended Model␊
␉uint8_t     Family = 0;␉␉␉// Family␊
␉uint8_t     ExtFamily = 0;␉␉// Extended Family␊
␉uint32_t␉NoCores = 0;␉␉// No Cores per Package␊
␉uint32_t␉NoThreads = 0;␉␉// Threads per Package␊
␉uint8_t     Brand = 0; ␊
␉uint32_t␉MicrocodeVersion = 0;   // The microcode version number a.k.a. signature a.k.a. BIOS ID ␊
    ␊
␉uint8_t     isMobile = 0;        ␊
␉␊
␉boolean_t␉dynamic_acceleration = 0;␊
␉boolean_t␉invariant_APIC_timer = 0;␊
␉boolean_t␉fine_grain_clock_mod = 0;␊
␉␊
␉uint32_t    cpuid_max_basic = 0;␊
␉uint32_t    cpuid_max_ext = 0;␊
␉uint32_t␉sub_Cstates = 0;␊
␉uint32_t    extensions = 0;    ␊
    ␊
␉uint8_t␉␉maxcoef = 0, maxdiv = 0, currcoef = 0, currdiv = 0;␊
    char␉␉CpuBrandString[48];␉// 48 Byte Branding String    ␊
    ␊
␉do_cpuid(0, reg);␊
    p->CPU.Vendor␉␉= reg[ebx];␊
    p->CPU.cpuid_max_basic     = reg[eax];␊
    Vendor␉␉= reg[ebx];␊
    cpuid_max_basic     = reg[eax];␊
␉␊
    if (p->CPU.Vendor == 0x756E6547 /* Intel */)␊
    if (Vendor == CPUID_VENDOR_INTEL)␊
    {␊
        do_cpuid2(0x00000004, 0, reg);␊
        cores_per_package␉␉= bitfield(reg[eax], 31, 26) + 1;␊
    } ␊
    else if (p->CPU.Vendor != 0x68747541 /* AMD */)␊
    else if (Vendor != CPUID_VENDOR_AMD)␊
    {␊
        stop("Error: CPU unsupported\n");␊
    ␉halt();␊

␉␊
    /* get extended cpuid results */␊
␉do_cpuid(0x80000000, reg);␊
␉p->CPU.cpuid_max_ext = reg[eax];    ␊
␉cpuid_max_ext = reg[eax];    ␊
    ␊
␉/* Begin of Copyright: from Apple's XNU cpuid.c */␊
␉␊
␉/* get brand string (if supported) */␊
␉if (p->CPU.cpuid_max_ext > 0x80000004)␊
␉if (cpuid_max_ext > 0x80000004)␊
␉{␉␉␊
        char        str[128], *s;␊
␉␉/*␊

␉␉␉if (*s != ' ') break;␊
␉␉}␊
␉␉␊
␉␉strlcpy(p->CPU.BrandString,␉s, sizeof(p->CPU.BrandString));␊
␉␉strlcpy(CpuBrandString,␉s, sizeof(CpuBrandString));␊
␉␉␊
␉␉if (!strncmp(p->CPU.BrandString, CPUID_STRING_UNKNOWN, min(sizeof(p->CPU.BrandString), (unsigned)strlen(CPUID_STRING_UNKNOWN) + 1)))␊
␉␉if (!strncmp(CpuBrandString, CPUID_STRING_UNKNOWN, min(sizeof(CpuBrandString), (unsigned)strlen(CPUID_STRING_UNKNOWN) + 1)))␊
␉␉{␊
            /*␊
             * This string means we have a firmware-programmable brand string,␊
             * and the firmware couldn't figure out what sort of CPU we have.␊
             */␊
            p->CPU.BrandString[0] = '\0';␊
            CpuBrandString[0] = '\0';␊
        }␊
␉}  ␊
␉␊

␉ * and bracket this with the approved procedure for reading the␊
␉ * the microcode version number a.k.a. signature a.k.a. BIOS ID␊
␉ */␊
    if (p->CPU.Vendor == 0x756E6547 /* Intel */)␊
    if (Vendor == CPUID_VENDOR_INTEL )␊
    {␊
        wrmsr64(MSR_IA32_BIOS_SIGN_ID, 0);␊
        do_cpuid(1, reg);␊
        p->CPU.MicrocodeVersion =␊
        MicrocodeVersion =␊
        (uint32_t) (rdmsr64(MSR_IA32_BIOS_SIGN_ID) >> 32);␉␊
    }␊
    else if (p->CPU.Vendor != 0x68747541 /* AMD */)␊
    else if (Vendor != CPUID_VENDOR_AMD)␊
        do_cpuid(1, reg);␊
␊
␉p->CPU.Signature        = reg[eax];␊
␉p->CPU.Stepping         = bitfield(reg[eax],  3,  0);␊
␉p->CPU.Model            = bitfield(reg[eax],  7,  4);␊
␉p->CPU.Family           = bitfield(reg[eax], 11,  8);␊
␉p->CPU.ExtModel         = bitfield(reg[eax], 19, 16);␊
␉p->CPU.ExtFamily        = bitfield(reg[eax], 27, 20);␊
␉p->CPU.Brand            = bitfield(reg[ebx],  7,  0);␊
␉p->CPU.Features         = quad(reg[ecx], reg[edx]);␊
␉Signature        = reg[eax];␊
␉Stepping         = bitfield(reg[eax],  3,  0);␊
␉Model            = bitfield(reg[eax],  7,  4);␊
␉Family           = bitfield(reg[eax], 11,  8);␊
␉ExtModel         = bitfield(reg[eax], 19, 16);␊
␉ExtFamily        = bitfield(reg[eax], 27, 20);␊
␉Brand            = bitfield(reg[ebx],  7,  0);␊
␉Features         = quad(reg[ecx], reg[edx]);␊
    ␉␉␊
    /* Fold extensions into family/model */␊
␉if (p->CPU.Family == 0x0f)␊
␉␉p->CPU.Family += p->CPU.ExtFamily;␊
␉if (p->CPU.Family == 0x0f || p->CPU.Family == 0x06)␊
␉␉p->CPU.Model += (p->CPU.ExtModel << 4);␊
␉if (Family == 0x0f)␊
␉␉Family += ExtFamily;␊
␉if (Family == 0x0f || Family == 0x06)␊
␉␉Model += (ExtModel << 4);␊
    ␊
    if (p->CPU.Features & CPUID_FEATURE_HTT)␊
    if (Features & CPUID_FEATURE_HTT)␊
␉␉logical_per_package =␊
        bitfield(reg[ebx], 23, 16);␊
␉else␊
␉␉logical_per_package = 1;␊
␉␊
␉if (p->CPU.cpuid_max_ext >= 0x80000001)␊
␉if (cpuid_max_ext >= 0x80000001)␊
␉{␊
␉␉do_cpuid(0x80000001, reg);␊
␉␉p->CPU.ExtFeatures =␊
␉␉ExtFeatures =␊
        quad(reg[ecx], reg[edx]);␊
␉␉␊
␉}␊
␉␊
␉if (p->CPU.cpuid_max_ext >= 0x80000007)␊
␉if (cpuid_max_ext >= 0x80000007)␊
␉{␊
␉␉do_cpuid(0x80000007, reg);  ␊
␉␉␊
␉␉/* Fold in the Invariant TSC feature bit, if present */␊
␉␉p->CPU.ExtFeatures |=␊
␉␉ExtFeatures |=␊
        reg[edx] & (uint32_t)CPUID_EXTFEATURE_TSCI;␊
␉␉␊
        if (p->CPU.Vendor == 0x68747541 /* AMD */)␊
        if (Vendor == CPUID_VENDOR_AMD)␊
        {␊
            /* Fold in the Hardware P-State control feature bit, if present */␊
            p->CPU.ExtFeatures |=␊
           ExtFeatures |=␊
            reg[edx] & (uint32_t)_Bit(7);␊
            ␊
            /* Fold in the read-only effective frequency interface feature bit, if present */␊
            p->CPU.ExtFeatures |=␊
            ExtFeatures |=␊
            reg[edx] & (uint32_t)_Bit(10);␊
        }␊
␊
␉}    ␊
␉␊
    if (p->CPU.Vendor == 0x68747541 /* AMD */)␊
    if (Vendor == CPUID_VENDOR_AMD )␊
    {␊
        if (p->CPU.cpuid_max_ext >= 0x80000008)␊
        if (cpuid_max_ext >= 0x80000008)␊
        {␊
            if (p->CPU.Features & CPUID_FEATURE_HTT) ␊
            if (Features & CPUID_FEATURE_HTT) ␊
            {␊
                do_cpuid(0x80000008, reg);␊
                cores_per_package␉␉= bitfield(reg[ecx], 7 , 0) + 1; // NC + 1␊
            }␊
        }␉␉␊
    }␉␊
    if (p->CPU.cpuid_max_basic >= 0x5) {        ␊
    if (cpuid_max_basic >= 0x5) {        ␊
␉␉/*␊
␉␉ * Extract the Monitor/Mwait Leaf info:␊
␉␉ */␊
␉␉do_cpuid(5, reg);␊
        if (p->CPU.Vendor == 0x756E6547 /* Intel */)␊
        if (Vendor == CPUID_VENDOR_INTEL )␊
        {␊
            p->CPU.sub_Cstates  = reg[edx];␊
            sub_Cstates  = reg[edx];␊
        }␊
        ␊
        p->CPU.extensions   = reg[ecx];␉␊
        extensions   = reg[ecx];␉␊
␉}␊
␉␊
    if (p->CPU.Vendor == 0x756E6547 /* Intel */)␊
    if (Vendor == CPUID_VENDOR_INTEL)␊
    {␊
        if (p->CPU.cpuid_max_basic >= 0x6)␊
        if (cpuid_max_basic >= 0x6)␊
        {        ␊
            /*␊
             * The thermal and Power Leaf:␊
             */␊
            do_cpuid(6, reg);␊
            p->CPU.dynamic_acceleration = bitfield(reg[eax], 1, 1); // "Dynamic Acceleration Technology (Turbo Mode)"␊
            p->CPU.invariant_APIC_timer = bitfield(reg[eax], 2, 2); //  "Invariant APIC Timer"␊
            p->CPU.fine_grain_clock_mod = bitfield(reg[eax], 4, 4);␊
            dynamic_acceleration = bitfield(reg[eax], 1, 1); // "Dynamic Acceleration Technology (Turbo Mode)"␊
            invariant_APIC_timer = bitfield(reg[eax], 2, 2); //  "Invariant APIC Timer"␊
            fine_grain_clock_mod = bitfield(reg[eax], 4, 4);␊
        }␊
        ␊
        if ((p->CPU.Vendor == 0x756E6547 /* Intel */) && ␊
            (p->CPU.Family == 0x06))␊
        if ((Vendor == 0x756E6547 /* Intel */) && ␊
            (Family == 0x06))␊
        {␊
            /*␊
             * Find the number of enabled cores and threads␊
             * (which determines whether SMT/Hyperthreading is active).␊
             */␊
            switch (p->CPU.Model)␊
            switch (Model)␊
            {␊
                    ␊
                case CPUID_MODEL_DALES_32NM:␊

                case CPUID_MODEL_WESTMERE_EX:␊
                {␊
                    msr = rdmsr64(MSR_CORE_THREAD_COUNT);␊
                    p->CPU.NoThreads = bitfield((uint32_t)msr, 15,  0);␊
                    p->CPU.NoCores   = bitfield((uint32_t)msr, 19, 16);            ␊
                    NoThreads = bitfield((uint32_t)msr, 15,  0);␊
                    NoCores   = bitfield((uint32_t)msr, 19, 16);            ␊
                    break;␊
                }␊
                    ␊

                case CPUID_MODEL_JAKETOWN:␊
                {␊
                    msr = rdmsr64(MSR_CORE_THREAD_COUNT);␊
                    p->CPU.NoThreads = bitfield((uint32_t)msr, 15,  0);␊
                    p->CPU.NoCores   = bitfield((uint32_t)msr, 31, 16);            ␊
                    NoThreads = bitfield((uint32_t)msr, 15,  0);␊
                    NoCores   = bitfield((uint32_t)msr, 31, 16);            ␊
                    break;␊
                }        ␊
            }␊
        }␊
    }␊
    ␊
    if (p->CPU.NoCores == 0)␊
    if (NoCores == 0)␊
␉{␊
        if (p->CPU.Vendor == 0x68747541 /* AMD */)␊
        if (p->CPU.Vendor == CPUID_VENDOR_AMD)␊
        {␊
            if (!cores_per_package) {␊
                //legacy method␊
                if ((p->CPU.ExtFeatures & _HBit(1)/* CmpLegacy */) && ( p->CPU.Features & CPUID_FEATURE_HTT) )␊
                if ((ExtFeatures & _HBit(1)/* CmpLegacy */) && ( Features & CPUID_FEATURE_HTT) )␊
                    cores_per_package = logical_per_package; ␊
                else ␊
                    cores_per_package = 1;␊
            }␉␉␊
        }␊
␉␉p->CPU.NoThreads    = logical_per_package;␊
␉␉p->CPU.NoCores      = cores_per_package ? cores_per_package : 1 ;␊
␉␉NoThreads    = logical_per_package;␊
␉␉NoCores      = cores_per_package ? cores_per_package : 1 ;␊
␉}␊
␉␊
␉/* End of Copyright: from Apple's XNU cpuid.c */␊
    ␊
␉fsbFrequency = (uint64_t)(compute_bclk() * 1000000);␊
␉FSBFreq = (uint64_t)(compute_bclk() * 1000000);␊
␊
#ifdef LEGACY_CPU␊
␉tscFrequency = measure_tsc_frequency();␊
␉TSCFreq = measure_tsc_frequency();␊
#endif␉␊
␉␊
    if (p->CPU.Vendor == 0x68747541 /* AMD */)␊
    if (Vendor == CPUID_VENDOR_AMD)␊
    {␊
␊
#define K8_FIDVID_STATUS␉␉0xC0010042␊
#define K10_COFVID_STATUS␉␉0xC0010071␊
        if (p->CPU.ExtFeatures & _Bit(10))␊
        if (ExtFeatures & _Bit(10))␊
        {␉␉␊
            cpuFrequency = measure_aperf_frequency();␊
            CPUFreq = measure_aperf_frequency();␊
        }␊
        ␊
        if ((p->CPU.Vendor == 0x68747541 /* AMD */) && (p->CPU.Family == 0x0f))␊
        if ((Vendor == 0x68747541 /* AMD */) && (Family == 0x0f))␊
        {␊
            switch(p->CPU.ExtFamily)␊
            switch(ExtFamily)␊
            {␊
                case 0x00: /* K8 */␊
                    msr = rdmsr64(K8_FIDVID_STATUS);␊

                     if (bitfield(reg[ecx], 0, 0) == 1)␊
                     {␊
                     uint64_t aperf = measure_aperf_frequency();␊
                     cpuFrequency = aperf;␊
                     CPUFreq = aperf;␊
                     }␊
                     */␉␉␉␉ ␊
                    // NOTE: tsc runs at the maccoeff (non turbo)␊

                    break;␊
            }␊
            ␊
            if (!fsbFrequency)␊
            if (!FSBFreq)␊
            {␊
                if (maxcoef)␊
                {␊
                    if (currdiv)␊
                    {␊
                        if (!currcoef) currcoef = maxcoef;␊
                        if (!cpuFrequency)␊
                            fsbFrequency = ((tscFrequency * currdiv) / currcoef);␊
                        if (!CPUFreq)␊
                            FSBFreq = ((TSCFreq * currdiv) / currcoef);␊
                        else␊
                            fsbFrequency = ((cpuFrequency * currdiv) / currcoef);␊
                            FSBFreq = ((CPUFreq * currdiv) / currcoef);␊
                        ␊
                        DBG("%d.%d\n", currcoef / currdiv, ((currcoef % currdiv) * 100) / currdiv);␊
                    } else {␊
                        if (!cpuFrequency)␊
                            fsbFrequency = (tscFrequency / maxcoef);␊
                        if (!CPUFreq)␊
                            FSBFreq = (TSCFreq / maxcoef);␊
                        else ␊
                            fsbFrequency = (cpuFrequency / maxcoef);␊
                            FSBFreq = (CPUFreq / maxcoef);␊
                        DBG("%d\n", currcoef);␊
                    }␊
                }␊

                {␊
                    if (currdiv)␊
                    {␊
                        fsbFrequency = ((tscFrequency * currdiv) / currcoef);␊
                        FSBFreq = ((TSCFreq * currdiv) / currcoef);␊
                        DBG("%d.%d\n", currcoef / currdiv, ((currcoef % currdiv) * 100) / currdiv);␊
                    } else {␊
                        fsbFrequency = (tscFrequency / currcoef);␊
                        FSBFreq = (TSCFreq / currcoef);␊
                        DBG("%d\n", currcoef);␊
                    }␊
                }␊

        ␊
        // NOTE: This is not the approved method,␊
        // the method provided by AMD is: ␊
        // if ((PowerNow == enabled (p->CPU.cpuid_max_ext >= 0x80000007)) && (StartupFID(??) != MaxFID(??))) then "mobile processor present"␊
        // if ((PowerNow == enabled (cpuid_max_ext >= 0x80000007)) && (StartupFID(??) != MaxFID(??))) then "mobile processor present"␊
        ␊
        if (strstr(p->CPU.BrandString, "obile")) ␊
            p->CPU.isMobile = true;␊
        if (strstr(CpuBrandString, "obile")) ␊
            isMobile = true;␊
        else ␊
            p->CPU.isMobile = false;␊
            isMobile = false;␊
        ␊
        DBG("%s platform detected.\n", p->CPU.isMobile?"Mobile":"Desktop");␊
        DBG("%s platform detected.\n", isMobile?"Mobile":"Desktop");␊
    }␊
    else if ((p->CPU.Vendor == 0x756E6547 /* Intel */) && ␊
␉␉((p->CPU.Family == 0x06) || ␊
␉␉ (p->CPU.Family == 0x0f)))␊
    else if ((Vendor == CPUID_VENDOR_INTEL) && ␊
␉␉((Family == 0x06) || ␊
␉␉ (Family == 0x0f)))␊
␉{␊
␉␉if ((p->CPU.Family == 0x06 && p->CPU.Model >= 0x0c) || ␊
␉␉␉(p->CPU.Family == 0x0f && p->CPU.Model >= 0x03))␊
␉␉if ((Family == 0x06 && Model >= 0x0c) || ␊
␉␉␉(Family == 0x0f && Model >= 0x03))␊
␉␉{␊
␉␉␉/* Nehalem CPU model */␊
␉␉␉if (p->CPU.Family == 0x06 && (p->CPU.Model == CPUID_MODEL_NEHALEM || ␊
                                          p->CPU.Model == CPUID_MODEL_FIELDS || ␊
                                          p->CPU.Model == CPUID_MODEL_DALES || ␊
                                          p->CPU.Model == CPUID_MODEL_DALES_32NM || ␊
                                          p->CPU.Model == CPUID_MODEL_WESTMERE ||␊
                                          p->CPU.Model == CPUID_MODEL_NEHALEM_EX ||␊
                                          p->CPU.Model == CPUID_MODEL_WESTMERE_EX ||␊
                                          p->CPU.Model == CPUID_MODEL_SANDYBRIDGE ||␊
                                          p->CPU.Model == CPUID_MODEL_JAKETOWN)) ␊
␉␉␉if (Family == 0x06 && (Model == CPUID_MODEL_NEHALEM || ␊
                                          Model == CPUID_MODEL_FIELDS || ␊
                                          Model == CPUID_MODEL_DALES || ␊
                                          Model == CPUID_MODEL_DALES_32NM || ␊
                                          Model == CPUID_MODEL_WESTMERE ||␊
                                          Model == CPUID_MODEL_NEHALEM_EX ||␊
                                          Model == CPUID_MODEL_WESTMERE_EX ||␊
                                          Model == CPUID_MODEL_SANDYBRIDGE ||␊
                                          Model == CPUID_MODEL_JAKETOWN)) ␊
␉␉␉{␊
␉␉␉␉uint8_t␉␉bus_ratio_max = 0, bus_ratio_min = 0;␊
␉␉␉␉uint32_t␉max_ratio = 0;␊

#ifdef LEGACY_CPU␊
␉␉␉␉if (bus_ratio_max)␊
␉␉␉␉{␊
␉␉␉␉␉fsbFrequency = (tscFrequency / bus_ratio_max);␊
␉␉␉␉␉FSBFreq = (TSCFreq / bus_ratio_max);␊
␉␉␉␉}␊
#endif␊
␉␉␉␉//valv: Turbo Ratio Limit␊
␉␉␉␉if ((p->CPU.Model != 0x2e) && (p->CPU.Model != 0x2f))␊
␉␉␉␉if ((Model != 0x2e) && (Model != 0x2f))␊
␉␉␉␉{␊
␉␉␉␉␉//msr = rdmsr64(MSR_TURBO_RATIO_LIMIT);␊
␉␉␉␉␉cpuFrequency = bus_ratio_max * fsbFrequency;␊
␉␉␉␉␉CPUFreq = bus_ratio_max * FSBFreq;␊
␉␉␉␉␉max_ratio = bus_ratio_max * 10;␊
␉␉␉␉}␊
␉␉␉␉else␊
␉␉␉␉{␊
#ifdef LEGACY_CPU␊
␉␉␉␉␉cpuFrequency = tscFrequency;␊
␉␉␉␉␉CPUFreq = TSCFreq;␊
#else␊
␉␉␉␉␉cpuFrequency = bus_ratio_max * fsbFrequency;␊
␉␉␉␉␉CPUFreq = bus_ratio_max * FSBFreq;␊
#endif␊
␉␉␉␉}␉␉␉␉␉␉␉␉␊
#if DEBUG_CPU␊
␉␉␉␉DBG("Sticking with [BCLK: %dMhz, Bus-Ratio: %d]\n", fsbFrequency / 1000000, max_ratio);␊
␉␉␉␉DBG("Sticking with [BCLK: %dMhz, Bus-Ratio: %d]\n", FSBFreq / 1000000, max_ratio);␊
#endif␊
␉␉␉␉currcoef = bus_ratio_max;␊
                ␊
                tscFrequency = cpuFrequency;␊
                TSCFreq = CPUFreq;␊
␉␉␉} ␊
␉␉␉else␊
␉␉␉{␊

␉␉␉␉/* Non-integer bus ratio for the current-multi (undocumented)*/␊
␉␉␉␉currdiv = (msr >> 14) & 0x01;␊
                ␊
␉␉␉␉if ((p->CPU.Family == 0x06 && p->CPU.Model >= 0x0e) || ␊
␉␉␉␉␉(p->CPU.Family == 0x0f)) // This will always be model >= 3␊
␉␉␉␉if ((Family == 0x06 && Model >= 0x0e) || ␊
␉␉␉␉␉(Family == 0x0f)) // This will always be model >= 3␊
␉␉␉␉{␊
␉␉␉␉␉/* On these models, maxcoef defines TSC freq */␊
␉␉␉␉␉maxcoef = (msr >> 40) & 0x1f;␊

␉␉␉␉␉␊
␉␉␉␉␉if (maxdiv)␊
␉␉␉␉␉{␊
␉␉␉␉␉␉fsbFrequency = ((tscFrequency * 2) / ((maxcoef * 2) + 1));␊
␉␉␉␉␉␉FSBFreq = ((TSCFreq * 2) / ((maxcoef * 2) + 1));␊
␉␉␉␉␉}␊
␉␉␉␉␉else ␊
␉␉␉␉␉{␊
␉␉␉␉␉␉fsbFrequency = (tscFrequency / maxcoef);␊
␉␉␉␉␉␉FSBFreq = (TSCFreq / maxcoef);␊
␉␉␉␉␉}␊
␉␉␉␉␉␊
␉␉␉␉␉if (currdiv) ␊
␉␉␉␉␉{␊
␉␉␉␉␉␉cpuFrequency = (fsbFrequency * ((currcoef * 2) + 1) / 2);␊
␉␉␉␉␉␉CPUFreq = (FSBFreq * ((currcoef * 2) + 1) / 2);␊
␉␉␉␉␉}␊
␉␉␉␉␉else ␊
␉␉␉␉␉{␊
␉␉␉␉␉␉cpuFrequency = (fsbFrequency * currcoef);␊
␉␉␉␉␉␉CPUFreq = (FSBFreq * currcoef);␊
␉␉␉␉␉}␊
#if DEBUG_CPU␊
␉␉␉␉␉DBG("max: %d%s current: %d%s\n", maxcoef, maxdiv ? ".5" : "",currcoef, currdiv ? ".5" : "");␊

␉␉␉␉␊
␉␉␉␉if (currdiv) ␊
␉␉␉␉{␊
␉␉␉␉␉cpuFrequency = (fsbFrequency * ((currcoef * 2) + 1) / 2);␊
␉␉␉␉␉CPUFreq = (FSBFreq * ((currcoef * 2) + 1) / 2);␊
␉␉␉␉}␊
␉␉␉␉else ␊
␉␉␉␉{␊
␉␉␉␉␉cpuFrequency = (fsbFrequency * currcoef);␊
␉␉␉␉␉CPUFreq = (FSBFreq * currcoef);␊
␉␉␉␉}␊
␉␉␉␉␊
␉␉␉␉if (maxcoef) ␊
␉␉␉␉{␊
␉␉␉␉␉if (maxdiv)␊
␉␉␉␉␉{␊
␉␉␉␉␉␉tscFrequency  = (fsbFrequency * ((maxcoef * 2) + 1)) / 2;␊
␉␉␉␉␉␉TSCFreq  = (FSBFreq * ((maxcoef * 2) + 1)) / 2;␊
␉␉␉␉␉}␊
␉␉␉␉␉else ␊
␉␉␉␉␉{␊
␉␉␉␉␉␉tscFrequency = fsbFrequency * maxcoef;␊
␉␉␉␉␉␉TSCFreq = FSBFreq * maxcoef;␊
␉␉␉␉␉}␊
␉␉␉␉}␉␉␉␉␉␉␉␉␊
#if DEBUG_CPU␊

␉␉}␊
        /* Mobile CPU ? */ ␊
␉␉//Slice ␊
␉    p->CPU.isMobile = false;␊
␉␉switch (p->CPU.Model)␊
␉    isMobile = false;␊
␉␉switch (Model)␊
␉␉{␊
␉␉␉case 0x0D:␊
␉␉␉␉p->CPU.isMobile = true; ␊
␉␉␉␉isMobile = true; ␊
␉␉␉␉break;␉␉␉␊
␉␉␉case 0x02:␊
␉␉␉case 0x03:␊
␉␉␉case 0x04:␊
␉␉␉case 0x06:␉␊
␉␉␉␉p->CPU.isMobile = (rdmsr64(0x2C) & (1 << 21));␊
␉␉␉␉isMobile = (rdmsr64(0x2C) & (1 << 21));␊
␉␉␉␉break;␊
␉␉␉default:␊
␉␉␉␉p->CPU.isMobile = (rdmsr64(0x17) & (1 << 28));␊
␉␉␉␉isMobile = (rdmsr64(0x17) & (1 << 28));␊
␉␉␉␉break;␊
␉␉}␊
␊
␉␉DBG("%s platform detected.\n", p->CPU.isMobile?"Mobile":"Desktop");␊
␉␉DBG("%s platform detected.\n",isMobile?"Mobile":"Desktop");␊
␉}␊
␊
␉if (!cpuFrequency) cpuFrequency = tscFrequency;␊
    if (!tscFrequency) tscFrequency = cpuFrequency;␊
␉if (!CPUFreq) CPUFreq = TSCFreq;␊
    if (!TSCFreq) TSCFreq = CPUFreq;␊
    ␊
␉p->CPU.MaxCoef = maxcoef;␊
␉p->CPU.MaxDiv = maxdiv;␊
␉p->CPU.CurrCoef = currcoef;␊
␉p->CPU.CurrDiv = currdiv;␊
␉␊
    p->CPU.TSCFrequency = tscFrequency ;␊
␉p->CPU.FSBFrequency = fsbFrequency ;␊
␉p->CPU.CPUFrequency = cpuFrequency ;␊
␉if (Vendor == CPUID_VENDOR_INTEL) {␊
␉␉set_env(envDynamicAcceleration,  dynamic_acceleration);    ␊
␉␉set_env(envInvariantAPICTimer,␉ invariant_APIC_timer);    ␊
␉␉set_env(envFineGrainClockMod,  fine_grain_clock_mod);␊
␉␉set_env(envMicrocodeVersion, MicrocodeVersion);  ␊
␉␉set_env(envSubCstates,  sub_Cstates);␊
␉}␉ ␊
␉set_env(envVendor,          Vendor);␊
    set_env(envModel,           Model);    ␊
    set_env(envExtModel,        ExtModel);    ␊
    ␊
␉DBG("CPU: Vendor/Model/ExtModel: 0x%x/0x%x/0x%x\n", p->CPU.Vendor, p->CPU.Model, p->CPU.ExtModel);␊
␉DBG("CPU: Family/ExtFamily:      0x%x/0x%x\n", p->CPU.Family, p->CPU.ExtFamily);␊
    if (p->CPU.Vendor == 0x68747541 /* AMD */)␊
    {␊
        DBG("CPU (AMD): TSCFreq:               %dMHz\n", p->CPU.TSCFrequency / 1000000);␊
        DBG("CPU (AMD): FSBFreq:               %dMHz\n", p->CPU.FSBFrequency / 1000000);␊
        DBG("CPU (AMD): CPUFreq:               %dMHz\n", p->CPU.CPUFrequency / 1000000);␊
        DBG("CPU (AMD): MaxCoef/CurrCoef:      0x%x/0x%x\n", p->CPU.MaxCoef, p->CPU.CurrCoef);␊
        DBG("CPU (AMD): MaxDiv/CurrDiv:        0x%x/0x%x\n", p->CPU.MaxDiv, p->CPU.CurrDiv);␊
    }␊
    else␊
    {␊
        DBG("CPU: TSCFreq:               %dMHz\n", p->CPU.TSCFrequency / 1000000);␊
        DBG("CPU: FSBFreq:               %dMHz\n", p->CPU.FSBFrequency / 1000000);␊
        DBG("CPU: CPUFreq:               %dMHz\n", p->CPU.CPUFrequency / 1000000);␊
        DBG("CPU: MaxCoef/CurrCoef:      0x%x/0x%x\n", p->CPU.MaxCoef, p->CPU.CurrCoef);␊
        DBG("CPU: MaxDiv/CurrDiv:        0x%x/0x%x\n", p->CPU.MaxDiv, p->CPU.CurrDiv);␉␉␊
    }␉␊
    ␊
␉DBG("CPU: NoCores/NoThreads:     %d/%d\n", p->CPU.NoCores, p->CPU.NoThreads);␊
␉DBG("CPU: Features:              0x%08x\n", p->CPU.Features);␊
    DBG("CPU: ExtFeatures:           0x%08x\n", p->CPU.ExtFeatures);␊
    ␊
    if (p->CPU.Vendor == 0x756E6547 /* Intel */) ␊
        DBG("CPU: MicrocodeVersion:      %d\n", p->CPU.MicrocodeVersion);␊
␉set_env(envCPUIDMaxBasic, cpuid_max_basic);␊
␉set_env(envCPUIDMaxBasic, cpuid_max_ext);␊
␊
#if DEBUG_CPU␊
␉pause();␊
#endif␊
    set_env_copy(envBrandString, CpuBrandString, sizeof(CpuBrandString));␊
␉set_env(envSignature, Signature);    ␊
␉set_env(envStepping,  Stepping);    ␊
␉set_env(envFamily,␉ Family);    ␊
␉set_env(envExtModel,  ExtModel);    ␊
␉set_env(envExtFamily, ExtFamily);    ␊
␉set_env(envBrand,␉ Brand);    ␊
␉set_env(envFeatures,  Features);␊
    set_env(envExtFeatures,  ExtFeatures);␊
␊
␉set_env(envExtensions,   extensions); ␊
␊
␉set_env(envNoThreads,␉ NoThreads);    ␊
␉set_env(envNoCores,␉␉ NoCores);␊
␉set_env(envIsMobile,␉␉ isMobile);␊
␉␊
␉set_env(envMaxCoef,␉␉ maxcoef);    ␊
␉set_env(envMaxDiv,␉␉ maxdiv);␊
␉set_env(envCurrCoef,␉␉ currcoef);␊
␉set_env(envCurrDiv,␉     currdiv);    ␊
␉set_env(envTSCFreq,␉ TSCFreq);␊
␉set_env(envFSBFreq,␉ FSBFreq);␊
␉set_env(envCPUFreq,␉ CPUFreq);␊
␉␊
}␊
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
  * - multi. is read from a specific MSR. In the case of Intel, there is:␊
  *     a max multi. (used to calculate the FSB freq.),␊
  *     and a current multi. (used to calculate the CPU freq.)␊
- * - fsbFrequency = tscFrequency / multi␊
- * - cpuFrequency = fsbFrequency * multi␊
+ * - FSBFreq = TSCFreq / multi␊
+ * - CPUFreq = FSBFreq * multi␊
  */␊
 ␊
 void scan_cpu(PlatformInfo_t *p)␊
 {␊
-␉uint64_t␉tscFrequency = 0, fsbFrequency = 0, cpuFrequency = 0;␊
-␉uint64_t␉msr;␊
-␉uint8_t␉␉maxcoef = 0, maxdiv = 0, currcoef = 0, currdiv = 0;␊
+␉uint64_t␉msr = 0;        ␊
+    ␊
+    ␊
+    uint64_t␉Features = 0;␉␉// CPU Features like MMX, SSE2, VT ...␊
+␉uint64_t␉ExtFeatures = 0;    // CPU Extended Features like SYSCALL, XD, EM64T, LAHF ...␊
+    uint64_t␉TSCFreq = 0 ;␊
+    uint64_t    FSBFreq = 0 ;    ␊
+    uint64_t    CPUFreq = 0;␊
+    ␊
     uint32_t␉reg[4];␊
-    uint32_t        cores_per_package = 0;␊
-    uint32_t        logical_per_package = 0;    ␊
+    uint32_t    cores_per_package = 0;␊
+    uint32_t    logical_per_package = 0;␊
     ␊
+    uint32_t␉Vendor = 0;␉␉␉// Vendor␊
+␉uint32_t␉Signature = 0;␉␉// Signature␊
+␉uint8_t     Stepping = 0;␉␉// Stepping␊
+␉uint8_t     Model = 0;␉␉␉// Model␊
+␉uint8_t     ExtModel = 0;␉␉// Extended Model␊
+␉uint8_t     Family = 0;␉␉␉// Family␊
+␉uint8_t     ExtFamily = 0;␉␉// Extended Family␊
+␉uint32_t␉NoCores = 0;␉␉// No Cores per Package␊
+␉uint32_t␉NoThreads = 0;␉␉// Threads per Package␊
+␉uint8_t     Brand = 0; ␊
+␉uint32_t␉MicrocodeVersion = 0;   // The microcode version number a.k.a. signature a.k.a. BIOS ID ␊
+    ␊
+␉uint8_t     isMobile = 0;        ␊
+␉␊
+␉boolean_t␉dynamic_acceleration = 0;␊
+␉boolean_t␉invariant_APIC_timer = 0;␊
+␉boolean_t␉fine_grain_clock_mod = 0;␊
+␉␊
+␉uint32_t    cpuid_max_basic = 0;␊
+␉uint32_t    cpuid_max_ext = 0;␊
+␉uint32_t␉sub_Cstates = 0;␊
+␉uint32_t    extensions = 0;    ␊
+    ␊
+␉uint8_t␉␉maxcoef = 0, maxdiv = 0, currcoef = 0, currdiv = 0;␊
+    char␉␉CpuBrandString[48];␉// 48 Byte Branding String    ␊
+    ␊
 ␉do_cpuid(0, reg);␊
-    p->CPU.Vendor␉␉= reg[ebx];␊
-    p->CPU.cpuid_max_basic     = reg[eax];␊
+    Vendor␉␉= reg[ebx];␊
+    cpuid_max_basic     = reg[eax];␊
 ␉␊
-    if (p->CPU.Vendor == 0x756E6547 /* Intel */)␊
+    if (Vendor == CPUID_VENDOR_INTEL)␊
     {␊
         do_cpuid2(0x00000004, 0, reg);␊
         cores_per_package␉␉= bitfield(reg[eax], 31, 26) + 1;␊
     } ␊
-    else if (p->CPU.Vendor != 0x68747541 /* AMD */)␊
+    else if (Vendor != CPUID_VENDOR_AMD)␊
     {␊
         stop("Error: CPU unsupported\n");␊
     ␉halt();␊
 ␉␊
     /* get extended cpuid results */␊
 ␉do_cpuid(0x80000000, reg);␊
-␉p->CPU.cpuid_max_ext = reg[eax];    ␊
+␉cpuid_max_ext = reg[eax];    ␊
     ␊
 ␉/* Begin of Copyright: from Apple's XNU cpuid.c */␊
 ␉␊
 ␉/* get brand string (if supported) */␊
-␉if (p->CPU.cpuid_max_ext > 0x80000004)␊
+␉if (cpuid_max_ext > 0x80000004)␊
 ␉{␉␉␊
         char        str[128], *s;␊
 ␉␉/*␊
 ␉␉␉if (*s != ' ') break;␊
 ␉␉}␊
 ␉␉␊
-␉␉strlcpy(p->CPU.BrandString,␉s, sizeof(p->CPU.BrandString));␊
+␉␉strlcpy(CpuBrandString,␉s, sizeof(CpuBrandString));␊
 ␉␉␊
-␉␉if (!strncmp(p->CPU.BrandString, CPUID_STRING_UNKNOWN, min(sizeof(p->CPU.BrandString), (unsigned)strlen(CPUID_STRING_UNKNOWN) + 1)))␊
+␉␉if (!strncmp(CpuBrandString, CPUID_STRING_UNKNOWN, min(sizeof(CpuBrandString), (unsigned)strlen(CPUID_STRING_UNKNOWN) + 1)))␊
 ␉␉{␊
             /*␊
              * This string means we have a firmware-programmable brand string,␊
              * and the firmware couldn't figure out what sort of CPU we have.␊
              */␊
-            p->CPU.BrandString[0] = '\0';␊
+            CpuBrandString[0] = '\0';␊
         }␊
 ␉}  ␊
 ␉␊
 ␉ * and bracket this with the approved procedure for reading the␊
 ␉ * the microcode version number a.k.a. signature a.k.a. BIOS ID␊
 ␉ */␊
-    if (p->CPU.Vendor == 0x756E6547 /* Intel */)␊
+    if (Vendor == CPUID_VENDOR_INTEL )␊
     {␊
         wrmsr64(MSR_IA32_BIOS_SIGN_ID, 0);␊
         do_cpuid(1, reg);␊
-        p->CPU.MicrocodeVersion =␊
+        MicrocodeVersion =␊
         (uint32_t) (rdmsr64(MSR_IA32_BIOS_SIGN_ID) >> 32);␉␊
     }␊
-    else if (p->CPU.Vendor != 0x68747541 /* AMD */)␊
+    else if (Vendor != CPUID_VENDOR_AMD)␊
         do_cpuid(1, reg);␊
 ␊
-␉p->CPU.Signature        = reg[eax];␊
-␉p->CPU.Stepping         = bitfield(reg[eax],  3,  0);␊
-␉p->CPU.Model            = bitfield(reg[eax],  7,  4);␊
-␉p->CPU.Family           = bitfield(reg[eax], 11,  8);␊
-␉p->CPU.ExtModel         = bitfield(reg[eax], 19, 16);␊
-␉p->CPU.ExtFamily        = bitfield(reg[eax], 27, 20);␊
-␉p->CPU.Brand            = bitfield(reg[ebx],  7,  0);␊
-␉p->CPU.Features         = quad(reg[ecx], reg[edx]);␊
+␉Signature        = reg[eax];␊
+␉Stepping         = bitfield(reg[eax],  3,  0);␊
+␉Model            = bitfield(reg[eax],  7,  4);␊
+␉Family           = bitfield(reg[eax], 11,  8);␊
+␉ExtModel         = bitfield(reg[eax], 19, 16);␊
+␉ExtFamily        = bitfield(reg[eax], 27, 20);␊
+␉Brand            = bitfield(reg[ebx],  7,  0);␊
+␉Features         = quad(reg[ecx], reg[edx]);␊
     ␉␉␊
     /* Fold extensions into family/model */␊
-␉if (p->CPU.Family == 0x0f)␊
-␉␉p->CPU.Family += p->CPU.ExtFamily;␊
-␉if (p->CPU.Family == 0x0f || p->CPU.Family == 0x06)␊
-␉␉p->CPU.Model += (p->CPU.ExtModel << 4);␊
+␉if (Family == 0x0f)␊
+␉␉Family += ExtFamily;␊
+␉if (Family == 0x0f || Family == 0x06)␊
+␉␉Model += (ExtModel << 4);␊
     ␊
-    if (p->CPU.Features & CPUID_FEATURE_HTT)␊
+    if (Features & CPUID_FEATURE_HTT)␊
 ␉␉logical_per_package =␊
         bitfield(reg[ebx], 23, 16);␊
 ␉else␊
 ␉␉logical_per_package = 1;␊
 ␉␊
-␉if (p->CPU.cpuid_max_ext >= 0x80000001)␊
+␉if (cpuid_max_ext >= 0x80000001)␊
 ␉{␊
 ␉␉do_cpuid(0x80000001, reg);␊
-␉␉p->CPU.ExtFeatures =␊
+␉␉ExtFeatures =␊
         quad(reg[ecx], reg[edx]);␊
 ␉␉␊
 ␉}␊
 ␉␊
-␉if (p->CPU.cpuid_max_ext >= 0x80000007)␊
+␉if (cpuid_max_ext >= 0x80000007)␊
 ␉{␊
 ␉␉do_cpuid(0x80000007, reg);  ␊
 ␉␉␊
 ␉␉/* Fold in the Invariant TSC feature bit, if present */␊
-␉␉p->CPU.ExtFeatures |=␊
+␉␉ExtFeatures |=␊
         reg[edx] & (uint32_t)CPUID_EXTFEATURE_TSCI;␊
 ␉␉␊
-        if (p->CPU.Vendor == 0x68747541 /* AMD */)␊
+        if (Vendor == CPUID_VENDOR_AMD)␊
         {␊
             /* Fold in the Hardware P-State control feature bit, if present */␊
-            p->CPU.ExtFeatures |=␊
+           ExtFeatures |=␊
             reg[edx] & (uint32_t)_Bit(7);␊
             ␊
             /* Fold in the read-only effective frequency interface feature bit, if present */␊
-            p->CPU.ExtFeatures |=␊
+            ExtFeatures |=␊
             reg[edx] & (uint32_t)_Bit(10);␊
         }␊
 ␊
 ␉}    ␊
 ␉␊
-    if (p->CPU.Vendor == 0x68747541 /* AMD */)␊
+    if (Vendor == CPUID_VENDOR_AMD )␊
     {␊
-        if (p->CPU.cpuid_max_ext >= 0x80000008)␊
+        if (cpuid_max_ext >= 0x80000008)␊
         {␊
-            if (p->CPU.Features & CPUID_FEATURE_HTT) ␊
+            if (Features & CPUID_FEATURE_HTT) ␊
             {␊
                 do_cpuid(0x80000008, reg);␊
                 cores_per_package␉␉= bitfield(reg[ecx], 7 , 0) + 1; // NC + 1␊
             }␊
         }␉␉␊
     }␉␊
-    if (p->CPU.cpuid_max_basic >= 0x5) {        ␊
+    if (cpuid_max_basic >= 0x5) {        ␊
 ␉␉/*␊
 ␉␉ * Extract the Monitor/Mwait Leaf info:␊
 ␉␉ */␊
 ␉␉do_cpuid(5, reg);␊
-        if (p->CPU.Vendor == 0x756E6547 /* Intel */)␊
+        if (Vendor == CPUID_VENDOR_INTEL )␊
         {␊
-            p->CPU.sub_Cstates  = reg[edx];␊
+            sub_Cstates  = reg[edx];␊
         }␊
         ␊
-        p->CPU.extensions   = reg[ecx];␉␊
+        extensions   = reg[ecx];␉␊
 ␉}␊
 ␉␊
-    if (p->CPU.Vendor == 0x756E6547 /* Intel */)␊
+    if (Vendor == CPUID_VENDOR_INTEL)␊
     {␊
-        if (p->CPU.cpuid_max_basic >= 0x6)␊
+        if (cpuid_max_basic >= 0x6)␊
         {        ␊
             /*␊
              * The thermal and Power Leaf:␊
              */␊
             do_cpuid(6, reg);␊
-            p->CPU.dynamic_acceleration = bitfield(reg[eax], 1, 1); // "Dynamic Acceleration Technology (Turbo Mode)"␊
-            p->CPU.invariant_APIC_timer = bitfield(reg[eax], 2, 2); //  "Invariant APIC Timer"␊
-            p->CPU.fine_grain_clock_mod = bitfield(reg[eax], 4, 4);␊
+            dynamic_acceleration = bitfield(reg[eax], 1, 1); // "Dynamic Acceleration Technology (Turbo Mode)"␊
+            invariant_APIC_timer = bitfield(reg[eax], 2, 2); //  "Invariant APIC Timer"␊
+            fine_grain_clock_mod = bitfield(reg[eax], 4, 4);␊
         }␊
         ␊
-        if ((p->CPU.Vendor == 0x756E6547 /* Intel */) && ␊
-            (p->CPU.Family == 0x06))␊
+        if ((Vendor == 0x756E6547 /* Intel */) && ␊
+            (Family == 0x06))␊
         {␊
             /*␊
              * Find the number of enabled cores and threads␊
              * (which determines whether SMT/Hyperthreading is active).␊
              */␊
-            switch (p->CPU.Model)␊
+            switch (Model)␊
             {␊
                     ␊
                 case CPUID_MODEL_DALES_32NM:␊
                 case CPUID_MODEL_WESTMERE_EX:␊
                 {␊
                     msr = rdmsr64(MSR_CORE_THREAD_COUNT);␊
-                    p->CPU.NoThreads = bitfield((uint32_t)msr, 15,  0);␊
-                    p->CPU.NoCores   = bitfield((uint32_t)msr, 19, 16);            ␊
+                    NoThreads = bitfield((uint32_t)msr, 15,  0);␊
+                    NoCores   = bitfield((uint32_t)msr, 19, 16);            ␊
                     break;␊
                 }␊
                     ␊
                 case CPUID_MODEL_JAKETOWN:␊
                 {␊
                     msr = rdmsr64(MSR_CORE_THREAD_COUNT);␊
-                    p->CPU.NoThreads = bitfield((uint32_t)msr, 15,  0);␊
-                    p->CPU.NoCores   = bitfield((uint32_t)msr, 31, 16);            ␊
+                    NoThreads = bitfield((uint32_t)msr, 15,  0);␊
+                    NoCores   = bitfield((uint32_t)msr, 31, 16);            ␊
                     break;␊
                 }        ␊
             }␊
         }␊
     }␊
     ␊
-    if (p->CPU.NoCores == 0)␊
+    if (NoCores == 0)␊
 ␉{␊
-        if (p->CPU.Vendor == 0x68747541 /* AMD */)␊
+        if (p->CPU.Vendor == CPUID_VENDOR_AMD)␊
         {␊
             if (!cores_per_package) {␊
                 //legacy method␊
-                if ((p->CPU.ExtFeatures & _HBit(1)/* CmpLegacy */) && ( p->CPU.Features & CPUID_FEATURE_HTT) )␊
+                if ((ExtFeatures & _HBit(1)/* CmpLegacy */) && ( Features & CPUID_FEATURE_HTT) )␊
                     cores_per_package = logical_per_package; ␊
                 else ␊
                     cores_per_package = 1;␊
             }␉␉␊
         }␊
-␉␉p->CPU.NoThreads    = logical_per_package;␊
-␉␉p->CPU.NoCores      = cores_per_package ? cores_per_package : 1 ;␊
+␉␉NoThreads    = logical_per_package;␊
+␉␉NoCores      = cores_per_package ? cores_per_package : 1 ;␊
 ␉}␊
 ␉␊
 ␉/* End of Copyright: from Apple's XNU cpuid.c */␊
     ␊
-␉fsbFrequency = (uint64_t)(compute_bclk() * 1000000);␊
+␉FSBFreq = (uint64_t)(compute_bclk() * 1000000);␊
 ␊
 #ifdef LEGACY_CPU␊
-␉tscFrequency = measure_tsc_frequency();␊
+␉TSCFreq = measure_tsc_frequency();␊
 #endif␉␊
 ␉␊
-    if (p->CPU.Vendor == 0x68747541 /* AMD */)␊
+    if (Vendor == CPUID_VENDOR_AMD)␊
     {␊
 ␊
 #define K8_FIDVID_STATUS␉␉0xC0010042␊
 #define K10_COFVID_STATUS␉␉0xC0010071␊
-        if (p->CPU.ExtFeatures & _Bit(10))␊
+        if (ExtFeatures & _Bit(10))␊
         {␉␉␊
-            cpuFrequency = measure_aperf_frequency();␊
+            CPUFreq = measure_aperf_frequency();␊
         }␊
         ␊
-        if ((p->CPU.Vendor == 0x68747541 /* AMD */) && (p->CPU.Family == 0x0f))␊
+        if ((Vendor == 0x68747541 /* AMD */) && (Family == 0x0f))␊
         {␊
-            switch(p->CPU.ExtFamily)␊
+            switch(ExtFamily)␊
             {␊
                 case 0x00: /* K8 */␊
                     msr = rdmsr64(K8_FIDVID_STATUS);␊
                      if (bitfield(reg[ecx], 0, 0) == 1)␊
                      {␊
                      uint64_t aperf = measure_aperf_frequency();␊
-                     cpuFrequency = aperf;␊
+                     CPUFreq = aperf;␊
                      }␊
                      */␉␉␉␉ ␊
                     // NOTE: tsc runs at the maccoeff (non turbo)␊
                     break;␊
             }␊
             ␊
-            if (!fsbFrequency)␊
+            if (!FSBFreq)␊
             {␊
                 if (maxcoef)␊
                 {␊
                     if (currdiv)␊
                     {␊
                         if (!currcoef) currcoef = maxcoef;␊
-                        if (!cpuFrequency)␊
-                            fsbFrequency = ((tscFrequency * currdiv) / currcoef);␊
+                        if (!CPUFreq)␊
+                            FSBFreq = ((TSCFreq * currdiv) / currcoef);␊
                         else␊
-                            fsbFrequency = ((cpuFrequency * currdiv) / currcoef);␊
+                            FSBFreq = ((CPUFreq * currdiv) / currcoef);␊
                         ␊
                         DBG("%d.%d\n", currcoef / currdiv, ((currcoef % currdiv) * 100) / currdiv);␊
                     } else {␊
-                        if (!cpuFrequency)␊
-                            fsbFrequency = (tscFrequency / maxcoef);␊
+                        if (!CPUFreq)␊
+                            FSBFreq = (TSCFreq / maxcoef);␊
                         else ␊
-                            fsbFrequency = (cpuFrequency / maxcoef);␊
+                            FSBFreq = (CPUFreq / maxcoef);␊
                         DBG("%d\n", currcoef);␊
                     }␊
                 }␊
                 {␊
                     if (currdiv)␊
                     {␊
-                        fsbFrequency = ((tscFrequency * currdiv) / currcoef);␊
+                        FSBFreq = ((TSCFreq * currdiv) / currcoef);␊
                         DBG("%d.%d\n", currcoef / currdiv, ((currcoef % currdiv) * 100) / currdiv);␊
                     } else {␊
-                        fsbFrequency = (tscFrequency / currcoef);␊
+                        FSBFreq = (TSCFreq / currcoef);␊
                         DBG("%d\n", currcoef);␊
                     }␊
                 }␊
         ␊
         // NOTE: This is not the approved method,␊
         // the method provided by AMD is: ␊
-        // if ((PowerNow == enabled (p->CPU.cpuid_max_ext >= 0x80000007)) && (StartupFID(??) != MaxFID(??))) then "mobile processor present"␊
+        // if ((PowerNow == enabled (cpuid_max_ext >= 0x80000007)) && (StartupFID(??) != MaxFID(??))) then "mobile processor present"␊
         ␊
-        if (strstr(p->CPU.BrandString, "obile")) ␊
-            p->CPU.isMobile = true;␊
+        if (strstr(CpuBrandString, "obile")) ␊
+            isMobile = true;␊
         else ␊
-            p->CPU.isMobile = false;␊
+            isMobile = false;␊
         ␊
-        DBG("%s platform detected.\n", p->CPU.isMobile?"Mobile":"Desktop");␊
+        DBG("%s platform detected.\n", isMobile?"Mobile":"Desktop");␊
     }␊
-    else if ((p->CPU.Vendor == 0x756E6547 /* Intel */) && ␊
-␉␉((p->CPU.Family == 0x06) || ␊
-␉␉ (p->CPU.Family == 0x0f)))␊
+    else if ((Vendor == CPUID_VENDOR_INTEL) && ␊
+␉␉((Family == 0x06) || ␊
+␉␉ (Family == 0x0f)))␊
 ␉{␊
-␉␉if ((p->CPU.Family == 0x06 && p->CPU.Model >= 0x0c) || ␊
-␉␉␉(p->CPU.Family == 0x0f && p->CPU.Model >= 0x03))␊
+␉␉if ((Family == 0x06 && Model >= 0x0c) || ␊
+␉␉␉(Family == 0x0f && Model >= 0x03))␊
 ␉␉{␊
 ␉␉␉/* Nehalem CPU model */␊
-␉␉␉if (p->CPU.Family == 0x06 && (p->CPU.Model == CPUID_MODEL_NEHALEM || ␊
-                                          p->CPU.Model == CPUID_MODEL_FIELDS || ␊
-                                          p->CPU.Model == CPUID_MODEL_DALES || ␊
-                                          p->CPU.Model == CPUID_MODEL_DALES_32NM || ␊
-                                          p->CPU.Model == CPUID_MODEL_WESTMERE ||␊
-                                          p->CPU.Model == CPUID_MODEL_NEHALEM_EX ||␊
-                                          p->CPU.Model == CPUID_MODEL_WESTMERE_EX ||␊
-                                          p->CPU.Model == CPUID_MODEL_SANDYBRIDGE ||␊
-                                          p->CPU.Model == CPUID_MODEL_JAKETOWN)) ␊
+␉␉␉if (Family == 0x06 && (Model == CPUID_MODEL_NEHALEM || ␊
+                                          Model == CPUID_MODEL_FIELDS || ␊
+                                          Model == CPUID_MODEL_DALES || ␊
+                                          Model == CPUID_MODEL_DALES_32NM || ␊
+                                          Model == CPUID_MODEL_WESTMERE ||␊
+                                          Model == CPUID_MODEL_NEHALEM_EX ||␊
+                                          Model == CPUID_MODEL_WESTMERE_EX ||␊
+                                          Model == CPUID_MODEL_SANDYBRIDGE ||␊
+                                          Model == CPUID_MODEL_JAKETOWN)) ␊
 ␉␉␉{␊
 ␉␉␉␉uint8_t␉␉bus_ratio_max = 0, bus_ratio_min = 0;␊
 ␉␉␉␉uint32_t␉max_ratio = 0;␊
 #ifdef LEGACY_CPU␊
 ␉␉␉␉if (bus_ratio_max)␊
 ␉␉␉␉{␊
-␉␉␉␉␉fsbFrequency = (tscFrequency / bus_ratio_max);␊
+␉␉␉␉␉FSBFreq = (TSCFreq / bus_ratio_max);␊
 ␉␉␉␉}␊
 #endif␊
 ␉␉␉␉//valv: Turbo Ratio Limit␊
-␉␉␉␉if ((p->CPU.Model != 0x2e) && (p->CPU.Model != 0x2f))␊
+␉␉␉␉if ((Model != 0x2e) && (Model != 0x2f))␊
 ␉␉␉␉{␊
 ␉␉␉␉␉//msr = rdmsr64(MSR_TURBO_RATIO_LIMIT);␊
-␉␉␉␉␉cpuFrequency = bus_ratio_max * fsbFrequency;␊
+␉␉␉␉␉CPUFreq = bus_ratio_max * FSBFreq;␊
 ␉␉␉␉␉max_ratio = bus_ratio_max * 10;␊
 ␉␉␉␉}␊
 ␉␉␉␉else␊
 ␉␉␉␉{␊
 #ifdef LEGACY_CPU␊
-␉␉␉␉␉cpuFrequency = tscFrequency;␊
+␉␉␉␉␉CPUFreq = TSCFreq;␊
 #else␊
-␉␉␉␉␉cpuFrequency = bus_ratio_max * fsbFrequency;␊
+␉␉␉␉␉CPUFreq = bus_ratio_max * FSBFreq;␊
 #endif␊
 ␉␉␉␉}␉␉␉␉␉␉␉␉␊
 #if DEBUG_CPU␊
-␉␉␉␉DBG("Sticking with [BCLK: %dMhz, Bus-Ratio: %d]\n", fsbFrequency / 1000000, max_ratio);␊
+␉␉␉␉DBG("Sticking with [BCLK: %dMhz, Bus-Ratio: %d]\n", FSBFreq / 1000000, max_ratio);␊
 #endif␊
 ␉␉␉␉currcoef = bus_ratio_max;␊
                 ␊
-                tscFrequency = cpuFrequency;␊
+                TSCFreq = CPUFreq;␊
 ␉␉␉} ␊
 ␉␉␉else␊
 ␉␉␉{␊
 ␉␉␉␉/* Non-integer bus ratio for the current-multi (undocumented)*/␊
 ␉␉␉␉currdiv = (msr >> 14) & 0x01;␊
                 ␊
-␉␉␉␉if ((p->CPU.Family == 0x06 && p->CPU.Model >= 0x0e) || ␊
-␉␉␉␉␉(p->CPU.Family == 0x0f)) // This will always be model >= 3␊
+␉␉␉␉if ((Family == 0x06 && Model >= 0x0e) || ␊
+␉␉␉␉␉(Family == 0x0f)) // This will always be model >= 3␊
 ␉␉␉␉{␊
 ␉␉␉␉␉/* On these models, maxcoef defines TSC freq */␊
 ␉␉␉␉␉maxcoef = (msr >> 40) & 0x1f;␊
 ␉␉␉␉␉␊
 ␉␉␉␉␉if (maxdiv)␊
 ␉␉␉␉␉{␊
-␉␉␉␉␉␉fsbFrequency = ((tscFrequency * 2) / ((maxcoef * 2) + 1));␊
+␉␉␉␉␉␉FSBFreq = ((TSCFreq * 2) / ((maxcoef * 2) + 1));␊
 ␉␉␉␉␉}␊
 ␉␉␉␉␉else ␊
 ␉␉␉␉␉{␊
-␉␉␉␉␉␉fsbFrequency = (tscFrequency / maxcoef);␊
+␉␉␉␉␉␉FSBFreq = (TSCFreq / maxcoef);␊
 ␉␉␉␉␉}␊
 ␉␉␉␉␉␊
 ␉␉␉␉␉if (currdiv) ␊
 ␉␉␉␉␉{␊
-␉␉␉␉␉␉cpuFrequency = (fsbFrequency * ((currcoef * 2) + 1) / 2);␊
+␉␉␉␉␉␉CPUFreq = (FSBFreq * ((currcoef * 2) + 1) / 2);␊
 ␉␉␉␉␉}␊
 ␉␉␉␉␉else ␊
 ␉␉␉␉␉{␊
-␉␉␉␉␉␉cpuFrequency = (fsbFrequency * currcoef);␊
+␉␉␉␉␉␉CPUFreq = (FSBFreq * currcoef);␊
 ␉␉␉␉␉}␊
 #if DEBUG_CPU␊
 ␉␉␉␉␉DBG("max: %d%s current: %d%s\n", maxcoef, maxdiv ? ".5" : "",currcoef, currdiv ? ".5" : "");␊
 ␉␉␉␉␊
 ␉␉␉␉if (currdiv) ␊
 ␉␉␉␉{␊
-␉␉␉␉␉cpuFrequency = (fsbFrequency * ((currcoef * 2) + 1) / 2);␊
+␉␉␉␉␉CPUFreq = (FSBFreq * ((currcoef * 2) + 1) / 2);␊
 ␉␉␉␉}␊
 ␉␉␉␉else ␊
 ␉␉␉␉{␊
-␉␉␉␉␉cpuFrequency = (fsbFrequency * currcoef);␊
+␉␉␉␉␉CPUFreq = (FSBFreq * currcoef);␊
 ␉␉␉␉}␊
 ␉␉␉␉␊
 ␉␉␉␉if (maxcoef) ␊
 ␉␉␉␉{␊
 ␉␉␉␉␉if (maxdiv)␊
 ␉␉␉␉␉{␊
-␉␉␉␉␉␉tscFrequency  = (fsbFrequency * ((maxcoef * 2) + 1)) / 2;␊
+␉␉␉␉␉␉TSCFreq  = (FSBFreq * ((maxcoef * 2) + 1)) / 2;␊
 ␉␉␉␉␉}␊
 ␉␉␉␉␉else ␊
 ␉␉␉␉␉{␊
-␉␉␉␉␉␉tscFrequency = fsbFrequency * maxcoef;␊
+␉␉␉␉␉␉TSCFreq = FSBFreq * maxcoef;␊
 ␉␉␉␉␉}␊
 ␉␉␉␉}␉␉␉␉␉␉␉␉␊
 #if DEBUG_CPU␊
 ␉␉}␊
         /* Mobile CPU ? */ ␊
 ␉␉//Slice ␊
-␉    p->CPU.isMobile = false;␊
-␉␉switch (p->CPU.Model)␊
+␉    isMobile = false;␊
+␉␉switch (Model)␊
 ␉␉{␊
 ␉␉␉case 0x0D:␊
-␉␉␉␉p->CPU.isMobile = true; ␊
+␉␉␉␉isMobile = true; ␊
 ␉␉␉␉break;␉␉␉␊
 ␉␉␉case 0x02:␊
 ␉␉␉case 0x03:␊
 ␉␉␉case 0x04:␊
 ␉␉␉case 0x06:␉␊
-␉␉␉␉p->CPU.isMobile = (rdmsr64(0x2C) & (1 << 21));␊
+␉␉␉␉isMobile = (rdmsr64(0x2C) & (1 << 21));␊
 ␉␉␉␉break;␊
 ␉␉␉default:␊
-␉␉␉␉p->CPU.isMobile = (rdmsr64(0x17) & (1 << 28));␊
+␉␉␉␉isMobile = (rdmsr64(0x17) & (1 << 28));␊
 ␉␉␉␉break;␊
 ␉␉}␊
 ␊
-␉␉DBG("%s platform detected.\n", p->CPU.isMobile?"Mobile":"Desktop");␊
+␉␉DBG("%s platform detected.\n",isMobile?"Mobile":"Desktop");␊
 ␉}␊
 ␊
-␉if (!cpuFrequency) cpuFrequency = tscFrequency;␊
-    if (!tscFrequency) tscFrequency = cpuFrequency;␊
+␉if (!CPUFreq) CPUFreq = TSCFreq;␊
+    if (!TSCFreq) TSCFreq = CPUFreq;␊
     ␊
-␉p->CPU.MaxCoef = maxcoef;␊
-␉p->CPU.MaxDiv = maxdiv;␊
-␉p->CPU.CurrCoef = currcoef;␊
-␉p->CPU.CurrDiv = currdiv;␊
-␉␊
-    p->CPU.TSCFrequency = tscFrequency ;␊
-␉p->CPU.FSBFrequency = fsbFrequency ;␊
-␉p->CPU.CPUFrequency = cpuFrequency ;␊
+␉if (Vendor == CPUID_VENDOR_INTEL) {␊
+␉␉set_env(envDynamicAcceleration,  dynamic_acceleration);    ␊
+␉␉set_env(envInvariantAPICTimer,␉ invariant_APIC_timer);    ␊
+␉␉set_env(envFineGrainClockMod,  fine_grain_clock_mod);␊
+␉␉set_env(envMicrocodeVersion, MicrocodeVersion);  ␊
+␉␉set_env(envSubCstates,  sub_Cstates);␊
+␉}␉ ␊
+␉set_env(envVendor,          Vendor);␊
+    set_env(envModel,           Model);    ␊
+    set_env(envExtModel,        ExtModel);    ␊
     ␊
-␉DBG("CPU: Vendor/Model/ExtModel: 0x%x/0x%x/0x%x\n", p->CPU.Vendor, p->CPU.Model, p->CPU.ExtModel);␊
-␉DBG("CPU: Family/ExtFamily:      0x%x/0x%x\n", p->CPU.Family, p->CPU.ExtFamily);␊
-    if (p->CPU.Vendor == 0x68747541 /* AMD */)␊
-    {␊
-        DBG("CPU (AMD): TSCFreq:               %dMHz\n", p->CPU.TSCFrequency / 1000000);␊
-        DBG("CPU (AMD): FSBFreq:               %dMHz\n", p->CPU.FSBFrequency / 1000000);␊
-        DBG("CPU (AMD): CPUFreq:               %dMHz\n", p->CPU.CPUFrequency / 1000000);␊
-        DBG("CPU (AMD): MaxCoef/CurrCoef:      0x%x/0x%x\n", p->CPU.MaxCoef, p->CPU.CurrCoef);␊
-        DBG("CPU (AMD): MaxDiv/CurrDiv:        0x%x/0x%x\n", p->CPU.MaxDiv, p->CPU.CurrDiv);␊
-    }␊
-    else␊
-    {␊
-        DBG("CPU: TSCFreq:               %dMHz\n", p->CPU.TSCFrequency / 1000000);␊
-        DBG("CPU: FSBFreq:               %dMHz\n", p->CPU.FSBFrequency / 1000000);␊
-        DBG("CPU: CPUFreq:               %dMHz\n", p->CPU.CPUFrequency / 1000000);␊
-        DBG("CPU: MaxCoef/CurrCoef:      0x%x/0x%x\n", p->CPU.MaxCoef, p->CPU.CurrCoef);␊
-        DBG("CPU: MaxDiv/CurrDiv:        0x%x/0x%x\n", p->CPU.MaxDiv, p->CPU.CurrDiv);␉␉␊
-    }␉␊
-    ␊
-␉DBG("CPU: NoCores/NoThreads:     %d/%d\n", p->CPU.NoCores, p->CPU.NoThreads);␊
-␉DBG("CPU: Features:              0x%08x\n", p->CPU.Features);␊
-    DBG("CPU: ExtFeatures:           0x%08x\n", p->CPU.ExtFeatures);␊
-    ␊
-    if (p->CPU.Vendor == 0x756E6547 /* Intel */) ␊
-        DBG("CPU: MicrocodeVersion:      %d\n", p->CPU.MicrocodeVersion);␊
+␉set_env(envCPUIDMaxBasic, cpuid_max_basic);␊
+␉set_env(envCPUIDMaxBasic, cpuid_max_ext);␊
 ␊
-#if DEBUG_CPU␊
-␉pause();␊
-#endif␊
+    set_env_copy(envBrandString, CpuBrandString, sizeof(CpuBrandString));␊
+␉set_env(envSignature, Signature);    ␊
+␉set_env(envStepping,  Stepping);    ␊
+␉set_env(envFamily,␉ Family);    ␊
+␉set_env(envExtModel,  ExtModel);    ␊
+␉set_env(envExtFamily, ExtFamily);    ␊
+␉set_env(envBrand,␉ Brand);    ␊
+␉set_env(envFeatures,  Features);␊
+    set_env(envExtFeatures,  ExtFeatures);␊
+␊
+␉set_env(envExtensions,   extensions); ␊
+␊
+␉set_env(envNoThreads,␉ NoThreads);    ␊
+␉set_env(envNoCores,␉␉ NoCores);␊
+␉set_env(envIsMobile,␉␉ isMobile);␊
 ␉␊
+␉set_env(envMaxCoef,␉␉ maxcoef);    ␊
+␉set_env(envMaxDiv,␉␉ maxdiv);␊
+␉set_env(envCurrCoef,␉␉ currcoef);␊
+␉set_env(envCurrDiv,␉     currdiv);    ␊
+␉set_env(envTSCFreq,␉ TSCFreq);␊
+␉set_env(envFSBFreq,␉ FSBFreq);␊
+␉set_env(envCPUFreq,␉ CPUFreq);␊
+␉␊
 }␊

-659
660 660
661 661
662 
662
663 663
664 664
665 665
+␉␉␉case REBASE_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB:␊
␉␉␉{␊
␉␉␉␉// Locate address to begin rebasing␊
␉␉␉␉segmentAddress = 0;␊
␉␉␉␉//segmentAddress = 0;␊
␉␉␉␉␊
␉␉␉␉struct segment_command* segCommand = NULL; // NOTE: 32bit only␊
␉␉␉␉␊
 ␉␉␉case REBASE_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB:␊
 ␉␉␉{␊
 ␉␉␉␉// Locate address to begin rebasing␊
-␉␉␉␉segmentAddress = 0;␊
+␉␉␉␉//segmentAddress = 0;␊
 ␉␉␉␉␊
 ␉␉␉␉struct segment_command* segCommand = NULL; // NOTE: 32bit only␊
 ␉␉␉␉␊

-152
153 153
154 154
155
156
157
158
159
155 160
156 161
157 162
... ...
178 183
179 184
180 185
181 
186
182 187
183 188
184 189
+extern long ThinFatFile(void **binary, unsigned long *length);␊
extern long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize);␊
␊
/*␊
 * lzss.c␊
 */␊
extern int decompress_lzss(u_int8_t *dst, u_int8_t *src, u_int32_t srclen);␊
␊
/* memory.c */␊
long AllocateKernelMemory( long inSize );␊
#if UNUSED␊

extern BVRef  nbpScanBootVolumes(int biosdev, int *count);␊
#endif␊
␊
/* platform.h */␊
/* platform.c */␊
extern void scan_platform(void);␊
extern void SetgRootDevice(const char * str);␊
extern void Setgboardproduct(const char * str);␊
 ...
 extern long ThinFatFile(void **binary, unsigned long *length);␊
 extern long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize);␊
 ␊
+/*␊
+ * lzss.c␊
+ */␊
+extern int decompress_lzss(u_int8_t *dst, u_int8_t *src, u_int32_t srclen);␊
+␊
 /* memory.c */␊
 long AllocateKernelMemory( long inSize );␊
 #if UNUSED␊
 extern BVRef  nbpScanBootVolumes(int biosdev, int *count);␊
 #endif␊
 ␊
-/* platform.h */␊
+/* platform.c */␊
 extern void scan_platform(void);␊
 extern void SetgRootDevice(const char * str);␊
 extern void Setgboardproduct(const char * str);␊

-181
182 182
183 183
184 
185 
184
185
186 186
187 187
188 188
... ...
415 415
416 416
417 417
418 
418
419
419 420
420 421
421 422
... ...
425 426
426 427
427 428
428 
429 
430 
431 
429
432 430
433 
434 
431
432
435 433
436 434
437 435
... ...
454 452
455 453
456 454
457 
458 
459 
460 
455
456
457
458
459
461 460
462 461
463 462
464 
465 
463
464
466 465
467 466
468 467
469 468
470 469
471 470
472 
471
473 472
474 
473
475 474
476 475
477 476
... ...
481 480
482 481
483 482
484 
485 483
486 484
485
486
487 487
488 488
489 489
... ...
506 506
507 507
508 508
509 
509
510 510
511 511
512 512
513 513
514 514
515 
515
516 516
517 517
518 518
... ...
826 826
827 827
828 828
829 
829
830
831
832
833
830 834
831 835
832 836
+    outb(0x21, 0x01);␊
    outb(0xA1, 0x01);␊
    ␊
    outb(0x70,0x80); /* Disable NMI */␊
    ␊
␉outb(0x70, inb(0x70)|0x80); /* Disable NMI */  ␊
␉␊
␉outb(0x21, 0xff);   /* Maskout all interrupts Pic1 */␊
␉outb(0xa1, 0xff);   /* Maskout all interrupts Pic2 */␊
}␊

    bool     firstRun = true;    ␊
    int      devcnt = 0;␊
    int      bvCount = 0;␊
␊
␉int      BIOSDev = 0;␊
    long     gBootMode = kBootModeNormal; /* defaults to 0 == kBootModeNormal */␊
    ␊
    unsigned int allowBVFlags = kBVFlagSystemVolume|kBVFlagForeignBoot;␊
    unsigned int denyBVFlags = kBVFlagEFISystem;␊

    // the base code will result in a hang or kernel panic.␊
    gUnloadPXEOnExit = true;␊
#endif␊
    // Record the device that the booter was loaded from.␊
    safe_set_env(envgBIOSDev,biosdev & kBIOSDevMask);␊
␉␊
␉␊
    ␉␊
    // Setup VGA text mode.␊
    // Not sure if it is safe to call setVideoMode() before the␊
    // config table has been loaded. Call video_mode() instead.␊
    // It's unsafe to call setVideoMode() before the␊
    // bootargs is initialized, we call video_mode() instead.␊
#if DEBUG␊
    printf("before video_mode\n");␊
#endif␊

    // Scan and record the system's hardware information.␊
    scan_platform();␊
␉␊
    safe_set_env(envgBootMode, kBootModeNormal); /* defaults to 0 == kBootModeNormal */␊
    safe_set_env(envShouldboot, false);␊
    safe_set_env(envkCache, (uint32_t)gBootKernelCacheFile);␊
    safe_set_env(envMKextName, (uint32_t)gMKextName);␊
    set_env(envgBIOSDev, (BIOSDev = biosdev & kBIOSDevMask));    ␊
    set_env(envShouldboot, false);␊
    set_env(envkCache, (uint32_t)gBootKernelCacheFile);␊
    set_env(envMKextName, (uint32_t)gMKextName);␊
␉␊
    InitBootPrompt();␊
    ␊
    // First get info for boot volume.␊
    scanBootVolumes((int)get_env(envgBIOSDev), 0);␊
    bvChain = getBVChainForBIOSDev((int)get_env(envgBIOSDev));␊
    scanBootVolumes(BIOSDev, 0);␊
    bvChain = getBVChainForBIOSDev(BIOSDev);␊
    setBootGlobals(bvChain);␊
␉␊
    // Load Booter boot.plist config file␊
    status = loadBooterConfig();␊
␉␊
    {␊
        bool isServer = get_env(envIsServer);    ␊
        bool isServer = false;    ␊
        getBoolForKey(kIsServer, &isServer, DEFAULT_BOOT_CONFIG); // set this as soon as possible    ␊
        safe_set_env(envIsServer , isServer);␊
        set_env(envIsServer , isServer);␊
    }␊
␉␊
␊

␉␉{␊
            long gBootMode = kBootModeNormal;␊
␉␉␉gBootMode |= kBootModeQuiet;␊
            safe_set_env(envgBootMode, gBootMode);␊
␉␉}␊
␉}␉␊
    ␊
    set_env(envgBootMode, gBootMode);␉␊
␉␊
␉{␊
␉␉bool     instantMenu = false;␊

        // Create a list of partitions on device(s).␊
        if (ScanSingleDrive)␊
        {␊
            scanBootVolumes((int)get_env(envgBIOSDev), &bvCount);␊
            scanBootVolumes(BIOSDev, &bvCount);␊
        } ␊
        else ␊
#endif␊
        {␊
#if UNUSED␊
            scanDisks((int)get_env(envgBIOSDev), &bvCount);␊
            scanDisks(BIOSDev, &bvCount);␊
#else␊
            scanDisks();␊
#endif␊

␉␉else␊
␉␉{␊
            /* Won't return if successful. */␊
            ret = ExecKernel(binary);␊
            if ( ExecKernel(binary)) ␊
            {␊
                firstRun = true;␊
                continue;␊
            }␊
        }␊
    }␊
    ␊
 ...
 ...
 ...
 ...
 ...
 ...
     outb(0x21, 0x01);␊
     outb(0xA1, 0x01);␊
     ␊
-    outb(0x70,0x80); /* Disable NMI */␊
-    ␊
+␉outb(0x70, inb(0x70)|0x80); /* Disable NMI */  ␊
+␉␊
 ␉outb(0x21, 0xff);   /* Maskout all interrupts Pic1 */␊
 ␉outb(0xa1, 0xff);   /* Maskout all interrupts Pic2 */␊
 }␊
     bool     firstRun = true;    ␊
     int      devcnt = 0;␊
     int      bvCount = 0;␊
-␊
+␉int      BIOSDev = 0;␊
+    long     gBootMode = kBootModeNormal; /* defaults to 0 == kBootModeNormal */␊
     ␊
     unsigned int allowBVFlags = kBVFlagSystemVolume|kBVFlagForeignBoot;␊
     unsigned int denyBVFlags = kBVFlagEFISystem;␊
     // the base code will result in a hang or kernel panic.␊
     gUnloadPXEOnExit = true;␊
 #endif␊
-    // Record the device that the booter was loaded from.␊
-    safe_set_env(envgBIOSDev,biosdev & kBIOSDevMask);␊
-␉␊
-␉␊
+    ␉␊
     // Setup VGA text mode.␊
-    // Not sure if it is safe to call setVideoMode() before the␊
-    // config table has been loaded. Call video_mode() instead.␊
+    // It's unsafe to call setVideoMode() before the␊
+    // bootargs is initialized, we call video_mode() instead.␊
 #if DEBUG␊
     printf("before video_mode\n");␊
 #endif␊
     // Scan and record the system's hardware information.␊
     scan_platform();␊
 ␉␊
-    safe_set_env(envgBootMode, kBootModeNormal); /* defaults to 0 == kBootModeNormal */␊
-    safe_set_env(envShouldboot, false);␊
-    safe_set_env(envkCache, (uint32_t)gBootKernelCacheFile);␊
-    safe_set_env(envMKextName, (uint32_t)gMKextName);␊
+    set_env(envgBIOSDev, (BIOSDev = biosdev & kBIOSDevMask));    ␊
+    set_env(envShouldboot, false);␊
+    set_env(envkCache, (uint32_t)gBootKernelCacheFile);␊
+    set_env(envMKextName, (uint32_t)gMKextName);␊
+␉␊
     InitBootPrompt();␊
     ␊
     // First get info for boot volume.␊
-    scanBootVolumes((int)get_env(envgBIOSDev), 0);␊
-    bvChain = getBVChainForBIOSDev((int)get_env(envgBIOSDev));␊
+    scanBootVolumes(BIOSDev, 0);␊
+    bvChain = getBVChainForBIOSDev(BIOSDev);␊
     setBootGlobals(bvChain);␊
 ␉␊
     // Load Booter boot.plist config file␊
     status = loadBooterConfig();␊
 ␉␊
     {␊
-        bool isServer = get_env(envIsServer);    ␊
+        bool isServer = false;    ␊
         getBoolForKey(kIsServer, &isServer, DEFAULT_BOOT_CONFIG); // set this as soon as possible    ␊
-        safe_set_env(envIsServer , isServer);␊
+        set_env(envIsServer , isServer);␊
     }␊
 ␉␊
 ␊
 ␉␉{␊
             long gBootMode = kBootModeNormal;␊
 ␉␉␉gBootMode |= kBootModeQuiet;␊
-            safe_set_env(envgBootMode, gBootMode);␊
 ␉␉}␊
 ␉}␉␊
+    ␊
+    set_env(envgBootMode, gBootMode);␉␊
 ␉␊
 ␉{␊
 ␉␉bool     instantMenu = false;␊
         // Create a list of partitions on device(s).␊
         if (ScanSingleDrive)␊
         {␊
-            scanBootVolumes((int)get_env(envgBIOSDev), &bvCount);␊
+            scanBootVolumes(BIOSDev, &bvCount);␊
         } ␊
         else ␊
 #endif␊
         {␊
 #if UNUSED␊
-            scanDisks((int)get_env(envgBIOSDev), &bvCount);␊
+            scanDisks(BIOSDev, &bvCount);␊
 #else␊
             scanDisks();␊
 #endif␊
 ␉␉else␊
 ␉␉{␊
             /* Won't return if successful. */␊
-            ret = ExecKernel(binary);␊
+            if ( ExecKernel(binary)) ␊
+            {␊
+                firstRun = true;␊
+                continue;␊
+            }␊
         }␊
     }␊
     ␊

-53
54 54
55 55
56 
57 
58 
56
57
58
59 59
+␊
void InitBootPrompt(void)␊
{␊
    safe_set_env(envBootBanner,(uint32_t)bootBanner);␊
    safe_set_env(envBootPrompt,(uint32_t)bootPrompt);␊
    safe_set_env(envBootRescanPrompt,(uint32_t)bootRescanPrompt);␊
    set_env(envBootBanner,(uint32_t)bootBanner);␊
    set_env(envBootPrompt,(uint32_t)bootPrompt);␊
    set_env(envBootRescanPrompt,(uint32_t)bootRescanPrompt);␊
}␊
 ␊
 void InitBootPrompt(void)␊
 {␊
-    safe_set_env(envBootBanner,(uint32_t)bootBanner);␊
-    safe_set_env(envBootPrompt,(uint32_t)bootPrompt);␊
-    safe_set_env(envBootRescanPrompt,(uint32_t)bootRescanPrompt);␊
+    set_env(envBootBanner,(uint32_t)bootBanner);␊
+    set_env(envBootPrompt,(uint32_t)bootPrompt);␊
+    set_env(envBootRescanPrompt,(uint32_t)bootRescanPrompt);␊
 }␊

-56
57 57
58 58
59 
60 
61 
62 
63 
64 59
65 60
66 61
+#define ispunct(c)  (c == '.' || c == '-') //Azi: TODO - add more ponctuation characters as needed; at least these two, i need for PartNo.␊
␊
/*␊
 * lzss.c␊
 */␊
extern int decompress_lzss(u_int8_t *dst, u_int8_t *src, u_int32_t srclen);␊
␊
/*␊
 * string.c␊
 */␊
␊
 #define ispunct(c)  (c == '.' || c == '-') //Azi: TODO - add more ponctuation characters as needed; at least these two, i need for PartNo.␊
 ␊
 /*␊
- * lzss.c␊
- */␊
-extern int decompress_lzss(u_int8_t *dst, u_int8_t *src, u_int32_t srclen);␊
-␊
-/*␊
  * string.c␊
  */␊
 ␊

-28
29 29
30 30
31 
31
32 32
33 33
34 34
35 35
36 
36
37 37
38 38
39 39
+␊
SA_OBJS = qdivrem.o umoddi3.o udivdi3.o divdi3.o moddi3.o bzero.o bcopy.o prf.o printf.o zalloc.o\␊
␉string.o strtol.o \␊
␉setjmp.o qsort.o efi_tables.o lzss.o␊
␉setjmp.o qsort.o efi_tables.o ␊
␉␊
SFILES = setjmp.s bzero.s bcopy.s␊
CFILES = qdivrem.c umoddi3.c udivdi3.c divdi3.c moddi3.c prf.c printf.c zalloc.c \␊
␉string.c strtol.c \␊
␉qsort.c efi_tables.c lzss.c␊
␉qsort.c efi_tables.c ␊
␊
HFILES = memory.h␊
EXPORTED_HFILES = libsa.h memory.h␊
 ␊
 SA_OBJS = qdivrem.o umoddi3.o udivdi3.o divdi3.o moddi3.o bzero.o bcopy.o prf.o printf.o zalloc.o\␊
 ␉string.o strtol.o \␊
-␉setjmp.o qsort.o efi_tables.o lzss.o␊
+␉setjmp.o qsort.o efi_tables.o ␊
 ␉␊
 SFILES = setjmp.s bzero.s bcopy.s␊
 CFILES = qdivrem.c umoddi3.c udivdi3.c divdi3.c moddi3.c prf.c printf.c zalloc.c \␊
 ␉string.c strtol.c \␊
-␉qsort.c efi_tables.c lzss.c␊
+␉qsort.c efi_tables.c ␊
 ␊
 HFILES = memory.h␊
 EXPORTED_HFILES = libsa.h memory.h␊

Download the corresponding diff file