Skip to content

Commit 1dd8859

Browse files
Terry A. Davisohnxbot
authored andcommitted
TempleOS V5.03 Nightly (ISO SHA-1 1a1ec79)
1 parent 07a766f commit 1dd8859

File tree

10 files changed

+92
-110
lines changed

10 files changed

+92
-110
lines changed

0000Boot/0000Kernel.BIN.C

-256 Bytes
Binary file not shown.

Adam/ADefine.HC

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ U0 LoadDocDefines()
1515
//$LK,"DD_BOOT_HIGH_LOC_DVD",A="FF:::/Adam/Opt/Boot/BootDVD.HC,DD_BOOT_HIGH_LOC_DVD"$
1616

1717
$TR,"LineRep"$
18-
$ID,2$DefinePrint("DD_TEMPLEOS_LOC","80,871");
18+
$ID,2$DefinePrint("DD_TEMPLEOS_LOC","80,849");
1919
$ID,-2$
2020
DefinePrint("DD_MP_VECT","%08X",MP_VECT_ADDR);
2121
DefinePrint("DD_MP_VECT_END","%08X",

Adam/God/GodSong.HC

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -161,22 +161,11 @@ public U8 *GodSongStr()
161161
return buf;
162162
}
163163

164-
public U8 *GodSongStdStr()
165-
{//Make std God generate song. (2measuresx2+2measuresx2).
166-
U8 *st=NULL,*st1=GodSongStr,*st2=GodSongStr;
164+
public U0 GodSong()
165+
{//Make God generate 2measuresx2+2measuresx2. $LK+PU,"Holy Spirit Instructions",A="FI:::/Adam/God/HSNotes.DD"$
166+
U8 *st1=GodSongStr,*st2=GodSongStr;
167167
if (st1 && st2)
168-
st=MStrPrint("%s%s%s%s",st1,st1,st2,st2);
168+
DocPrint(DocPut,"$$SO,\"<Song>\",A=\"%s%s%s%s\"$$",st1,st1,st2,st2);
169169
Free(st1);
170170
Free(st2);
171-
return st;
172-
}
173-
174-
#help_index "God;DolDoc"
175-
public U0 DocInsGodSongStd(CDoc *doc=NULL)
176-
{//Ins Std God generate song.
177-
U8 *st;
178-
if (!doc) doc=DocPut;
179-
if (st=GodSongStdStr)
180-
DocPrint(doc,"$$SO,\"<Song>\",A=\"%s\"$$",st);
181-
Free(st);
182171
}

Compiler/Compiler.BIN

0 Bytes
Binary file not shown.

Demo/AcctExample/PersonalNotes.DD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $WW,1$$FG,5$$TX+CX,"TODO"$$FG$
66

77
* 10/28/17 Titanium froze, easy repeatable
88

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

1111
* DskChk CDROM
1212

Demo/AcctExample/Registry.HC

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ $ID,-2$$TR,"Wenceslas"$
4848
$ID,2$F64 best_score=43.9944;
4949
$ID,-2$$TR,"OSTestSuite"$
5050
$ID,2$progress1_tf=0.000;progress2_tf=0.000;
51-
progress3_tf=0.000;progress4_tf=227.120;
51+
progress3_tf=0.000;progress4_tf=226.523;
5252
$ID,-2$$TR,"XCaliber"$
5353
$ID,2$I64 best_score=90;
5454
I64 msg_flags=2;
@@ -60,17 +60,17 @@ $ID,-2$$TR,"Titanium"$
6060
$ID,2$I64 best_score=16469;
6161
$ID,-2$$TR,"TOSRegen"$
6262
$ID,2$progress1_tf=0.000;progress2_tf=0.000;
63-
progress3_tf=0.000;progress4_tf=92.922;
63+
progress3_tf=0.000;progress4_tf=116.067;
6464
$ID,-2$$TR,"TempleTetris"$
6565
$ID,2$I64 hiscore=0;
6666
$ID,-2$$ID,-2$$TR,"Once"$
6767
$ID,2$$TR,"Adam"$
6868
$ID,2$$ID,-2$$TR,"User"$
6969
$ID,2$$ID,-2$$ID,-2$$TR,"DemoCompany"$
7070
$ID,2$$TR,"Game1"$
71-
$ID,2$F64 best_score=200.29423;
71+
$ID,2$F64 best_score=189.85507;
7272
$TR,"SimpleVal"$
73-
$ID,2$1247;
73+
$ID,2$1248;
7474
$ID,-2$$ID,-2$$ID,-2$$TR,"WalnutZone"$
7575
$ID,2$$TR,"Cherub"$
7676
$ID,2$#define rom_path M:/SnailNet

Kernel/BlkDev/DskBlkDev.HC

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,9 @@ Bool BlkDevInit(CBlkDev *bd)
5959
PrintErr("Not Contiguous. Move file to filename.ISO.C.\n");
6060
Fs->catch_except=TRUE;
6161
}
62-
6362
if (bd->file_dsk) {
6463
dv->fs_type=FSt_REDSEA;
6564
dv->size=bd->max_blk+1-bd->drv_offset;
66-
67-
"drvoffset:%X\n",bd->drv_offset;//Sponge
6865
if (RedSeaValidate(bd->first_drv_let)) {
6966
RedSeaInit(dv);
7067
res=TRUE;

Kernel/BlkDev/FileSysRedSea.HC

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ U0 RedSeaInit(CDrv *dv)
6868
RedSeaFreeFreeLst(dv);
6969
dv->spc=1;
7070
dv->size=br.sects;
71-
"Init sects:%X size:%X\n",br.sects,dv->size; //sponge
7271
dv->data_area=dv->drv_offset+br.bitmap_sects;
7372
dv->root_clus=br.root_clus;
7473
dv->fat1=dv->fat2=dv->drv_offset+1;
@@ -86,18 +85,11 @@ Bool RedSeaValidate(U8 drv_let)
8685
CRedSeaBoot br;
8786
if ((dv=Let2Drv(drv_let,FALSE)) && dv->fs_type==FSt_REDSEA &&
8887
BlkRead(dv,&br,dv->drv_offset,1) && br.signature==MBR_PT_REDSEA &&
89-
br.signature2==0xAA55 /* && br.sects==dv->size*/){ //sponge
90-
"dv:%X br:%X\n",dv->size,br.sects;
91-
dv->size=br.sects;
92-
88+
br.signature2==0xAA55)
9389
return TRUE;
94-
95-
} else{
96-
ClassRep(&br);
97-
"sects:%X size:%X\n",br.sects,dv->size; //sponge
90+
else
9891
return FALSE;
9992
}
100-
}
10193

10294
U0 RedSeaFmt(U8 drv_let,Bool quick=TRUE)
10395
{

Kernel/Kernel.MAP

Lines changed: 79 additions & 76 deletions
Large diffs are not rendered by default.

Kernel/KernelC.HH

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ public extern I64 LinkedLstCnt(U8 **_lst);
154154
public extern U8 *LinkedLstCopy(U8 **_lst,CTask *mem_task=NULL);
155155
public extern U0 LinkedLstDel(U8 **_lst);
156156
public extern I64 LinkedLstSize(U8 **_lst);
157+
157158
#help_index "Data Types/Queue Vector"
158159
public extern U0 QueVectU8Del(CQueVectU8 *v);
159160
public extern I64 QueVectU8Get(CQueVectU8 *v,I64 idx);

0 commit comments

Comments
 (0)