diff --git a/TempleOSCD/0000Boot/0000Kernel.BIN.C b/TempleOSCD/0000Boot/0000Kernel.BIN.C index 5601683..a9896d2 100644 Binary files a/TempleOSCD/0000Boot/0000Kernel.BIN.C and b/TempleOSCD/0000Boot/0000Kernel.BIN.C differ diff --git a/TempleOSCD/Adam/ADefine.HC b/TempleOSCD/Adam/ADefine.HC index bf6bb98..defe37d 100644 --- a/TempleOSCD/Adam/ADefine.HC +++ b/TempleOSCD/Adam/ADefine.HC @@ -11,7 +11,7 @@ U0 LoadDocDefines() //This is cut and replaced when I generate a distro. //See $LK,"DD_TEMPLEOS_LOC",A="FF:::/Demo/AcctExample/TOS/TOSDistro.HC,DD_TEMPLEOS_LOC"$. $TR-C,"LineRep"$ - $ID,4$DefinePrint("DD_TEMPLEOS_LOC","119,767"); + $ID,4$DefinePrint("DD_TEMPLEOS_LOC","119,747"); DefinePrint("DD_TEMPLEOS_LOC_OFFICIAL","81,933"); $ID,-4$ DefinePrint("DD_KERNEL","%08X",bfh); diff --git a/TempleOSCD/Compiler/Compiler.BIN b/TempleOSCD/Compiler/Compiler.BIN index 49d1311..d2e9c79 100644 Binary files a/TempleOSCD/Compiler/Compiler.BIN and b/TempleOSCD/Compiler/Compiler.BIN differ diff --git a/TempleOSCD/Demo/AcctExample/PersonalMenu.DD b/TempleOSCD/Demo/AcctExample/PersonalMenu.DD index bd72481..5c7c0f0 100644 --- a/TempleOSCD/Demo/AcctExample/PersonalMenu.DD +++ b/TempleOSCD/Demo/AcctExample/PersonalMenu.DD @@ -3,7 +3,7 @@ $MA,"MakeC ",LM="TOSBootHDIns('C');\n"$$MA+PU,"BootC ",LM="BootRAM(\"C:/Kern $MA,"Kernel ",LM="Cd(\"/Kernel\");Dir;\n"$$MA,"Compiler",LM="Cd(\"/Compiler\");Dir;\n"$$MA,"BlkDev ",LM="Cd(\"/Kernel/BlkDev\");Dir;\n"$$MA,"Mem ",LM="Cd(\"/Kernel/Mem\");Dir;\n"$$MA,"Serial ",LM="Cd(\"/Kernel/SerialDev\");Dir;\n"$$MA,"Bin ",LM="Cd(\"/Home/Sup1/Sup1Bin\");Dir;\n"$$MA,"HDAudio ",LM="Cd(\"/Home/Sup1/Sup1HDAudio\");Dir;\n"$$MA,"Examples",LM="Cd(\"/Home/Sup1/Sup1HDAudio/Examples\");Dir;\n"$$MA,"Dist ",LM="Cd(\"/Home/Sup1/Sup1Distro\");Dir;\n"$ $MA,"Adam ",LM="Cd(\"/Adam\");Dir;\n"$$MA,"AutoComp",LM="Cd(\"/Adam/AutoComplete\");Dir;\n"$$MA,"Ctrls ",LM="Cd(\"/Adam/Ctrls\");Dir;\n"$$MA,"ABlkDev ",LM="Cd(\"/Adam/ABlkDev\");Dir;\n"$$MA,"DolDoc ",LM="Cd(\"/Adam/DolDoc\");Dir;\n"$$MA,"Gr ",LM="Cd(\"/Adam/Gr\");Dir;\n"$$MA,"God ",LM="Cd(\"/Adam/God\");Dir;\n"$$MA,"Snd ",LM="Cd(\"/Adam/Snd\");Dir;\n"$$MA,"Boot ",LM="Cd(\"/Adam/Opt/Boot\");Dir;\n"$$MA,"Utils ",LM="Cd(\"/Adam/Opt/Utils\");Dir;\n"$ $LK+X,"ChgLog ",A="FI:::/Doc/ChgLog.DD"$$MA,"Blog ",LM="Blog;\n"$$MA,"EdGod ",LM="Ed(\"D:/Home/God.DD\");\n"$$MA,"BlogDir ",LM="Cd(\"/Home/Web/TAD/BlogDir\");Dir;\n"$$MA,"Partial ",LM="FreshenBlog;\n"$$MA,"CodeWalk",LM="CodeWalkThru;\n"$$MA,"TOSTheme",LM="TOSTheme;\n"$$MA,"Videos ",LM="Cd(\"/Home/Sup1/Sup1Videos\");Dir;\n"$ -$MA,"Web ",LM="Cd(\"/Home/Web\");Dir;\n"$$MA,"TAD ",LM="Cd(\"/Home/Web/TAD\");Dir;\n"$$MA,"DLC ",LM="Cd(\"/Home/Web/DLC\");Dir;\n"$$MA,"AppStore",LM="Cd(\"/Home/Web/AppStore\");Dir;\n"$$MA,"Sup1 ",LM="Cd(\"/Home/Sup1\");Dir;\n"$$MA,"Blog ",LM="Cd(\"/Home/Sup1/Sup1Blog\");Dir;\n"$$MA,"Code ",LM="Cd(\"/Home/Sup1/Sup1CodeScraps\");Dir;\n"$$MA,"Games ",LM="Cd(\"/Home/Sup1/Sup1Games\");Dir;\n"$$MA,"Graphics",LM="Cd(\"/Home/Sup1/Sup1Graphics\");Dir;\n"$$MA,"Utils ",LM="Cd(\"/Home/Sup1/Sup1Utils\");Dir;\n"$ +$MA,"Web ",LM="Cd(\"/Home/Web\");Dir;\n"$$MA,"TAD ",LM="Cd(\"/Home/Web/TAD\");Dir;\n"$$MA,"AppStore",LM="Cd(\"/Home/Web/AppStore\");Dir;\n"$$MA,"Sup1 ",LM="Cd(\"/Home/Sup1\");Dir;\n"$$MA,"Blog ",LM="Cd(\"/Home/Sup1/Sup1Blog\");Dir;\n"$$MA,"Code ",LM="Cd(\"/Home/Sup1/Sup1CodeScraps\");Dir;\n"$$MA,"Games ",LM="Cd(\"/Home/Sup1/Sup1Games\");Dir;\n"$$MA,"Graphics",LM="Cd(\"/Home/Sup1/Sup1Graphics\");Dir;\n"$$MA,"Utils ",LM="Cd(\"/Home/Sup1/Sup1Utils\");Dir;\n"$ $MA,"Apps ",LM="Cd(\"/Apps\");Dir;\n"$$MA,"Budget ",LM="Cd(\"/Apps/Budget\");Dir;\n"$$MA,"GrModels",LM="Cd(\"/Apps/GrModels\");Dir;\n"$$MA,"KeepAway",LM="Cd(\"/Apps/KeepAway\");Dir;\n"$$MA,"Logic ",LM="Cd(\"/Apps/Logic\");Dir;\n"$$MA,"Psalmody",LM="Cd(\"/Apps/Psalmody\");Dir;\n"$$MA,"Span ",LM="Cd(\"/Apps/Span\");Dir;\n"$$MA,"Strut ",LM="Cd(\"/Apps/Strut\");Dir;\n"$$MA,"TimeClk ",LM="Cd(\"/Apps/TimeClock\");Dir;\n"$ $MA,"Titan ",LM="Cd(\"/Apps/Titanium\");Dir;\n"$$MA,"ToTheFrt",LM="Cd(\"/Apps/ToTheFront\");Dir;\n"$$MA,"Vocab ",LM="Cd(\"/Apps/Vocabulary\");Dir;\n"$$MA,"XCaliber",LM="Cd(\"/Apps/X-Caliber\");Dir;\n"$$MA,"Books1 ",LM="Cd(\"/Home/Books1\");Dir;\n"$$MA,"Books2 ",LM="Cd(\"/Home/Books2\");Dir;\n"$$MA,"Hymns ",LM="Cd(\"/Home/Sup1/Sup1Hymns\");Dir;\n"$$MA,"Songs ",LM="Cd(\"/Home/Sup1/Sup1Songs\");Dir;\n"$ $MA,"Demo ",LM="Cd(\"/Demo\");Dir;\n"$$MA,"AcctEmpl",LM="Cd(\"/Demo/AcctExample\");Dir;\n"$$MA,"Asm ",LM="Cd(\"/Demo/Asm\");Dir;\n"$$MA,"DocDoc ",LM="Cd(\"/Demo/DolDoc\");Dir;\n"$$MA,"Dsk ",LM="Cd(\"/Demo/Dsk\");Dir;\n"$$MA,"Games ",LM="Cd(\"/Demo/Games\");Dir;\n"$$MA,"Graphics",LM="Cd(\"/Demo/Graphics\");Dir;\n"$$MA,"InFile ",LM="Cd(\"/Demo/InFile\");Dir;\n"$$MA,"Lectures",LM="Cd(\"/Demo/Lectures\");Dir;\n"$$MA,"MultCore",LM="Cd(\"/Demo/MultiCore\");Dir;\n"$ diff --git a/TempleOSCD/Demo/AcctExample/PersonalNotes.DD b/TempleOSCD/Demo/AcctExample/PersonalNotes.DD index 21ce158..be1ed6d 100644 --- a/TempleOSCD/Demo/AcctExample/PersonalNotes.DD +++ b/TempleOSCD/Demo/AcctExample/PersonalNotes.DD @@ -453,7 +453,6 @@ I made dis $HC,"
\"\"
"$ Purple Frog $HC,"
\"\"
"$ Casino (Dog) $HC,"
\"\"
"$ -Dianna's Cross $HC,""$ $TX,"SimStructure",HTML="http://www.templeos.org/files/SimStrSetUp.zip"$ diff --git a/TempleOSCD/Demo/AcctExample/Registry.HC b/TempleOSCD/Demo/AcctExample/Registry.HC index 6f11399..12e32a3 100644 --- a/TempleOSCD/Demo/AcctExample/Registry.HC +++ b/TempleOSCD/Demo/AcctExample/Registry.HC @@ -62,7 +62,7 @@ $ID,-2$$TR,"Titanium"$ $ID,2$I64 best_score=16469; $ID,-2$$TR,"TOSRegen"$ $ID,2$progress1_tf=0.000;progress2_tf=0.000; -progress3_tf=0.000;progress4_tf=199.386; +progress3_tf=0.000;progress4_tf=188.360; $ID,-2$$ID,-2$$TR,"Once"$ $ID,2$$TR,"Adam"$ $ID,2$$ID,-2$$TR,"User"$ diff --git a/TempleOSCD/Demo/AcctExample/TOS/TOSHolySpirit.HC b/TempleOSCD/Demo/AcctExample/TOS/TOSHolySpirit.HC index d3af6e1..de8c49e 100644 --- a/TempleOSCD/Demo/AcctExample/TOS/TOSHolySpirit.HC +++ b/TempleOSCD/Demo/AcctExample/TOS/TOSHolySpirit.HC @@ -445,7 +445,7 @@ U0 TimerGodIns() FifoU8Flush(god.fifo); GodBitsIns(GOD_GOOD_BITS,KbdMsEvtTime>>GOD_BAD_BITS); switch (PopUpPickLst("Hex5Bible\0Hex8Books\0Doodle\0Movie100\0Painting100\0" - "Painting1000\0Metallica\0PhysisGirl\0")) { + "Painting1000\0Metallica\0")) { case: StrPrint(buf,"%05X",GodBits(5*4)); "$$TX,\"How this random Bible passage was chosen.\"," @@ -486,9 +486,6 @@ U0 TimerGodIns() "metallica/songindex.html", buf,2,"~/Sup1/Sup1Blog/Metallica.DD.Z"); break; - case: - GodVideoU32(GodBits(32),"~/Sup1/Sup1Blog/PhysicsGirl.DD.Z"); - break; } } @@ -515,7 +512,7 @@ public U0 GodIns() "$$TX,\"%$$Q\",HTML=\"%$$Q\"$$\n",tag,tag; switch (PopUpPickLst("ExtDec5Bible\0LinuxWords\0" "HappyWords\0Hex5Bible\0Hex8Books\0Doodle\0Movie100\0" - "Painting100\0Painting1000\0Metallica\0PhysicsGirl\0")) { + "Painting100\0Painting1000\0Metallica\0")) { case: if (DocForm(gm(CRandExtDec5Form *))) TOSBookLines("~/Sup1/Sup1Blog/NumBible.TXT",ST_BIBLE_LINES, @@ -583,11 +580,6 @@ public U0 GodIns() "metallica/songindex.html", gm->rnd0,2,"~/Sup1/Sup1Blog/Metallica.DD.Z"); break; - case: - if (DocForm(gm(CRandHex8Form *))) - GodVideoU32(Str2I64(gm->rnd0,16), - "~/Sup1/Sup1Blog/PhysicsGirl.DD.Z"); - break; } break; start: @@ -606,7 +598,7 @@ public U0 GodIns() GodHeaderIns; "$$TX,\"%$$Q\",HTML=\"%$$Q\"$$\n",tag,tag; switch (PopUpPickLst("ExtDec5Bible\0HexWordBatch\0" - "Hex5Bible\0Hex8Books\0Movie100\0Metallica\0PhysicsGirl\0")) { + "Hex5Bible\0Hex8Books\0Movie100\0Metallica\0")) { case: if (DocForm(gm(CRandExtDec5Form *))) TOSBookLines("~/Sup1/Sup1Blog/NumBible.TXT",ST_BIBLE_LINES, @@ -647,11 +639,6 @@ public U0 GodIns() "metallica/songindex.html", gm->rnd0,2,"~/Sup1/Sup1Blog/Metallica.DD.Z"); break; - case: - if (DocForm(gm(CRandHex8Form *))) - GodVideoU32(Str2I64(gm->rnd0,16), - "~/Sup1/Sup1Blog/PhysicsGirl.DD.Z"); - break; } break; case GSRC_VIRTUAL_NOTARY: diff --git a/TempleOSCD/Demo/AcctExample/TOS/TOSNIST.HC b/TempleOSCD/Demo/AcctExample/TOS/TOSNIST.HC index e27caf2..cb0c246 100644 --- a/TempleOSCD/Demo/AcctExample/TOS/TOSNIST.HC +++ b/TempleOSCD/Demo/AcctExample/TOS/TOSNIST.HC @@ -49,7 +49,7 @@ U0 NISTGodIns1() { tos_type=PopUpPickLst("ExtDec5Bible\0LinuxWords\0HappyWords\0" "Hex5Bible\0Hex8Books\0Doodle\0Movie100\0Painting100\0Painting1000\0" - "Metallica\0PhysicsGirl\0"); + "Metallica\0"); switch (tos_type) { case: tos_timestamp=GodHeaderIns("Bible"); break; case: tos_timestamp=GodHeaderIns("LinuxWords"); break; @@ -61,7 +61,6 @@ U0 NISTGodIns1() case: tos_timestamp=GodHeaderIns("Painting100"); break; case: tos_timestamp=GodHeaderIns("Painting1000"); break; case: tos_timestamp=GodHeaderIns("Metallica"); break; - case: tos_timestamp=GodHeaderIns("PhysicsGirl"); break; } Once("tos_timestamp=%d;\ntos_type=%d;\n" "In(\"Blog(TRUE);\n\");",tos_timestamp,tos_type); @@ -154,12 +153,6 @@ U0 NISTGodIns2() gm->rnd0,2,"~/Sup1/Sup1Blog/Metallica.DD.Z"); } break; - case: - if (DocForm(gm(CRandHex8Form *))) { - NISTBeaconURL(gm->timestamp); - GodVideoU32(Str2I64(gm->rnd0,16),"~/Sup1/Sup1Blog/PhysicsGirl.DD.Z"); - } - break; } Free(gm); } diff --git a/TempleOSCD/Demo/ToHtmlToTXTDemo/DemoInPage.DD b/TempleOSCD/Demo/ToHtmlToTXTDemo/DemoInPage.DD index 8f8bfec..d509af8 100644 --- a/TempleOSCD/Demo/ToHtmlToTXTDemo/DemoInPage.DD +++ b/TempleOSCD/Demo/ToHtmlToTXTDemo/DemoInPage.DD @@ -16,7 +16,7 @@ $TX,"Source Code By Sym",HTML="http://www.templeos.org/Wb/Home/Web/SymsAlpha.htm $LK,"TempleOS Credits",A="FI:::/Doc/Credits.DD"$ $LK,"History of TempleOS",A="FI:~/Web/History.DD"$ -$LK,"Why 640x480?",A="FI:~/Web/640x480.DD"$ $LK,"Dianna Cowern",A="FI:~/Web/DLC/DLC.DD"$ +$LK,"Why 640x480?",A="FI:~/Web/640x480.DD"$ $FG$ $LK,"Change Log",A="FI:::/Doc/ChgLog.DD"$ $LK,"Terry Davis",A="FI:~/Web/TAD/TAD.DD"$ @@ -28,7 +28,7 @@ TempleOS is a free, public domain, open source, $FG,4$$TX,"x86_64",HTML="http:// The CIA encourages code obsfucation. They make it more complicated than necessary. TempleOS is, literally, more simple than necessary. It is obnoxiously simple... to the point it hurts. -This $TX,"\"Hello World\" joke",HTML="http://www.infiltec.com/j-h-wrld.htm"$, the $TX,"BMP file format",HTML="http://en.wikipedia.org/wiki/BMP_file_format"$ and the $TX,"WAV file format",HTML="http://en.wikipedia.org/wiki/WAV"$ show that the industry is really screwed-up! That's what TempleOS fixes. I capped the line-of-code count at 100,000 and God said it must be perfect, so it will never be an ugly monstrocity. It is currently $TX,"81,432",D="DD_TEMPLEOS_LOC_OFFICIAL"$ lines of unblemished code. Backward compatibility is not promised. +This $TX,"\"Hello World\" joke",HTML="http://www.infiltec.com/j-h-wrld.htm"$, the $TX,"BMP file format",HTML="http://en.wikipedia.org/wiki/BMP_file_format"$ and the $TX,"WAV file format",HTML="http://en.wikipedia.org/wiki/WAV"$ show that the industry is really screwed-up! That's what TempleOS fixes. I capped the line-of-code count at 100,000 and God said it must be perfect, so it will never be an ugly monstrocity. It is currently $TX,"81,933",D="DD_TEMPLEOS_LOC_OFFICIAL"$ lines of unblemished code. Backward compatibility is not promised. Normally, failure is not an option, but since TempleOS accompanies Windows or Linux, we exclude certain uses. There is no reason to duplicate browsing, multimedia, desktop publishing, etc. Linux wants to be a secure, multi-user mainframe. That's why it has file permissions. The vision for TempleOS, however, is a modern, 64-bit Commodore 64. The C64 was a non-networked, home computer mostly used for games. It trained my generation how to program because it was wide open, completely hackable. The games were not multimedia works of art, but generated by non-artist. @@ -44,7 +44,7 @@ $HC,""$ -I wrote all $LK,"121,216",A="FF:~/Web/LineRep.DD,Kernel.PRJ",D="DD_TEMPLEOS_LOC"$ lines of TempleOS over the last $TX,"13.4",D="DD_TEMPLEOS_AGE"$ years, full-time, including the 64-bit compiler. It was called, at various times, "$FG,4$$TX,"Hoppy",HTML="http://web.archive.org/web/*/http://www.simstructure.hare.com/*"$$FG$", "$FG,4$$TX,"The J Operating System",HTML="http://wayback.archive.org/web/*/http://www.justrighteous.org/*"$$FG$", "$FG,4$$TX,"LoseThos",HTML="http://web.archive.org/web/*/http://www.losethos.com/*"$$FG$" and "$FG,4$$TX,"SparrowOS",HTML="http://web.archive.org/web/*/http://www.sparrowos.com/*"$$FG$". Here are my $FG,4$$TX,"college transcripts",HTML="http://www.templeos.org/files/ASU_Transcripts.pdf"$$FG$. I've been a professional operating system developer since 1990 when I was hired to work on Ticketmaster's VAX OS. +I wrote all $LK,"119,767",A="FF:~/Web/LineRep.DD,Kernel.PRJ",D="DD_TEMPLEOS_LOC"$ lines of TempleOS over the last $TX,"13.5",D="DD_TEMPLEOS_AGE"$ years, full-time, including the 64-bit compiler. It was called, at various times, "$FG,4$$TX,"Hoppy",HTML="http://web.archive.org/web/*/http://www.simstructure.hare.com/*"$$FG$", "$FG,4$$TX,"The J Operating System",HTML="http://wayback.archive.org/web/*/http://www.justrighteous.org/*"$$FG$", "$FG,4$$TX,"LoseThos",HTML="http://web.archive.org/web/*/http://www.losethos.com/*"$$FG$" and "$FG,4$$TX,"SparrowOS",HTML="http://web.archive.org/web/*/http://www.sparrowos.com/*"$$FG$". Here are my $FG,4$$TX,"college transcripts",HTML="http://www.templeos.org/files/ASU_Transcripts.pdf"$$FG$. I've been a professional operating system developer since 1990 when I was hired to work on Ticketmaster's VAX OS. $FG,8$ * "Commodore 64" is a trademark owned by Polabe Holding NV. diff --git a/TempleOSCD/Doc/ChgLog.DD b/TempleOSCD/Doc/ChgLog.DD index 2ac5f0d..71bee8f 100644 --- a/TempleOSCD/Doc/ChgLog.DD +++ b/TempleOSCD/Doc/ChgLog.DD @@ -2,7 +2,7 @@ $WW,1$$FG,5$$TX+CX,"Change Log"$$FG$ Use $LK,"R",A="MN:R"$() to rename if I change a label. -$IV,1$----01/22/17 17:18:21----$IV,0$ +$IV,1$----01/22/17 23:22:17----$IV,0$ $IV,1$----01/22/17 06:08:00----$IV,0$ * $BK,1$TempleOS version 5.02 Released$BK,0$ diff --git a/TempleOSCD/Kernel/KernelC.HH b/TempleOSCD/Kernel/KernelC.HH index 2a660ae..9723bb8 100644 --- a/TempleOSCD/Kernel/KernelC.HH +++ b/TempleOSCD/Kernel/KernelC.HH @@ -38,6 +38,7 @@ char_bmp_zero_tab_cr_nl_cursor_dollar[16], char_bmp_macro[16], char_bmp_printable[16], char_bmp_displayable[16], char_bmp_safe_dollar[16], char_bmp_filename[16], char_bmp_non_eol[16]; + #help_index "Char/Conversion" public extern U8 *Char2KeyName(I64 ch,Bool include_ctrl=TRUE); public extern I64 Char2ScanCode(I64 ch,I64 sc_flags=0); @@ -227,7 +228,6 @@ public extern U0 VGAFlush(); #help_index "Debugging;Debugging/Debugger" public extern U0 Dbg(U8 *msg=NULL,I64 msg_num=0); public extern U0 Panic(U8 *msg=NULL,I64 msg_num=0,Bool panic=TRUE); - #help_index "Define;Char/Define" #help_file "::/Doc/Define" public extern U8 *Define(U8 *dname);