Skip to content

Commit

Permalink
TempleOS V5.03 Nightly (ISO SHA-1 1a1ec79)
Browse files Browse the repository at this point in the history
  • Loading branch information
Terry A. Davis authored and ohnxbot committed Sep 9, 2018
1 parent 07a766f commit 1dd8859
Show file tree
Hide file tree
Showing 10 changed files with 92 additions and 110 deletions.
Binary file modified 0000Boot/0000Kernel.BIN.C
Binary file not shown.
2 changes: 1 addition & 1 deletion Adam/ADefine.HC
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ U0 LoadDocDefines()
//$LK,"DD_BOOT_HIGH_LOC_DVD",A="FF:::/Adam/Opt/Boot/BootDVD.HC,DD_BOOT_HIGH_LOC_DVD"$

$TR,"LineRep"$
$ID,2$DefinePrint("DD_TEMPLEOS_LOC","80,871");
$ID,2$DefinePrint("DD_TEMPLEOS_LOC","80,849");
$ID,-2$
DefinePrint("DD_MP_VECT","%08X",MP_VECT_ADDR);
DefinePrint("DD_MP_VECT_END","%08X",
Expand Down
19 changes: 4 additions & 15 deletions Adam/God/GodSong.HC
Original file line number Diff line number Diff line change
Expand Up @@ -161,22 +161,11 @@ public U8 *GodSongStr()
return buf;
}

public U8 *GodSongStdStr()
{//Make std God generate song. (2measuresx2+2measuresx2).
U8 *st=NULL,*st1=GodSongStr,*st2=GodSongStr;
public U0 GodSong()
{//Make God generate 2measuresx2+2measuresx2. $LK+PU,"Holy Spirit Instructions",A="FI:::/Adam/God/HSNotes.DD"$
U8 *st1=GodSongStr,*st2=GodSongStr;
if (st1 && st2)
st=MStrPrint("%s%s%s%s",st1,st1,st2,st2);
DocPrint(DocPut,"$$SO,\"<Song>\",A=\"%s%s%s%s\"$$",st1,st1,st2,st2);
Free(st1);
Free(st2);
return st;
}

#help_index "God;DolDoc"
public U0 DocInsGodSongStd(CDoc *doc=NULL)
{//Ins Std God generate song.
U8 *st;
if (!doc) doc=DocPut;
if (st=GodSongStdStr)
DocPrint(doc,"$$SO,\"<Song>\",A=\"%s\"$$",st);
Free(st);
}
Binary file modified Compiler/Compiler.BIN
Binary file not shown.
2 changes: 1 addition & 1 deletion Demo/AcctExample/PersonalNotes.DD
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ $WW,1$$FG,5$$TX+CX,"TODO"$$FG$

* 10/28/17 Titanium froze, easy repeatable

* Corrupt ISO.C
* Corrupt ISO.C, might be fix--no longer dependent on direntry ISO filesize

* DskChk CDROM

Expand Down
8 changes: 4 additions & 4 deletions Demo/AcctExample/Registry.HC
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ $ID,-2$$TR,"Wenceslas"$
$ID,2$F64 best_score=43.9944;
$ID,-2$$TR,"OSTestSuite"$
$ID,2$progress1_tf=0.000;progress2_tf=0.000;
progress3_tf=0.000;progress4_tf=227.120;
progress3_tf=0.000;progress4_tf=226.523;
$ID,-2$$TR,"XCaliber"$
$ID,2$I64 best_score=90;
I64 msg_flags=2;
Expand All @@ -60,17 +60,17 @@ $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=92.922;
progress3_tf=0.000;progress4_tf=116.067;
$ID,-2$$TR,"TempleTetris"$
$ID,2$I64 hiscore=0;
$ID,-2$$ID,-2$$TR,"Once"$
$ID,2$$TR,"Adam"$
$ID,2$$ID,-2$$TR,"User"$
$ID,2$$ID,-2$$ID,-2$$TR,"DemoCompany"$
$ID,2$$TR,"Game1"$
$ID,2$F64 best_score=200.29423;
$ID,2$F64 best_score=189.85507;
$TR,"SimpleVal"$
$ID,2$1247;
$ID,2$1248;
$ID,-2$$ID,-2$$ID,-2$$TR,"WalnutZone"$
$ID,2$$TR,"Cherub"$
$ID,2$#define rom_path M:/SnailNet
Expand Down
3 changes: 0 additions & 3 deletions Kernel/BlkDev/DskBlkDev.HC
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,9 @@ Bool BlkDevInit(CBlkDev *bd)
PrintErr("Not Contiguous. Move file to filename.ISO.C.\n");
Fs->catch_except=TRUE;
}

if (bd->file_dsk) {
dv->fs_type=FSt_REDSEA;
dv->size=bd->max_blk+1-bd->drv_offset;

"drvoffset:%X\n",bd->drv_offset;//Sponge
if (RedSeaValidate(bd->first_drv_let)) {
RedSeaInit(dv);
res=TRUE;
Expand Down
12 changes: 2 additions & 10 deletions Kernel/BlkDev/FileSysRedSea.HC
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ U0 RedSeaInit(CDrv *dv)
RedSeaFreeFreeLst(dv);
dv->spc=1;
dv->size=br.sects;
"Init sects:%X size:%X\n",br.sects,dv->size; //sponge
dv->data_area=dv->drv_offset+br.bitmap_sects;
dv->root_clus=br.root_clus;
dv->fat1=dv->fat2=dv->drv_offset+1;
Expand All @@ -86,18 +85,11 @@ Bool RedSeaValidate(U8 drv_let)
CRedSeaBoot br;
if ((dv=Let2Drv(drv_let,FALSE)) && dv->fs_type==FSt_REDSEA &&
BlkRead(dv,&br,dv->drv_offset,1) && br.signature==MBR_PT_REDSEA &&
br.signature2==0xAA55 /* && br.sects==dv->size*/){ //sponge
"dv:%X br:%X\n",dv->size,br.sects;
dv->size=br.sects;

br.signature2==0xAA55)
return TRUE;

} else{
ClassRep(&br);
"sects:%X size:%X\n",br.sects,dv->size; //sponge
else
return FALSE;
}
}

U0 RedSeaFmt(U8 drv_let,Bool quick=TRUE)
{
Expand Down
155 changes: 79 additions & 76 deletions Kernel/Kernel.MAP

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Kernel/KernelC.HH
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ public extern I64 LinkedLstCnt(U8 **_lst);
public extern U8 *LinkedLstCopy(U8 **_lst,CTask *mem_task=NULL);
public extern U0 LinkedLstDel(U8 **_lst);
public extern I64 LinkedLstSize(U8 **_lst);

#help_index "Data Types/Queue Vector"
public extern U0 QueVectU8Del(CQueVectU8 *v);
public extern I64 QueVectU8Get(CQueVectU8 *v,I64 idx);
Expand Down

0 comments on commit 1dd8859

Please sign in to comment.