diff --git a/Asuro.iso b/Asuro.iso index 747390e9..65d4960d 100644 Binary files a/Asuro.iso and b/Asuro.iso differ diff --git a/bin/kernel.bin b/bin/kernel.bin index ed5c87b6..1aa6abcf 100755 Binary files a/bin/kernel.bin and b/bin/kernel.bin differ diff --git a/iso/boot/asuro.bin b/iso/boot/asuro.bin index ed5c87b6..1aa6abcf 100755 Binary files a/iso/boot/asuro.bin and b/iso/boot/asuro.bin differ diff --git a/lib/asuro.ppu b/lib/asuro.ppu index 7540f6f9..f42ff494 100644 Binary files a/lib/asuro.ppu and b/lib/asuro.ppu differ diff --git a/lib/cpu.ppu b/lib/cpu.ppu index 3c9e236b..0a617f3f 100644 Binary files a/lib/cpu.ppu and b/lib/cpu.ppu differ diff --git a/lib/libpconsole.a b/lib/libpconsole.a index 994b8896..c11f95b6 100644 Binary files a/lib/libpconsole.a and b/lib/libpconsole.a differ diff --git a/lib/libpmultiboot.a b/lib/libpmultiboot.a index 595f0513..bf162fec 100644 Binary files a/lib/libpmultiboot.a and b/lib/libpmultiboot.a differ diff --git a/lib/libpsystem.a b/lib/libpsystem.a index da64bfbe..ac6b7b71 100644 Binary files a/lib/libpsystem.a and b/lib/libpsystem.a differ diff --git a/lib/terminal.ppu b/lib/terminal.ppu index 2189b564..04b689a0 100644 Binary files a/lib/terminal.ppu and b/lib/terminal.ppu differ diff --git a/src/cpu.pas b/src/cpu.pas index 7ac59cfa..5a0329ec 100644 --- a/src/cpu.pas +++ b/src/cpu.pas @@ -163,7 +163,7 @@ begin if CPUID.Capabilities0^.TSC then begin t1:= getDateTime; t2:= getDateTime; - c2:= 0; + c1:= getTSC; while (t1.Seconds = t2.Seconds) do begin t2:= getDateTime; c1:= getTSC; diff --git a/src/include/asuro.pas b/src/include/asuro.pas index de9f0ed4..6722d7f7 100644 --- a/src/include/asuro.pas +++ b/src/include/asuro.pas @@ -9,6 +9,7 @@ const VERSION_SUB = '0'; REVISION = '653'; RELEASE = 'a'; + LINE_COUNT = 26780; implementation diff --git a/src/prog/terminal.pas b/src/prog/terminal.pas index 6e6909e6..c989107f 100644 --- a/src/prog/terminal.pas +++ b/src/prog/terminal.pas @@ -207,6 +207,8 @@ end; procedure version(params : PParamList); begin console.writestringlnWND(asuro.VERSION, TERMINAL_HWND); + console.writestringWND('Line Count: ', TERMINAL_HWND); + console.writeintlnWND(LINE_COUNT, TERMINAL_HWND); end; procedure help(params : PParamList); diff --git a/versioning.sh b/versioning.sh index 294fc013..25ac1d2b 100755 --- a/versioning.sh +++ b/versioning.sh @@ -6,6 +6,7 @@ while IFS=: read -r line;do minor=$(echo $line | awk '{print $2}') sub=$(echo $line | awk '{print $3}') release=$(echo $line | awk '{print $4}') + linecount=$(./loc.sh | awk '{print $1}') done <"$file" revision=$(svn info | grep Revision | awk '{print $2}') echo $major"."$minor"."$sub"-r"$revision$release @@ -20,6 +21,7 @@ echo " VERSION_MINOR = '$minor';" >> $outfile echo " VERSION_SUB = '$sub';" >> $outfile echo " REVISION = '$revision';" >> $outfile echo " RELEASE = '$release';" >> $outfile +echo " LINE_COUNT = $linecount;" >> $outfile echo " " >> $outfile echo "implementation" >> $outfile echo " " >> $outfile