git-svn-id: https://spexeah.com:8443/svn/Asuro@655 6dbc8c32-bb84-406f-8558-d1cf31a0ab0c

2018-05-03 23:43:24 +00:00
parent 6ae51ac70d
commit 42d23dd8c9
58 changed files with 30 additions and 6 deletions
--- a/Asuro.iso
+++ b/Asuro.iso
--- a/bin/kernel.bin
+++ b/bin/kernel.bin
--- a/iso/boot/asuro.bin
+++ b/iso/boot/asuro.bin
--- a/lib/ACE.ppu
+++ b/lib/ACE.ppu
--- a/lib/BPE.ppu
+++ b/lib/BPE.ppu
--- a/lib/BTSSE.ppu
+++ b/lib/BTSSE.ppu
--- a/lib/CFE.ppu
+++ b/lib/CFE.ppu
--- a/lib/CSOE.ppu
+++ b/lib/CSOE.ppu
--- a/lib/DBGE.ppu
+++ b/lib/DBGE.ppu
--- a/lib/DBZ.ppu
+++ b/lib/DBZ.ppu
--- a/lib/DFE.ppu
+++ b/lib/DFE.ppu
--- a/lib/E1000.ppu
+++ b/lib/E1000.ppu
--- a/lib/GPF.ppu
+++ b/lib/GPF.ppu
--- a/lib/IDE.ppu
+++ b/lib/IDE.ppu
--- a/lib/IDOE.ppu
+++ b/lib/IDOE.ppu
--- a/lib/IOPE.ppu
+++ b/lib/IOPE.ppu
--- a/lib/MCE.ppu
+++ b/lib/MCE.ppu
--- a/lib/NCE.ppu
+++ b/lib/NCE.ppu
--- a/lib/NMIE.ppu
+++ b/lib/NMIE.ppu
--- a/lib/OOBE.ppu
+++ b/lib/OOBE.ppu
--- a/lib/PCI.ppu
+++ b/lib/PCI.ppu
--- a/lib/PF.ppu
+++ b/lib/PF.ppu
--- a/lib/PS2_KEYBOARD_ISR.ppu
+++ b/lib/PS2_KEYBOARD_ISR.ppu
--- a/lib/RTC.ppu
+++ b/lib/RTC.ppu
--- a/lib/SFE.ppu
+++ b/lib/SFE.ppu
--- a/lib/SNPE.ppu
+++ b/lib/SNPE.ppu
--- a/lib/TMR_0_ISR.ppu
+++ b/lib/TMR_0_ISR.ppu
--- a/lib/UIE.ppu
+++ b/lib/UIE.ppu
--- a/lib/USB.ppu
+++ b/lib/USB.ppu
--- a/lib/arp.ppu
+++ b/lib/arp.ppu
--- a/lib/asuro.ppu
+++ b/lib/asuro.ppu
--- a/lib/console.ppu
+++ b/lib/console.ppu
--- a/lib/cpu.ppu
+++ b/lib/cpu.ppu
--- a/lib/drivermanagement.ppu
+++ b/lib/drivermanagement.ppu
--- a/lib/fat32.ppu
+++ b/lib/fat32.ppu
--- a/lib/idt.ppu
+++ b/lib/idt.ppu
--- a/lib/ipv4.ppu
+++ b/lib/ipv4.ppu
--- a/lib/irq.ppu
+++ b/lib/irq.ppu
--- a/lib/isrmanager.ppu
+++ b/lib/isrmanager.ppu
--- a/lib/kernel.ppu
+++ b/lib/kernel.ppu
--- a/lib/keyboard.ppu
+++ b/lib/keyboard.ppu
--- a/lib/libpconsole.a
+++ b/lib/libpconsole.a
--- a/lib/libpmultiboot.a
+++ b/lib/libpmultiboot.a
--- a/lib/libpsystem.a
+++ b/lib/libpsystem.a
--- a/lib/lists.ppu
+++ b/lib/lists.ppu
--- a/lib/lmemorymanager.ppu
+++ b/lib/lmemorymanager.ppu
--- a/lib/mouse.ppu
+++ b/lib/mouse.ppu
--- a/lib/netutils.ppu
+++ b/lib/netutils.ppu
--- a/lib/pmemorymanager.ppu
+++ b/lib/pmemorymanager.ppu
--- a/lib/serial.ppu
+++ b/lib/serial.ppu
--- a/lib/storagemanagement.ppu
+++ b/lib/storagemanagement.ppu
--- a/lib/strings.ppu
+++ b/lib/strings.ppu
--- a/lib/terminal.ppu
+++ b/lib/terminal.ppu
--- a/lib/tracer.ppu
+++ b/lib/tracer.ppu
--- a/lib/util.ppu
+++ b/lib/util.ppu
--- a/lib/vmemorymanager.ppu
+++ b/lib/vmemorymanager.ppu
--- a/src/cpu.pas
+++ b/src/cpu.pas
@@ -78,6 +78,7 @@ type
    end;
    TClockSpeed = record
        Hz  : uint32;
+        KHz : uint32;
        MHz : uint32;
        GHz : uint32;
    end;
@@ -154,19 +155,24 @@ end;
 procedure getCPUClockSpeed;
 var
    t1, t2 : TDateTime;
+    c1, c2 : uint64;
    c : uint32;
    
-
 begin
    c:= 0;
-    t1:= getDateTime;
-    t2:= getDateTime;
-    while (t1.Seconds = t2.Seconds) do begin
-        inc(c);
+    if CPUID.Capabilities0^.TSC then begin
+        t1:= getDateTime;
        t2:= getDateTime;
+        c1:= getTSC;
+        while (t1.Seconds = t2.Seconds) do begin
+            t2:= getDateTime;
+        end;
+        c2:= getTSC;
+        c:= c2 - c1;
    end;
    CPUID.ClockSpeed.Hz:= c;
-    CPUID.ClockSpeed.MHz:= CPUID.ClockSpeed.Hz div 1000;
+    CPUID.ClockSpeed.KHz:= CPUID.ClockSpeed.Hz div 1000;
+    CPUID.ClockSpeed.MHz:= CPUID.ClockSpeed.KHz div 1000;
    CPUID.ClockSpeed.GHz:= CPUID.ClockSpeed.MHz div 1000;
 end;

--- a/src/include/util.pas
+++ b/src/include/util.pas
@@ -49,6 +49,7 @@ procedure sleep(seconds : uint32);
 function get16bitcounter : uint16;
 function get32bitcounter : uint32;
 function get64bitcounter : uint64;
+function getTSC : uint64;

 function BCDToUint8(bcd : uint8) : uint8;

@@ -358,6 +359,23 @@ begin
    get64bitcounter:= bios_data_area.Counters.c64;
 end;

+function getTSC : uint64;
+var
+    hi, lo : uint32;
+
+begin
+    asm
+        PUSH EAX
+        PUSH EDX
+        RDTSC
+        MOV hi, EDX
+        MOV lo, EAX
+        POP EDX
+        POP EAX
+    end;
+    getTSC:= (hi SHL 32) OR lo;
+end;
+
 procedure BSOD(fault : pchar; info : pchar);
 var
    trace : pchar;