Rijn/TempleOS-Rijn
1
1 Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

TempleOSCDV4.10.ISO

Browse Source
This commit is contained in:
Terry A. Davis authored and minexew committed 2018-09-08 21:47:44 +02:00
1 parent c5954d3371
commit 9206246147
181 files changed
+4468 -4313
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Kernel/BlkDev/DskATAId.CPP
+40 -40
View File
@@ -1,4 +1,4 @@
Bool BootDVDProve(CBlkDev *bd)
Bool BootDVDProbe(CBlkDev *bd)
{
U8 *img=CAlloc(DVD_BLK_SIZE);
I64 i;
@@ -12,7 +12,7 @@ Bool BootDVDProve(CBlkDev *bd)
if (ATAPIReadBlks2(bd,tS+7.0,img,sys_boot_blk,1,FALSE)) {
if ((img+sys_boot_src.u16[1]<<BLK_SIZE_BITS)(CKernel *)
->compile_time==sys_compile_time) {
" Found";
" Found\n";
return TRUE;
} else
" Read";
@@ -43,10 +43,10 @@ Bool BootDVDProbeAll(CBlkDev *bd)
if (d1&1 && d2&1) {
if (bd->base0=d1&~7) {
bd->unit=0;
if (BootDVDProve(bd))
if (BootDVDProbe(bd))
return TRUE;
bd->unit=1;
if (BootDVDProve(bd))
if (BootDVDProbe(bd))
return TRUE;
}
}
@@ -55,10 +55,10 @@ Bool BootDVDProbeAll(CBlkDev *bd)
if (d1&1 && d2&1) {
if (bd->base0=d1&~7) {
bd->unit=0;
if (BootDVDProve(bd))
if (BootDVDProbe(bd))
return TRUE;
bd->unit=1;
if (BootDVDProve(bd))
if (BootDVDProbe(bd))
return TRUE;
}
}
@@ -69,10 +69,10 @@ Bool BootDVDProbeAll(CBlkDev *bd)
d2=0x3F6;
if (bd->base0=d1&~7) {
bd->unit=0;
if (BootDVDProve(bd))
if (BootDVDProbe(bd))
return TRUE;
bd->unit=1;
if (BootDVDProve(bd))
if (BootDVDProbe(bd))
return TRUE;
}
@@ -80,16 +80,16 @@ Bool BootDVDProbeAll(CBlkDev *bd)
d2=0x376;
if (bd->base0=d1&~7) {
bd->unit=0;
if (BootDVDProve(bd))
if (BootDVDProbe(bd))
return TRUE;
bd->unit=1;
if (BootDVDProve(bd))
if (BootDVDProbe(bd))
return TRUE;
}
}
U0 ATARepEntry(I64 base0,I64 base1,I64 unit,I64 irq,U8 *msg,
CATARep **_root,I64 *num_hints)
CATARep **_head,I64 *num_hints)
{
I64 type;
base0&=-8;
@@ -104,10 +104,10 @@ U0 ATARepEntry(I64 base0,I64 base1,I64 unit,I64 irq,U8 *msg,
"$$RED$$CD/DVD Drive $$LTBLUE$$ATAPI ";
"%s$$FG$$\nBase0:0x%04X Base1:0x%04X\nIrq:0x%02X Unit:%d$$LM,0$$\n",
msg,base0,base1,irq,unit;
if (_root) {
if (_head) {
tempha=CAlloc(sizeof(CATARep));
tempha->next=*_root;
*_root=tempha;
tempha->next=*_head;
*_head=tempha;
tempha->num=*num_hints;
tempha->type=type;
tempha->base0=base0;
@@ -128,11 +128,11 @@ Bool ATARepExitAllApplications()
return FALSE;
}
public I64 ATARep(Bool pmt=TRUE,Bool just_ide=FALSE,CATARep **_root=NULL)
public I64 ATARep(Bool pmt=TRUE,Bool just_ide=FALSE,CATARep **_head=NULL)
{//Report possible ATA devices by probing. Hard disks and CD/DVDs.
I64 d1,d2,d3,i,j,k,cnt=0,unlock_flags=0,num_hints=0;
#assert NUM_BLKDEVS<=64
if (_root) *_root=NULL;
if (_head) *_head=NULL;
if (pmt && ATARepExitAllApplications)
return 0;
@@ -157,33 +157,33 @@ public I64 ATARep(Bool pmt=TRUE,Bool just_ide=FALSE,CATARep **_root=NULL)
d2=PCIReadU32(j.u8[2],j.u8[1],j.u8[0],0x14);
d3=PCIReadU8(j.u8[2],j.u8[1],j.u8[0],0x3C);
if (d1&1 && d2&1) {
ATARepEntry(d1,d2,0,d3,"Primary IDE",_root,&num_hints);
ATARepEntry(d1,d2,1,d3,"Primary IDE",_root,&num_hints);
ATARepEntry(d1,d2,0,d3,"Primary IDE",_head,&num_hints);
ATARepEntry(d1,d2,1,d3,"Primary IDE",_head,&num_hints);
} else {
d1=0x1F0; d2=0x3F6; d3=14;
ATARepEntry(d1,d2,0,d3,"Primary IDE",_root,&num_hints);
ATARepEntry(d1,d2,1,d3,"Primary IDE",_root,&num_hints);
ATARepEntry(d1,d2,0,d3,"Primary IDE",_head,&num_hints);
ATARepEntry(d1,d2,1,d3,"Primary IDE",_head,&num_hints);
}
d1=PCIReadU32(j.u8[2],j.u8[1],j.u8[0],0x18);
d2=PCIReadU32(j.u8[2],j.u8[1],j.u8[0],0x1C);
if (d1&1 && d2&1) {
ATARepEntry(d1,d2,0,d3,"Secondary IDE",_root,&num_hints);
ATARepEntry(d1,d2,1,d3,"Secondary IDE",_root,&num_hints);
ATARepEntry(d1,d2,0,d3,"Secondary IDE",_head,&num_hints);
ATARepEntry(d1,d2,1,d3,"Secondary IDE",_head,&num_hints);
} else {
d1=0x170; d2=0x376; d3=15;
ATARepEntry(d1,d2,0,d3,"Secondary IDE",_root,&num_hints);
ATARepEntry(d1,d2,1,d3,"Secondary IDE",_root,&num_hints);
ATARepEntry(d1,d2,0,d3,"Secondary IDE",_head,&num_hints);
ATARepEntry(d1,d2,1,d3,"Secondary IDE",_head,&num_hints);
}
}
}
if (!cnt) {
d1=0x1F0; d2=0x3F6; d3=14;
ATARepEntry(d1,d2,0,d3,"Primary IDE",_root,&num_hints);
ATARepEntry(d1,d2,1,d3,"Primary IDE",_root,&num_hints);
ATARepEntry(d1,d2,0,d3,"Primary IDE",_head,&num_hints);
ATARepEntry(d1,d2,1,d3,"Primary IDE",_head,&num_hints);
d1=0x170; d2=0x376; d3=15;
ATARepEntry(d1,d2,0,d3,"Secondary IDE",_root,&num_hints);
ATARepEntry(d1,d2,1,d3,"Secondary IDE",_root,&num_hints);
ATARepEntry(d1,d2,0,d3,"Secondary IDE",_head,&num_hints);
ATARepEntry(d1,d2,1,d3,"Secondary IDE",_head,&num_hints);
}
'\n\n';
for (i=0;i<NUM_BLKDEVS;i++)
@@ -192,19 +192,19 @@ public I64 ATARep(Bool pmt=TRUE,Bool just_ide=FALSE,CATARep **_root=NULL)
return num_hints;
}
CATARep *ATARepFind(CATARep *haystack_root,I64 needle_num)
CATARep *ATARepFind(CATARep *haystack_head,I64 needle_num)
{
while (haystack_root) {
if (haystack_root->num==needle_num)
return haystack_root;
haystack_root=haystack_root->next;
while (haystack_head) {
if (haystack_head->num==needle_num)
return haystack_head;
haystack_head=haystack_head->next;
}
return NULL;
}
CATARep *ATAIDDrvs(CATARep *root,CATARep **_ata_drv,CATARep **_atapi_drv)
CATARep *ATAIDDrvs(CATARep *head,CATARep **_ata_drv,CATARep **_atapi_drv)
{//This is for when trying to sort-out main hard drives and CD/DVD drives.
CATARep *res=NULL,*tempha=root,*ata_drv=NULL,*atapi_drv=NULL;
CATARep *res=NULL,*tempha=head,*ata_drv=NULL,*atapi_drv=NULL;
CBlkDev *bd;
Bool was_silent=Silent;
bd=Let2BlkDev(':',FALSE);
@@ -256,16 +256,16 @@ I64 AutoMountIDE()
//It uses 'C' and 'T' as first drive letters or whatever you set
//in config when compiling Kernel.BIN.
I64 res=0;
CATARep *root=NULL,*ata_drv=NULL,*atapi_drv=NULL,*tempha;
ATARep(FALSE,TRUE,&root);
ATAIDDrvs(root,&ata_drv,&atapi_drv);
CATARep *head=NULL,*ata_drv=NULL,*atapi_drv=NULL,*tempha;
ATARep(FALSE,TRUE,&head);
ATAIDDrvs(head,&ata_drv,&atapi_drv);
if (ata_drv && ATAMount(blkdev.first_hd_drv_let,BDT_ATA,
ata_drv->base0,ata_drv->base1,ata_drv->unit))
res++;
if (atapi_drv && ATAMount(blkdev.first_dvd_drv_let,BDT_ATAPI,
atapi_drv->base0,atapi_drv->base1,atapi_drv->unit))
res++;
tempha=root;
tempha=head;
while (tempha) {
if (tempha!=ata_drv && tempha!=atapi_drv) {
if (tempha->type==BDT_ATA && ATAMount(blkdev.first_hd_drv_let,BDT_ATA,
@@ -278,7 +278,7 @@ I64 AutoMountIDE()
}
tempha=tempha->next;
}
LinkedLstDel(root);
LinkedLstDel(head);
blkdev.auto_mount_ide_cnt=res;
return res;
}
Kernel/BlkDev/DskAddDev.CPP
+1 -1
View File
@@ -203,7 +203,7 @@ Bool GetBaseUnit(CBlkDev *bd)
while (!('0'<=ch<='1'));
'' ch;
bd->unit=ch-'0';
blkdev.dvd_boot_is_good=BootDVDProve(bd);
blkdev.dvd_boot_is_good=BootDVDProbe(bd);
return TRUE;
} else {
blkdev.dvd_boot_is_good=FALSE;
Kernel/EdLite.CPP
+29 -29
View File
@@ -4,7 +4,7 @@ class CLine
U8 *line;
};
U0 EdLiteUpdate(CLine *root,CLine *cur_line,I64 cur_col,I64 line_start_col)
U0 EdLiteUpdate(CLine *head,CLine *cur_line,I64 cur_col,I64 line_start_col)
{
I64 ch,i,j,k,k2,cursor_col,cursor_row=-1;
U8 *st;
@@ -12,7 +12,7 @@ U0 EdLiteUpdate(CLine *root,CLine *cur_line,I64 cur_col,I64 line_start_col)
Bool done_eof=FALSE;
text.raw_col=0;
for (i=0;i<text.rows/2;i++)
if (templ->last!=root)
if (templ->last!=head)
templ=templ->last;
for (i=0;i<text.rows;i++) {
if (cursor_row<0 && templ==cur_line) {
@@ -25,7 +25,7 @@ U0 EdLiteUpdate(CLine *root,CLine *cur_line,I64 cur_col,I64 line_start_col)
cursor_col=k;
cursor_row=i;
}
if (templ!=root) {
if (templ!=head) {
st=templ->line;
k=0;
j=0;
@@ -60,7 +60,7 @@ Bool EdLite(U8 *filename,I64 num=1,I64 edf_dof_flags=0)
U8 *src,*src2,*src3,*dst,*buf,*bin_data=NULL;
I64 i,cnt=0,ch,sc,size,bin_size=0,line_start_col=0,cur_col=0,
old_raw_flags=text.raw_flags;
CLine root,*templ,*templ1,*cur_line;
CLine head,*templ,*templ1,*cur_line;
Bool res=FALSE,
old_raw=Raw(ON),
old_debug=InDbg(ON),
@@ -73,8 +73,8 @@ Bool EdLite(U8 *filename,I64 num=1,I64 edf_dof_flags=0)
CLI
text.raw_flags=text.raw_flags&~RWF_SCROLL|RWF_SHOW_DOLLAR;
kbd.scan_code=0;
QueInit(&root);
root.line=StrNew("");
QueInit(&head);
head.line=StrNew("");
if (buf) {
src=buf;
@@ -95,7 +95,7 @@ Bool EdLite(U8 *filename,I64 num=1,I64 edf_dof_flags=0)
templ=MAlloc(sizeof(CLine));
templ->line=StrNew(src2);
QueIns(templ,root.last);
QueIns(templ,head.last);
cnt++;
}
@@ -107,7 +107,7 @@ Bool EdLite(U8 *filename,I64 num=1,I64 edf_dof_flags=0)
res=TRUE;
}
cur_line=root.next;
cur_line=head.next;
if (--num<0)
res=FALSE;
else {
@@ -115,29 +115,29 @@ Bool EdLite(U8 *filename,I64 num=1,I64 edf_dof_flags=0)
while (num--)
cur_line=cur_line->next;
else {
cur_line=&root;
cur_line=&head;
res=FALSE;
}
}
do {
if (cur_line==&root)
if (cur_line==&head)
cur_col=0;
while (cur_col-line_start_col<0)
line_start_col-=8;
while (cur_col-line_start_col>=text.cols)
line_start_col+=8;
EdLiteUpdate(&root,cur_line,cur_col,line_start_col);
EdLiteUpdate(&head,cur_line,cur_col,line_start_col);
switch (ch=GetKey(&sc,FALSE,TRUE)) {
case 0:
switch (sc.u8[0]) {
case SC_CURSOR_UP:
if (cur_line->last!=&root)
if (cur_line->last!=&head)
cur_line=cur_line->last;
if (cur_col>StrLen(cur_line->line))
cur_col=StrLen(cur_line->line);
break;
case SC_CURSOR_DOWN:
if (cur_line!=&root)
if (cur_line!=&head)
cur_line=cur_line->next;
if (cur_col>StrLen(cur_line->line))
cur_col=StrLen(cur_line->line);
@@ -146,7 +146,7 @@ Bool EdLite(U8 *filename,I64 num=1,I64 edf_dof_flags=0)
cur_col++;
if (cur_col>StrLen(cur_line->line)) {
templ=cur_line->next;
if (templ!=&root) {
if (templ!=&head) {
cur_col=0;
cur_line=templ;
} else
@@ -158,7 +158,7 @@ Bool EdLite(U8 *filename,I64 num=1,I64 edf_dof_flags=0)
cur_col--;
else {
templ=cur_line->last;
if (templ!=&root) {
if (templ!=&head) {
cur_line=templ;
cur_col=StrLen(templ->line);
}
@@ -166,7 +166,7 @@ Bool EdLite(U8 *filename,I64 num=1,I64 edf_dof_flags=0)
break;
case SC_PAGE_UP:
for (i=1;i<text.rows;i++) {
if (cur_line->last!=&root)
if (cur_line->last!=&head)
cur_line=cur_line->last;
if (cur_col>StrLen(cur_line->line))
cur_col=StrLen(cur_line->line);
@@ -174,7 +174,7 @@ Bool EdLite(U8 *filename,I64 num=1,I64 edf_dof_flags=0)
break;
case SC_PAGE_DOWN:
for (i=1;i<text.rows;i++) {
if (cur_line!=&root)
if (cur_line!=&head)
cur_line=cur_line->next;
if (cur_col>StrLen(cur_line->line))
cur_col=StrLen(cur_line->line);
@@ -183,7 +183,7 @@ Bool EdLite(U8 *filename,I64 num=1,I64 edf_dof_flags=0)
case SC_DELETE:
if (cur_col==StrLen(cur_line->line)) {
templ=cur_line->next;
if (cur_line!=&root && templ!=&root) {
if (cur_line!=&head && templ!=&head) {
src=MStrPrint("%s%s",cur_line->line,templ->line);
Free(cur_line->line);
Free(templ->line);
@@ -209,7 +209,7 @@ Bool EdLite(U8 *filename,I64 num=1,I64 edf_dof_flags=0)
if (cur_col) {
StrCpy(cur_line->line+cur_col-1,cur_line->line+cur_col);
cur_col--;
} else if (cur_line!=&root && cur_line->last!=&root) {
} else if (cur_line!=&head && cur_line->last!=&head) {
templ=cur_line->last;
src=MStrPrint("%s%s",templ->line,cur_line->line);
cur_col=StrLen(templ->line);
@@ -222,7 +222,7 @@ Bool EdLite(U8 *filename,I64 num=1,I64 edf_dof_flags=0)
}
break;
case CH_CTRLY:
if (cur_line!=&root) {
if (cur_line!=&head) {
templ=cur_line;
cur_line=cur_line->next;
QueRem(templ);
@@ -233,10 +233,10 @@ Bool EdLite(U8 *filename,I64 num=1,I64 edf_dof_flags=0)
break;
default:
if (Bt(chars_bmp_getkey,ch)) {
if (cur_line==&root) {
if (cur_line==&head) {
cur_line=MAlloc(sizeof(CLine));
cur_line->line=StrNew("");
QueIns(cur_line,root.last);
QueIns(cur_line,head.last);
}
src=MAlloc(StrLen(cur_line->line)+2);
MemCpy(src,cur_line->line,cur_col);
@@ -258,15 +258,15 @@ Bool EdLite(U8 *filename,I64 num=1,I64 edf_dof_flags=0)
} else {
size=bin_size;
templ=root.next;
while (templ!=&root) {
templ=head.next;
while (templ!=&head) {
size+=StrLen(templ->line)+1;
templ=templ->next;
}
buf=dst=MAlloc(size);
templ=root.next;
while (templ!=&root) {
templ=head.next;
while (templ!=&head) {
i=StrLen(templ->line);
MemCpy(dst,templ->line,i);
dst+=i;
@@ -282,15 +282,15 @@ Bool EdLite(U8 *filename,I64 num=1,I64 edf_dof_flags=0)
res=TRUE;
}
templ=root.next;
while (templ!=&root) {
templ=head.next;
while (templ!=&head) {
templ1=templ->next;
QueRem(templ);
Free(templ->line);
Free(templ);
templ=templ1;
}
Free(root.line);
Free(head.line);
Free(bin_data);
Raw(old_raw);
InDbg(old_debug);
Kernel/KDataTypes.CPP
+16 -16
View File
@@ -38,10 +38,10 @@ I64 LinkedLstSize(U8 **_lst)
return res;
}
U0 QueDel(CQue *root,Bool querem=FALSE)
{//Free entries in queue, not root.
CQue *tempq=root->next,*tempq1;
while (tempq!=root) {
U0 QueDel(CQue *head,Bool querem=FALSE)
{//Free entries in queue, not head.
CQue *tempq=head->next,*tempq1;
while (tempq!=head) {
tempq1=tempq->next;
if (querem)
QueRem(tempq);
@@ -50,11 +50,11 @@ U0 QueDel(CQue *root,Bool querem=FALSE)
}
}
CQue *QueCopy(CQue *root,CTask *mem_task=NULL)
{//MAlloc ident copy of entire queue and root.
CQue *res=MAllocIdent(root,mem_task),*tempq=root->next,*tempq1;
CQue *QueCopy(CQue *head,CTask *mem_task=NULL)
{//MAlloc ident copy of entire queue and head.
CQue *res=MAllocIdent(head,mem_task),*tempq=head->next,*tempq1;
QueInit(res);
while (tempq!=root) {
while (tempq!=head) {
tempq1=MAllocIdent(tempq,mem_task);
QueIns(tempq1,res->last);
tempq=tempq->next;
@@ -62,22 +62,22 @@ CQue *QueCopy(CQue *root,CTask *mem_task=NULL)
return res;
}
I64 QueCnt(CQue *root)
{//Count of nodes in queue, not root.
CQue *tempq=root->next;
I64 QueCnt(CQue *head)
{//Count of nodes in queue, not head.
CQue *tempq=head->next;
I64 res=0;
while (tempq!=root) {
while (tempq!=head) {
res++;
tempq=tempq->next;
}
return res;
}
I64 QueSize(CQue *root)
{//Mem size of all nodes in queue, not root.
CQue *tempq=root->next;
I64 QueSize(CQue *head)
{//Mem size of all nodes in queue, not head.
CQue *tempq=head->next;
I64 res=0;
while (tempq!=root) {
while (tempq!=head) {
res+=MSize2(tempq);
tempq=tempq->next;
}
Kernel/KEnd.CPP
+10 -10
View File
@@ -7,7 +7,7 @@ U0 SysGlblsInit()
sys_cache_line_width=ee.rbx.u8[1]*8;
sys_focus_task=Fs;
QueInit(&sys_macro_root);
QueInit(&sys_macro_head);
blkdev.dft_iso_filename=AStrNew("::/Temp/CDDVD.ISO");
blkdev.temp_filename=AStrNew("~/Temp.TXT.Z");
@@ -47,14 +47,14 @@ U0 SysGlblsInit()
for (i=-308;i<309;i++)
pow10_I64[i+309]=Pow10(i);
QueInit(&snd.record_root);
snd.record_root.time=tS;
QueInit(&snd.record_head);
snd.record_head.time=tS;
ProgressBarsRst;
//$AN,"Independent HeapCtrl Example",A="Independent HeapCtrl Example"$
i=1; //Rqst 1 blk, we might get more.
QueInit(&dev.pci_root);
QueInit(&dev.pci_head);
dev.mem64_ptr=MEM_MAPPED_SPACE;
dbg.fun_seg_cache=CAlloc(FUN_SEG_CACHE_SIZE*sizeof(CFunSegCache));
@@ -63,11 +63,10 @@ U0 SysGlblsInit()
U0 SysGrInit()
{
U8 *vga_page=MemVGAAlloc;
text.font=sys_font_std;
text.aux_font=sys_font_cyrillic;
text.vga_alias =vga_page+VGAM_GRAPHICS;
text.vga_text_alias =vga_page+VGAM_TEXT;
text.vga_alias =dev.uncached_alias+VGAM_GRAPHICS;
text.vga_text_alias =dev.uncached_alias+VGAM_TEXT;
if (!Bt(&sys_run_level,RLf_VGA)) { //if text mode
text.cols=80;
text.rows=25;
@@ -104,12 +103,12 @@ U0 TimersInit()
*_d=*_d&3|0x80;
}
_q=HPET_GCAP_ID;
_q=dev.uncached_alias+HPET_GCAP_ID;
i=*_q; //i.u32[1]= period in femtoS (10e-15)
if (100000<i.u32[1]<1000000000) {
cnts.HPET_freq =1000000000000000/i.u32[1];
cnts.HPET_kHz_freq=1000000000000/i.u32[1];
_q=HPET_GEN_CONF;
_q=dev.uncached_alias+HPET_GEN_CONF;
*_q|=1; //Enable counting
cnts.HPET_initial=HPET;
} else {
@@ -133,7 +132,7 @@ U0 Reboot()
}
U0 KernelMain()
{//Continued from $LK,"Kernel",A="FF:::/Kernel/KStart.CPP,I32 &Kernel"$
{//Continued from $LK,"Kernel",A="FF:::/Kernel/KStart64.CPP,I32 &Kernel"$
OutU8(0x61,InU8(0x61)&~3); //Snd(0);
adam_task=Fs;
BlkPoolsInit;
@@ -141,6 +140,7 @@ U0 KernelMain()
SysGlblsInit;
Mem32DevInit;
MemPagesNotPresentMark;
UncachedAliasAlloc;
LoadKernel;
SysGrInit;
StrCpy(Fs->task_name,"Adam Task CPU#0");
Kernel/KExts.CPP
+1 -1
View File
@@ -89,7 +89,7 @@ extern CTask *SpawnQue(U0 (*fp_addr)(U8 *data),U8 *data=NULL,
U8 *task_name=NULL,I64 target_cpu,CTask *parent=NULL, //NULL means adam
I64 stk_size=0,I64 flags=1<<SVCf_ADD_TO_QUE);
extern U0 SrvCmdDel(CSrvCmd *tempc);
extern U0 SrvCmdQueDel(CSrvCmd *root);
extern U0 SrvCmdQueDel(CSrvCmd *head);
extern I64 SrvCmdsHandler(I64 run_flags,CTask *task=NULL);
extern U0 SrvCtrlInit(CSrvCtrl *ctrl);
extern U8 *StrPrint(U8 *dst,U8 *fmt,...);
Kernel/KGlbls.CPP
+1 -1
View File
@@ -1,7 +1,7 @@
//Compiler initializes glbls in AOT bin modules to zero.
//$LK,"Globals Set to Zero Here",A="FF:::/Compiler/PrsStmt.CPP,sys_var_init_flag"$.
CSrvCmd sys_macro_root;
CSrvCmd sys_macro_head;
CTask *sys_macro_task;
CDoc *sys_clipboard_doc;
Kernel/KInts.CPP
+12 -5
View File
@@ -3,10 +3,14 @@ INT_MP_CRASH_ADDR:: //Forward reference to work around compiler
DU32 &IntMPCrash;
INT_WAKE::
PUSH RDX
PUSH RAX
MOV EAX,U32 LAPIC_EOI
MOV U32 [RAX],0
MOV EAX,&dev
MOV EDX,U32 LAPIC_EOI
MOV RAX,U64 CDevGlbls.uncached_alias[RAX]
MOV U32 [RAX+RDX],0
POP RAX
POP RDX
IRET
IRQ_TIMER:: //I_TIMER
@@ -42,9 +46,12 @@ IRQ_TIMER:: //I_TIMER
TEST RAX,RAX
JZ @@20
MOV EAX,U32 LAPIC_EOI
MOV U32 [RAX],0
MOV EAX,&dev
MOV EDX,U32 LAPIC_EOI
MOV RAX,U64 CDevGlbls.uncached_alias[RAX]
MOV U32 [RAX+RDX],0
JMP @@25
@@20: CALL &IntCore0TimerHandler //Only Core 0 calls this.
@@25: XOR RAX,RAX
CMP RSI,U64 GS:CCPU.idle_task[RAX]
@@ -137,7 +144,7 @@ interrupt U0 IntNop()
{//Make unplanned IRQs stop by all means!
OutU8(0xA0,0x20);
OutU8(0x20,0x20);
*LAPIC_EOI(U32 *)=0;
*(dev.uncached_alias+LAPIC_EOI)(U32 *)=0;
}
interrupt U0 IntDivZero()
Kernel/KLoad.CPP
+1 -1
View File
@@ -242,7 +242,7 @@ U0 LoadKernel()
HashGenericAdd(KERNEL_MODULE_NAME,HTT_MODULE|HTF_PUBLIC,
sys_boot_base-sizeof(CBinFile));
//Abs patches done here $LK,"CPatchTableAbsAddr",A="FF:D:/Kernel/KStart.CPP,CPatchTableAbsAddr"$.
//Abs patches done here $LK,"CPatchTableAbsAddr",A="FF:D:/Kernel/KStart32.CPP,CPatchTableAbsAddr"$.
LoadPass1(sys_boot_patch_table_base,sys_boot_base,LDF_NO_ABSS|LDF_SILENT);
//No main routines
Kernel/KMisc.CPP
+6 -1
View File
@@ -77,6 +77,11 @@ I64 SysTimerRead()
return res;
}
I64 HPET()
{ //Get high precision event timer.
return *(dev.uncached_alias+HPET_MAIN_CNT)(I64 *);
}
I64 TimeStampFreqCal()
{
static I64 time_stamp_start=0,timer_start=0,HPET_start=0;
@@ -176,7 +181,7 @@ U0 Snd(F64 freq)
d=ACAlloc(sizeof(CSndData));
d->freq=freq;
d->time=tS;
QueIns(d,snd.record_root.last);
QueIns(d,snd.record_head.last);
}
LBtr(&sys_semas[SYS_SEMA_SND],0);
}
Kernel/KStart.CPP
-379
View File
@@ -1,379 +0,0 @@
asm {/*
See $LK,"::/Doc/Boot.TXT"$ for how booting works.
This file calls some BIOS routines before
switching to 32 bit, and then, 64 bit modes.
It continues here: $LK,"Kernel",A="FF:::/Kernel/KEnd.CPP,U0 Kernel"$.
The boot loader jumps here, in real-mode (16-bit).
It actually jumps to the $LK,"CBinFile",A="MN:CBinFile"$ which is placed
just before this $LK,"generated by the compiler",A="FF:::/Compiler/CMain.CPP,16 ALIGN"$.
The header begins with a short jmp to
the start of this file's code which begins
with the following small jump past some data.
This file is first in the Kernel image
because it is #included first. $LK,"Kernel.PRJ",A="FF:::/Kernel/Kernel.PRJ,KStart:1"$
*/
USE16
SYS_KERNEL:: //This must match $LK,"CKernel",A="MN:CKernel"$.
JMP U16 CORE0_16BIT_INIT
//************************************
// ASM Global vars required for 16-bit start-up
ALIGN 4,OC_NOP
SYS_BOOT_SRC:: DU32 BOOT_SRC_NULL;
SYS_BOOT_BLK:: DU32 0;
SYS_BOOT_PATCH_TABLE_BASE:: DU32 0;
SYS_RUN_LEVEL:: DU32 0;
#exe {StreamPrint("SYS_COMPILE_TIME:: DU64 0x%X;",Now);}
//See $LK,"BootDVDProve",A="MN:BootDVDProve"$
#assert SYS_COMPILE_TIME+sizeof(CDate)+sizeof(CBinFile)<DVD_BLK_SIZE
SYS_BOOT_BASE:: DU32 0; //Offset from start used by reboot
SYS_MEM_E801:: DU16 0,0;
SYS_MEM_E820:: DU8 MEM_NUM_E820_ENTRIES*MEM_E820_ENTRY_SIZE DUP (0);
SYS_GDT_PTR:: DU16 sizeof(CGDT)-1;
DU64 0;
SYS_PCI_BUSES:: DU16 0;
ALIGN 16,OC_NOP
SYS_GDT:: //See $LK,"CGDT",A="MN:CGDT"$
GDT_NULL: DU64 0,0;
GDT_BOOT_DS: DU64 0x00CF92000000FFFF,0; //Gets patched.
GDT_BOOT_CS: DU64 0x00CF9A000000FFFF,0; //Gets patched.
GDT_CS32: DU64 0x00CF9A000000FFFF,0;
GDT_CS64: DU64 0x00209A0000000000,0; //The $LK,"Charter",A="FI:::/Doc/Charter.TXT"$ says just ring0.
GDT_CS64_RING3: DU64 0x0020FA0000000000,0; //$LK,"Ring3",A="FI:::/Demo/Lectures/Ring3.CPP"$, so you can play with.
GDT_DS: DU64 0x00CF92000000FFFF,0;
GDT_DS_RING3: DU64 0x00CFF2000000FFFF,0;
GDT_TR: DU8 MP_MAX_PROCESSORS*16 DUP(0);
GDT_TR_RING3: DU8 MP_MAX_PROCESSORS*16 DUP(0);
#assert $$-SYS_GDT==sizeof(CGDT)
#assert $$-SYS_KERNEL==sizeof(CKernel)-sizeof(CBinFile)
//************************************
CORE0_16BIT_INIT::
//EAX is $LK,"SYS_BOOT_SRC",A="FF:::/Kernel/KStart.CPP,[SYS_BOOT_SRC]"$. (Val passed from boot blk, $LK,"BootHD",A="FF:::/Adam/Opt/Boot/BootHD.CPP,BOOT_SRC_HARDDRV"$, $LK,"BootDVD",A="FF:::/Adam/Opt/Boot/BootDVD.CPP,BOOT_SRC_DVD"$, & $LK,"BootRAM",A="FF:::/Adam/Opt/Boot/BootRAM.CPP,BOOT_SRC_RAM"$.)
MOV ECX,EAX
MOV AX,(BOOT_RAM_LIMIT-BOOT_STK_SIZE)/16
MOV SS,AX
MOV SP,BOOT_STK_SIZE
PUSH ECX //Will be $LK,"SYS_BOOT_SRC",A="FF:::/Kernel/KStart.CPP,[SYS_BOOT_SRC]"$. See $LK,"BootHD",A="FF:::/Adam/Opt/Boot/BootHD.CPP,BOOT_SRC_HARDDRV"$, $LK,"BootDVD",A="FF:::/Adam/Opt/Boot/BootDVD.CPP,BOOT_SRC_DVD"$ & $LK,"BootRAM",A="FF:::/Adam/Opt/Boot/BootRAM.CPP,BOOT_SRC_RAM"$.
PUSH EBX
MOV AX,VGAM_TEXT/16
MOV ES,AX
MOV U32 ES:[0],'O'+BLUE<<12+('S'+GREEN<<12)<<16
CALL U16 GET_IP
GET_IP: POP BX
SUB BX,GET_IP
SHR BX,4
MOV AX,CS
ADD AX,BX
PUSH AX
PUSH U16 @@05
RETF
@@05: STI
MOV AX,CS
MOV DS,AX
MOV U32 [SYS_RUN_LEVEL],RLF_16BIT
MOV AX,0x4F02
MOV BX,0x12 //640x480 16 color
#exe {
if (!kernel_cfg->opts[CFG_TEXT_MODE])
StreamPrint("INT 0x10"); //Enable VGA
};
CMP AX,0x004F
JNE @@10 //Jmp if fail
BTS U32 [SYS_RUN_LEVEL],RLf_VGA
@@10:
//Get mem maps
MOV AX,0xE801
INT 0x15
MOV U16 [SYS_MEM_E801],CX
MOV U16 [SYS_MEM_E801+2],DX
MOV CX,MEM_NUM_E820_ENTRIES-1 //Leave one to terminate
XOR EBX,EBX
MOV AX,DS
MOV ES,AX
MOV DI,SYS_MEM_E820
@@15: PUSH CX
MOV EAX,0xE820
MOV ECX,MEM_E820_ENTRY_SIZE
MOV EDX,'PAMS'
INT 0x15
JC @@20
CMP EAX,'PAMS'
JNE @@20
TEST EBX,EBX
JZ @@20
ADD DI,MEM_E820_ENTRY_SIZE
POP CX
LOOP @@15
JMP @@25
@@20: ADD SP,2
//Get PCI Bus Info
@@25: MOV U16 [SYS_PCI_BUSES],256
XOR DX,DX
MOV AX,0xB101
INT 0x1A
CMP DX,'PC'
JNE @@30
MOV CH,0
INC CX
MOV U16 [SYS_PCI_BUSES],CX
@@30:
CLI
//Enable A20
IN AL,0x92
OR AL,2
OUT 0x92,AL
POP U32 [SYS_BOOT_BLK]
POP U32 [SYS_BOOT_SRC] //See $LK,"BootHD",A="FF:::/Adam/Opt/Boot/BootHD.CPP,BOOT_SRC_HARDDRV"$, $LK,"BootDVD",A="FF:::/Adam/Opt/Boot/BootDVD.CPP,BOOT_SRC_DVD"$, & $LK,"BootRAM",A="FF:::/Adam/Opt/Boot/BootRAM.CPP,BOOT_SRC_RAM"$.
CLD
XOR EAX,EAX
MOV AX,CS
MOV DS,AX
MOV ES,AX
SHL EAX,4
MOV U32 [SYS_BOOT_BASE],EAX
MOV DX,CS
SUB DX,sizeof(CBinFile)/16
#assert !(sizeof(CBinFile)&15)
MOV GS,DX
MOV EDX,EAX
ADD EDX,U32 GS:[CBinFile.patch_table_offset]
SUB EDX,sizeof(CBinFile)
MOV U32 [SYS_BOOT_PATCH_TABLE_BASE],EDX
ADD U32 [GDT_BOOT_DS+2],EAX
ADD U32 [GDT_BOOT_CS+2],EAX
ADD EAX,I32 SYS_GDT
MOV U32 [SYS_GDT_PTR+CSysLimitBase.base],EAX
LGDT U32 [SYS_GDT_PTR]
MOV EAX,SYS_START_CR0
MOV_CR0_EAX
/*
The assembler doesn't support far jumps so we hand code it.
16-bit code is not important enough for me to implement
16-bit mode in the assembler fully.
To complete the switch to 32-bit mode, we have to load
the code segment with a far jump.
*/
DU8 0x66,0xEA; //JMP CGDT.boot_cs:CORE0_32BIT_INIT
DU32 CORE0_32BIT_INIT;
DU16 CGDT.boot_cs;
#assert $$+16<=0xFFFF
USE32
//************************************
// ASM Global vars not required for 16-bit start-up
ALIGN 8,OC_NOP
SYS_HEAP_BASE:: DU64 SYS_FIXED_AREA+sizeof(CSysFixedArea);
SYS_HEAP_LIMIT:: DU64 0;
#exe {
StreamPrint(
"SYS_MEM_INIT_FLAG:: DU8 %d;"
"SYS_MEM_INIT_VAL:: DU8 %d;"
"SYS_HEAP_INIT_FLAG:: DU8 %d;"
"SYS_HEAP_INIT_VAL:: DU8 %d;"
"SYS_VAR_INIT_FLAG:: DU8 %d;"
"SYS_VAR_INIT_VAL:: DU8 %d;",
kernel_cfg->opts[CFG_MEM_INIT], kernel_cfg->mem_init_val,
kernel_cfg->opts[CFG_HEAP_INIT],kernel_cfg->heap_init_val,
kernel_cfg->opts[CFG_VAR_INIT], kernel_cfg->var_init_val);
};
SYS_HEAP_DBG_FLAG:: DU8 _CFG_HEAP_DBG;
ALIGN 8,0
SYS_CTRL_ALT_FLAGS:: DU64 0;
SYS_EXTERN_TABLE:: DU64 0;
SYS_CODE_BP:: DU64 0;
SYS_DATA_BP:: DU64 0;
SYS_PROGRESSES::
SYS_PROGRESS1:: DU64 0;
SYS_PROGRESS1_MAX:: DU64 0;
SYS_PROGRESS1_DESC:: DU8 PROGRESS_DESC_LEN DUP(0);
SYS_PROGRESS2:: DU64 0;
SYS_PROGRESS2_MAX:: DU64 0;
SYS_PROGRESS2_DESC:: DU8 PROGRESS_DESC_LEN DUP(0);
SYS_PROGRESS3:: DU64 0;
SYS_PROGRESS3_MAX:: DU64 0;
SYS_PROGRESS3_DESC:: DU8 PROGRESS_DESC_LEN DUP(0);
SYS_PROGRESS4:: DU64 0;
SYS_PROGRESS4_MAX:: DU64 0;
SYS_PROGRESS4_DESC:: DU8 PROGRESS_DESC_LEN DUP(0);
#assert $$-SYS_PROGRESSES==sizeof(CProgress)*4
SYS_FOCUS_TASK:: DU64 0;
SYS_CPU_STRUCTS:: DU64 0;
SYS_MP_CNT:: DU64 1;
SYS_MP_CNT_INITIAL:: DU64 1;
SYS_MP_CNT_LOCK:: DU64 1;
ALIGN DFT_CACHE_LINE_WIDTH,OC_NOP
SYS_CACHE_LINE_WIDTH:: DU64 DFT_CACHE_LINE_WIDTH;
DU8 DFT_CACHE_LINE_WIDTH-sizeof(CBinFile)-8 DUP(0);
SYS_SEMAS:: DU8 NUM_SYS_SEMAS*SEMA_STRUCT_SIZE DUP(0);
//************************************
ALIGN 16,OC_NOP
CORE0_32BIT_INIT:: //Entry point for $LK,"BootRAM",A="MN:BootRAM"$.
PUSH U32 RFLAGG_START
POPFD
MOV EAX,SYS_START_CR0
MOV_CR0_EAX
MOV AX,CGDT.boot_ds //LOAD DS SELECTOR
MOV DS,AX
BTS U32 [SYS_RUN_LEVEL],RLf_32BIT
MOV ESI,U32 [SYS_BOOT_PATCH_TABLE_BASE]
MOV EDI,U32 [SYS_BOOT_BASE]
MOV AX,CGDT.ds
MOV DS,AX
MOV ES,AX
MOV FS,AX
MOV GS,AX
MOV SS,AX
MOV ESP,BOOT_RAM_LIMIT //Temp Stk
//Patch abs addresses
MOV ECX,U32 CPatchTableAbsAddr.abs_addres_cnt[ESI]
LEA ESI,U32 CPatchTableAbsAddr.abs_addres[ESI]
@@05: LODSD
ADD EAX,EDI
ADD U32 [EAX],EDI
LOOP @@05
DU8 0xEA; //JMP CGDT.cs32:@@10
DU32 @@10;
DU16 CGDT.cs32;
@@10: BTS U32 [SYS_RUN_LEVEL],RLf_PATCHED
CALL SYS_FIND_PCIBIOS_SERVICE_DIR
CALL SYS_FIND_PCI_SERVICES
MOV U32 [SYS_HEAP_BASE],SYS_FIXED_AREA+sizeof(CSysFixedArea)
CALL SYS_INIT_PAGE_TABLES
PUSH U32 0 //Return from next call will be 64-bit
CALL SYS_ENTER_LONG_MODE
USE64
BTS U32 [SYS_RUN_LEVEL],RLf_64BIT
FNINIT
MOV RAX,SYS_FIXED_AREA+CSysFixedArea.init_fpu_mmx
FXSAVE U64 [RAX]
//Init CPU0 Struct
PUSH SYS_FIXED_AREA+CSysFixedArea.adam
PUSH SYS_FIXED_AREA+CSysFixedArea.boot_cpu
PUSH 0
CALL &CPUStructInit
CALL SET_GS_BASE
//Init Adam HeapCtrl
MOV EDI,U32 SYS_FIXED_AREA+CSysFixedArea.adam_hc
MOV EAX,U32 SYS_FIXED_AREA+CSysFixedArea.adam_bp
MOV U64 CHeapCtrl.bp[RDI],RAX
MOV U32 CHeapCtrl.hc_signature[RDI],HEAP_CTRL_SIGNATURE_VAL
LEA RAX,U64 CHeapCtrl.next_um-CMemUsed.next[RDI]
MOV U64 CHeapCtrl.next_um[RDI],RAX
MOV U64 CHeapCtrl.last_um[RDI],RAX
MOV EAX,U32 SYS_FIXED_AREA+CSysFixedArea.adam
MOV U64 CHeapCtrl.mem_task[RDI],RAX
MOV U64 CTask.code_heap[RAX],RDI
MOV U64 CTask.data_heap[RAX],RDI
MOV U32 CTask.task_signature[RAX],TASK_SIGNATURE_VAL
BTS U32 [SYS_RUN_LEVEL],RLf_BOOT_HEAP
PUSH MEM_ADAM_STK
PUSH U32 SYS_FIXED_AREA+CSysFixedArea.adam
CALL &TaskInit
CALL SET_FS_BASE
MOV RSP,U64 CTask.rsp[RAX]
JMP I32 &KernelMain
//************************************
USE32
SYS_ENTER_LONG_MODE:: //Switch to long 64-bit mode
MOV_EAX_CR4
OR EAX,0xB0
MOV_CR4_EAX
MOV EAX,SYS_FIXED_AREA+CSysFixedArea.pml4
MOV_CR3_EAX
MOV ECX,IA32_EFER
XOR EDX,EDX
MOV EAX,IA32F_LME
WRMSR
MOV_EAX_CR0
BTS EAX,31 //enable paging (required for 64-bit mode)
MOV_CR0_EAX
DU8 0xEA; //JMP CGDT.cs64:@@05
DU32 @@05;
DU16 CGDT.cs64;
USE64
@@05: MOV AX,CGDT.ds
MOV DS,AX
MOV ES,AX
MOV SS,AX
MOV FS,AX
MOV GS,AX
RET
//************************************
SYS_RAM_REBOOT:: //This gets copied high. $LK,"SYS_RAM_REBOOT",A="FF:::/Adam/Opt/Boot/BootRAM.CPP,SYS_RAM_REBOOT:2"$
PUSH U32 CGDT.ds //stk seg
PUSH U32 BOOT_RAM_LIMIT //stk
PUSH U32 0 //flags
PUSH U32 CGDT.cs32
LEA RAX,[@@10]
PUSH RAX
IRET
USE32
@@10: WBINVD
//disable paging
MOV_EAX_CR0
BTR EAX,31
MOV_CR0_EAX
MOV ECX,IA32_EFER
XOR EDX,EDX
XOR EAX,EAX
WRMSR
MOV EBX,BOOT_SRC_RAM
MOV EAX,I32 CORE0_32BIT_INIT
JMP EAX
SYS_RAM_REBOOT_END::
USE64
}
Kernel/KStart16.CPP
+177
View File
@@ -0,0 +1,177 @@
asm {/* See $LK,"::/Doc/Boot.TXT"$.
TempleOS starts in real, calls some BIOS
routines, switches to 32 bit, and 64 bit mode
and continues in $LK,"HolyC",A="FI:::/Doc/HolyC.TXT"$ at $LK,"KernelMain",A="MN:KernelMain"$().
The boot loader jumps here in real-mode (16-bit).
It actually jumps to the $LK,"CBinFile",A="MN:CBinFile"$ header which is
placed just before this by $LK,"the compiler",A="FF:::/Compiler/CMain.CPP,16 ALIGN"$.
The header begins with a short jmp to
the start of this file's code which begins
with the following small jump past some data.
This file is first in the Kernel image
because it is #included first. $LK,"Kernel.PRJ",A="FF:::/Kernel/Kernel.PRJ,KStart16:1"$
*/
USE16
SYS_KERNEL:: //This must match $LK,"CKernel",A="MN:CKernel"$.
JMP U16 CORE0_16BIT_INIT
//************************************
// ASM Global vars required for 16-bit start-up
ALIGN 4,OC_NOP
SYS_BOOT_SRC:: DU32 BOOT_SRC_NULL;
SYS_BOOT_BLK:: DU32 0;
SYS_BOOT_PATCH_TABLE_BASE:: DU32 0;
SYS_RUN_LEVEL:: DU32 0;
#exe {StreamPrint("SYS_COMPILE_TIME:: DU64 0x%X;",Now);} //See $LK,"BootDVDProbe",A="MN:BootDVDProbe"$
#assert SYS_COMPILE_TIME+sizeof(CDate)+sizeof(CBinFile)<DVD_BLK_SIZE
SYS_BOOT_BASE:: DU32 0; //Offset from start used by reboot
SYS_MEM_E801:: DU16 0,0;
SYS_MEM_E820:: DU8 MEM_NUM_E820_ENTRIES*MEM_E820_ENTRY_SIZE DUP (0);
SYS_GDT_PTR:: DU16 sizeof(CGDT)-1;
DU64 0;
SYS_PCI_BUSES:: DU16 0;
ALIGN 16,OC_NOP
SYS_GDT:: //See $LK,"CGDT",A="MN:CGDT"$
GDT_NULL: DU64 0,0;
GDT_BOOT_DS: DU64 0x00CF92000000FFFF,0; //Gets patched.
GDT_BOOT_CS: DU64 0x00CF9A000000FFFF,0; //Gets patched.
GDT_CS32: DU64 0x00CF9A000000FFFF,0;
GDT_CS64: DU64 0x00209A0000000000,0; //The $LK,"Charter",A="FI:::/Doc/Charter.TXT"$ says just ring0.
GDT_CS64_RING3: DU64 0x0020FA0000000000,0; //$LK,"Ring3",A="FI:::/Demo/Lectures/Ring3.CPP"$, so you can play with.
GDT_DS: DU64 0x00CF92000000FFFF,0;
GDT_DS_RING3: DU64 0x00CFF2000000FFFF,0;
GDT_TR: DU8 MP_MAX_PROCESSORS*16 DUP(0);
GDT_TR_RING3: DU8 MP_MAX_PROCESSORS*16 DUP(0);
#assert $$-SYS_GDT==sizeof(CGDT)
#assert $$-SYS_KERNEL==sizeof(CKernel)-sizeof(CBinFile)
//************************************
CORE0_16BIT_INIT::
//EAX is $LK,"SYS_BOOT_SRC",A="FF:::/Kernel/KStart16.CPP,[SYS_BOOT_SRC]"$. (Val passed from boot blk, $LK,"BootHD",A="FF:::/Adam/Opt/Boot/BootHD.CPP,BOOT_SRC_HARDDRV"$, $LK,"BootDVD",A="FF:::/Adam/Opt/Boot/BootDVD.CPP,BOOT_SRC_DVD"$, & $LK,"BootRAM",A="FF:::/Adam/Opt/Boot/BootRAM.CPP,BOOT_SRC_RAM"$.)
MOV ECX,EAX
MOV AX,(BOOT_RAM_LIMIT-BOOT_STK_SIZE)/16
MOV SS,AX
MOV SP,BOOT_STK_SIZE
PUSH ECX //Will be $LK,"SYS_BOOT_SRC",A="FF:::/Kernel/KStart16.CPP,[SYS_BOOT_SRC]"$. See $LK,"BootHD",A="FF:::/Adam/Opt/Boot/BootHD.CPP,BOOT_SRC_HARDDRV"$, $LK,"BootDVD",A="FF:::/Adam/Opt/Boot/BootDVD.CPP,BOOT_SRC_DVD"$ & $LK,"BootRAM",A="FF:::/Adam/Opt/Boot/BootRAM.CPP,BOOT_SRC_RAM"$.
PUSH EBX
CALL U16 GET_IP
GET_IP: POP BX
SUB BX,GET_IP
SHR BX,4
MOV AX,CS
ADD AX,BX
PUSH AX
PUSH U16 @@05
RETF
@@05: STI
MOV AX,CS
MOV DS,AX
MOV U32 [SYS_RUN_LEVEL],RLF_16BIT
MOV AX,0x4F02
MOV BX,0x12 //640x480 16 color
#exe {
if (!kernel_cfg->opts[CFG_TEXT_MODE])
StreamPrint("INT 0x10"); //Enable VGA
};
CMP AX,0x004F
JNE @@10 //Jmp if fail
BTS U32 [SYS_RUN_LEVEL],RLf_VGA
@@10:
//Get mem maps
MOV AX,0xE801
INT 0x15
MOV U16 [SYS_MEM_E801],CX
MOV U16 [SYS_MEM_E801+2],DX
MOV CX,MEM_NUM_E820_ENTRIES-1 //Leave one to terminate
XOR EBX,EBX
MOV AX,DS
MOV ES,AX
MOV DI,SYS_MEM_E820
@@15: PUSH CX
MOV EAX,0xE820
MOV ECX,MEM_E820_ENTRY_SIZE
MOV EDX,'PAMS'
INT 0x15
JC @@20
CMP EAX,'PAMS'
JNE @@20
TEST EBX,EBX
JZ @@20
ADD DI,MEM_E820_ENTRY_SIZE
POP CX
LOOP @@15
JMP @@25
@@20: ADD SP,2
//Get PCI Bus Info
@@25: MOV U16 [SYS_PCI_BUSES],256
XOR DX,DX
MOV AX,0xB101
INT 0x1A
CMP DX,'PC'
JNE @@30
MOV CH,0
INC CX
MOV U16 [SYS_PCI_BUSES],CX
@@30:
CLI
//Enable A20
IN AL,0x92
OR AL,2
OUT 0x92,AL
POP U32 [SYS_BOOT_BLK]
POP U32 [SYS_BOOT_SRC] //See $LK,"BootHD",A="FF:::/Adam/Opt/Boot/BootHD.CPP,BOOT_SRC_HARDDRV"$, $LK,"BootDVD",A="FF:::/Adam/Opt/Boot/BootDVD.CPP,BOOT_SRC_DVD"$, & $LK,"BootRAM",A="FF:::/Adam/Opt/Boot/BootRAM.CPP,BOOT_SRC_RAM"$.
CLD
XOR EAX,EAX
MOV AX,CS
MOV DS,AX
MOV ES,AX
SHL EAX,4
MOV U32 [SYS_BOOT_BASE],EAX
MOV DX,CS
SUB DX,sizeof(CBinFile)/16
#assert !(sizeof(CBinFile)&15)
MOV GS,DX
MOV EDX,EAX
ADD EDX,U32 GS:[CBinFile.patch_table_offset]
SUB EDX,sizeof(CBinFile)
MOV U32 [SYS_BOOT_PATCH_TABLE_BASE],EDX
ADD U32 [GDT_BOOT_DS+2],EAX
ADD U32 [GDT_BOOT_CS+2],EAX
ADD EAX,I32 SYS_GDT
MOV U32 [SYS_GDT_PTR+CSysLimitBase.base],EAX
LGDT U32 [SYS_GDT_PTR]
MOV EAX,SYS_START_CR0
MOV_CR0_EAX
/* The assembler doesn't support far jumps so
we hand code it. 16-bit code is not important
enough to fully implement in the assembler.
To complete the switch to 32-bit mode, we have to load
the code segment with a far jump.
*/
DU8 0x66,0xEA; //JMP CGDT.boot_cs:CORE0_32BIT_INIT
DU32 CORE0_32BIT_INIT;
DU16 CGDT.boot_cs;
#assert $$+16<=0xFFFF
}
Kernel/KStart32.CPP
+99
View File
@@ -0,0 +1,99 @@
asm {
USE32
//************************************
// ASM Global vars not required for 16-bit start-up
ALIGN 8,OC_NOP
SYS_HEAP_BASE:: DU64 SYS_FIXED_AREA+sizeof(CSysFixedArea);
SYS_HEAP_LIMIT:: DU64 0;
#exe {
StreamPrint(
"SYS_MEM_INIT_FLAG:: DU8 %d;"
"SYS_MEM_INIT_VAL:: DU8 %d;"
"SYS_HEAP_INIT_FLAG:: DU8 %d;"
"SYS_HEAP_INIT_VAL:: DU8 %d;"
"SYS_VAR_INIT_FLAG:: DU8 %d;"
"SYS_VAR_INIT_VAL:: DU8 %d;",
kernel_cfg->opts[CFG_MEM_INIT], kernel_cfg->mem_init_val,
kernel_cfg->opts[CFG_HEAP_INIT],kernel_cfg->heap_init_val,
kernel_cfg->opts[CFG_VAR_INIT], kernel_cfg->var_init_val);
};
SYS_HEAP_DBG_FLAG:: DU8 _CFG_HEAP_DBG;
SYS_GIG_PAGES:: DU8 0;
ALIGN 8,0
SYS_CTRL_ALT_FLAGS:: DU64 0;
SYS_EXTERN_TABLE:: DU64 0;
SYS_CODE_BP:: DU64 0;
SYS_DATA_BP:: DU64 0;
SYS_PROGRESSES::
SYS_PROGRESS1:: DU64 0;
SYS_PROGRESS1_MAX:: DU64 0;
SYS_PROGRESS1_DESC:: DU8 PROGRESS_DESC_LEN DUP(0);
SYS_PROGRESS2:: DU64 0;
SYS_PROGRESS2_MAX:: DU64 0;
SYS_PROGRESS2_DESC:: DU8 PROGRESS_DESC_LEN DUP(0);
SYS_PROGRESS3:: DU64 0;
SYS_PROGRESS3_MAX:: DU64 0;
SYS_PROGRESS3_DESC:: DU8 PROGRESS_DESC_LEN DUP(0);
SYS_PROGRESS4:: DU64 0;
SYS_PROGRESS4_MAX:: DU64 0;
SYS_PROGRESS4_DESC:: DU8 PROGRESS_DESC_LEN DUP(0);
#assert $$-SYS_PROGRESSES==sizeof(CProgress)*4
SYS_FOCUS_TASK:: DU64 0;
SYS_CPU_STRUCTS:: DU64 0;
SYS_MP_CNT:: DU64 1;
SYS_MP_CNT_INITIAL:: DU64 1;
SYS_MP_CNT_LOCK:: DU64 1;
ALIGN DFT_CACHE_LINE_WIDTH,OC_NOP
SYS_CACHE_LINE_WIDTH:: DU64 DFT_CACHE_LINE_WIDTH;
DU8 DFT_CACHE_LINE_WIDTH-sizeof(CBinFile)-8 DUP(0);
SYS_SEMAS:: DU8 NUM_SYS_SEMAS*SEMA_STRUCT_SIZE DUP(0);
//************************************
ALIGN 16,OC_NOP
CORE0_32BIT_INIT:: //Entry point for $LK,"BootRAM",A="MN:BootRAM"$.
PUSH U32 RFLAGG_START
POPFD
MOV EAX,SYS_START_CR0
MOV_CR0_EAX
MOV AX,CGDT.boot_ds //LOAD DS SELECTOR
MOV DS,AX
BTS U32 [SYS_RUN_LEVEL],RLf_32BIT
MOV ESI,U32 [SYS_BOOT_PATCH_TABLE_BASE]
MOV EDI,U32 [SYS_BOOT_BASE]
MOV AX,CGDT.ds
MOV DS,AX
MOV ES,AX
MOV FS,AX
MOV GS,AX
MOV SS,AX
MOV ESP,BOOT_RAM_LIMIT //Temp Stk
//Patch abs addresses
MOV ECX,U32 CPatchTableAbsAddr.abs_addres_cnt[ESI]
LEA ESI,U32 CPatchTableAbsAddr.abs_addres[ESI]
@@05: LODSD
ADD EAX,EDI
ADD U32 [EAX],EDI
LOOP @@05
DU8 0xEA; //JMP CGDT.cs32:@@10
DU32 @@10;
DU16 CGDT.cs32;
@@10: BTS U32 [SYS_RUN_LEVEL],RLf_PATCHED
CALL SYS_FIND_PCIBIOS_SERVICE_DIR
CALL SYS_FIND_PCI_SERVICES
MOV U32 [SYS_HEAP_BASE],SYS_FIXED_AREA+sizeof(CSysFixedArea)
CALL SYS_INIT_PAGE_TABLES
PUSH U32 0 //Return from next call will be 64-bit
CALL SYS_ENTER_LONG_MODE
}
Kernel/KStart64.CPP
+100
View File
@@ -0,0 +1,100 @@
asm {
USE64
BTS U32 [SYS_RUN_LEVEL],RLf_64BIT
FNINIT
MOV RAX,SYS_FIXED_AREA+CSysFixedArea.init_fpu_mmx
FXSAVE U64 [RAX]
//Init CPU0 Struct
PUSH SYS_FIXED_AREA+CSysFixedArea.adam
PUSH SYS_FIXED_AREA+CSysFixedArea.boot_cpu
PUSH 0
CALL &CPUStructInit
CALL SET_GS_BASE
//Init Adam HeapCtrl
MOV EDI,U32 SYS_FIXED_AREA+CSysFixedArea.adam_hc
MOV EAX,U32 SYS_FIXED_AREA+CSysFixedArea.adam_bp
MOV U64 CHeapCtrl.bp[RDI],RAX
MOV U32 CHeapCtrl.hc_signature[RDI],HEAP_CTRL_SIGNATURE_VAL
LEA RAX,U64 CHeapCtrl.next_um-CMemUsed.next[RDI]
MOV U64 CHeapCtrl.next_um[RDI],RAX
MOV U64 CHeapCtrl.last_um[RDI],RAX
MOV EAX,U32 SYS_FIXED_AREA+CSysFixedArea.adam
MOV U64 CHeapCtrl.mem_task[RDI],RAX
MOV U64 CTask.code_heap[RAX],RDI
MOV U64 CTask.data_heap[RAX],RDI
MOV U32 CTask.task_signature[RAX],TASK_SIGNATURE_VAL
BTS U32 [SYS_RUN_LEVEL],RLf_BOOT_HEAP
PUSH MEM_ADAM_STK
PUSH U32 SYS_FIXED_AREA+CSysFixedArea.adam
CALL &TaskInit
CALL SET_FS_BASE
MOV RSP,U64 CTask.rsp[RAX]
JMP I32 &KernelMain
//************************************
USE32
SYS_ENTER_LONG_MODE:: //Switch to long 64-bit mode
MOV_EAX_CR4
OR EAX,0xB0
MOV_CR4_EAX
MOV EAX,SYS_FIXED_AREA+CSysFixedArea.pml4
MOV_CR3_EAX
MOV ECX,IA32_EFER
XOR EDX,EDX
MOV EAX,IA32F_LME
WRMSR
MOV_EAX_CR0
BTS EAX,31 //Enable paging (required for 64-bit mode)
MOV_CR0_EAX
DU8 0xEA; //JMP CGDT.cs64:@@05
DU32 @@05;
DU16 CGDT.cs64;
USE64
@@05: MOV AX,CGDT.ds
MOV DS,AX
MOV ES,AX
MOV SS,AX
MOV FS,AX
MOV GS,AX
RET
//************************************
SYS_RAM_REBOOT:: //This gets copied high. $LK,"SYS_RAM_REBOOT",A="FF:::/Adam/Opt/Boot/BootRAM.CPP,SYS_RAM_REBOOT:2"$
PUSH U32 CGDT.ds //stk seg
PUSH U32 BOOT_RAM_LIMIT //stk
PUSH U32 0 //flags
PUSH U32 CGDT.cs32
LEA RAX,[@@10]
PUSH RAX
IRET
USE32
@@10: WBINVD
//Disable paging
MOV_EAX_CR0
BTR EAX,31
MOV_CR0_EAX
MOV ECX,IA32_EFER
XOR EDX,EDX
XOR EAX,EAX
WRMSR
MOV EBX,BOOT_SRC_RAM
MOV EAX,I32 CORE0_32BIT_INIT
JMP EAX
SYS_RAM_REBOOT_END::
USE64
}
Kernel/KTask.CPP
+1 -1
View File
@@ -196,7 +196,7 @@ I64 TaskInit(CTask *task,I64 stk_size)
task->win_top =13;
task->win_bottom =text.rows-2;
if (blkdev.home_dir) {//Beware Adam $LK,"TaskInit",A="FF:::/Kernel/KStart.CPP,TaskInit"$. I guess ok until $LK,"ChgDsk",A="FF:::/Kernel/KEnd.CPP,ChgDsk"$().
if (blkdev.home_dir) {//Beware Adam $LK,"TaskInit",A="FF:::/Kernel/KStart64.CPP,TaskInit"$. I guess ok until $LK,"ChgDsk",A="FF:::/Kernel/KEnd.CPP,ChgDsk"$().
task->cur_dv=blkdev.let_to_drv[*blkdev.home_dir-'A'];
task->cur_dir=StrNew(blkdev.home_dir+2,task);
} else
Kernel/KUtils.CPP
+1 -1
View File
@@ -163,7 +163,7 @@ _BIT_FIELD_OR_U32::
OR U64 [RBX],RAX
POP RBP
RET1 24
_BIT_FIELD_EXTRACT_U32::
_BIT_FIELD_EXT_U32::
PUSH RBP
MOV RBP,RSP
MOV RBX,U64 SF_ARG2[RBP]
Kernel/Kernel.MAP
+1240 -1277
View File
File diff suppressed because it is too large. Load diff
Kernel/Kernel.PRJ
+3 -1
View File
@@ -11,7 +11,9 @@
};
#include "KernelA.HPP"
#include "KStart"
#include "KStart16"
#include "KStart32"
#include "KStart64"
#include "KMathA"
#include "KUtils"
#exe {Option(OPTf_KEEP_PRIVATE,ON);};
Kernel/KernelA.HPP
+55 -54
View File
@@ -416,7 +416,7 @@ class CPatchTableAbsAddr
#help_index "Boot"
class CKernel
{//Must match $LK,"OSStartUp",A="FF:::/Kernel/KStart.CPP,SYS_BOOT_BASE"$
{//Must match $LK,"OSStartUp",A="FF:::/Kernel/KStart16.CPP,SYS_BOOT_BASE"$
CBinFile h;
U32 jmp,
boot_src,
@@ -836,7 +836,7 @@ public class CHashClass:CHashSrcSym
U32 member_cnt;
U8 ptr_stars_cnt,raw_type;
U16 flags;
CMemberLst *member_lst_and_root, //Head of linked list and root of tree.
CMemberLst *member_lst_and_root, //Head of linked list and head of tree.
*member_class_base_root, //For finding dup class local vars.
*last_in_member_lst;
CHashClass *base_class,
@@ -900,44 +900,44 @@ public class CHashGlblVar:CHashSrcSym
#define DOCT_TEXT 0
#define DOCT_NEW_LINE 1
#define DOCT_SOFT_NEW_LINE 2
#define DOCT_CURSOR 3
#define DOCT_MARKER 4
#define DOCT_TAB 5
#define DOCT_CLEAR 6
#define DOCT_PAGE_BREAK 7
#define DOCT_PAGE_LEN 8
#define DOCT_LEFT_MARGIN 9
#define DOCT_RIGHT_MARGIN 10
#define DOCT_HEADER 11
#define DOCT_FOOTER 12
#define DOCT_INDENT 13
#define DOCT_FOREGROUND 14
#define DOCT_BACKGROUND 15
#define DOCT_DFT_FOREGROUND 16
#define DOCT_DFT_BACKGROUND 17
#define DOCT_PMT 18
#define DOCT_TAB 3
#define DOCT_PAGE_BREAK 4
#define DOCT_CURSOR 5
#define DOCT_MARKER 6
#define DOCT_PMT 7
#define DOCT_CLEAR 8
#define DOCT_PAGE_LEN 9
#define DOCT_LEFT_MARGIN 10
#define DOCT_RIGHT_MARGIN 11
#define DOCT_HEADER 12
#define DOCT_FOOTER 13
#define DOCT_INDENT 14
#define DOCT_FOREGROUND 15
#define DOCT_BACKGROUND 16
#define DOCT_DFT_FOREGROUND 17
#define DOCT_DFT_BACKGROUND 18
#define DOCT_WORD_WRAP 19
#define DOCT_UNDERLINE 20
#define DOCT_INVERT 21
#define DOCT_BLINK 22
#define DOCT_SHIFTED_X 23
#define DOCT_SHIFTED_Y 24
#define DOCT_CURSOR_MOVEMENT 25
#define DOCT_ANCHOR 26
#define DOCT_LINK 27
#define DOCT_BUTTON 28
#define DOCT_DATA 29
#define DOCT_CHECK_BOX 30
#define DOCT_LST 31
#define DOCT_MACRO 32
#define DOCT_MENU_VAL 33
#define DOCT_HEX_ED 34
#define DOCT_TREE 35
#define DOCT_SPRITE 36
#define DOCT_INS_BIN 37
#define DOCT_INS_BIN_SIZE 38
#define DOCT_SONG 39
#define DOCT_HIGHLIGHT 40
#define DOCT_HIGHLIGHT 20
#define DOCT_BLINK 21
#define DOCT_INVERT 22
#define DOCT_UNDERLINE 23
#define DOCT_SHIFTED_X 24
#define DOCT_SHIFTED_Y 25
#define DOCT_CURSOR_MOVEMENT 26
#define DOCT_ANCHOR 27
#define DOCT_LINK 28
#define DOCT_BUTTON 29
#define DOCT_DATA 30
#define DOCT_CHECK_BOX 31
#define DOCT_LST 32
#define DOCT_MACRO 33
#define DOCT_MENU_VAL 34
#define DOCT_HEX_ED 35
#define DOCT_TREE 36
#define DOCT_SPRITE 37
#define DOCT_INS_BIN 38
#define DOCT_INS_BIN_SIZE 39
#define DOCT_SONG 40
#define DOCT_HTML_CODE 41
#define DOCT_ERROR 42
@@ -1353,7 +1353,7 @@ class CDocUndo
public class CDoc //Linked Text File header
{//See $LK,"Doc",A="HI:Doc"$ for documentation.
CDocEntryBase root;
CDocEntryBase head;
I64 flags,locked_flags;
CDocEntry *cur_entry,*old_cur_entry;
I32 cur_col,old_cur_col,
@@ -1390,9 +1390,9 @@ public class CDoc //Linked Text File header
CDoc *parent_doc; //(When browsing deeper, opening deeper docs.)
U64 desc; //8 characters. See $LK,"DocBorderLstDraw",A="MN:DocBorderLstDraw"$().
CDocBin bin_root;
CDocSettings settings_root;
CDocUndo undo_root;
CDocBin bin_head;
CDocSettings settings_head;
CDocUndo undo_head;
I64 user_data;
U0 pad;#assert !($$&7) //(compiler lags one token)
@@ -2018,7 +2018,7 @@ class CCodeCtrl
{
CCodeCtrl *coc_next;
CCodeMisc *coc_next_misc,*coc_last_misc;
CIntermediateCodeBase coc_root;
CIntermediateCodeBase coc_head;
};
#help_index "Compiler/Lex"
@@ -2922,9 +2922,10 @@ public class CDevGlbls
{
I64 *idt;
U8 *mem64_ptr;
U8 *uncached_alias; //Alias of lowest 4 Gig.
U8 mp_apic_ids[MP_MAX_PROCESSORS];
CMemRange mem32_root;
CPCIDev pci_root;
CMemRange mem32_head;
CPCIDev pci_head;
};
#help_index "Graphics/Color;Graphics/Device Contexts"
@@ -3463,16 +3464,16 @@ public class CCPU //The Gs segment reg points to current CCPU.
#help_index "Memory/Page Tables"
#define MEM_MIN_MEG 512 //512 Meg minimum.
#define MEM_MAPPED_SPACE 0x2000000000 //Arbitrarily set to 128 Gig.
#define MEM_NUM_PML2 (MEM_MAPPED_SPACE>>(9+21))
#define MEM_NUM_PML3 1
#define MEM_NUM_PML4 1
#define MEM_MAPPED_SPACE 0x4000000000 //Arbitrarily set to 256 Gig.
#define MEM_NUM_2MEG (MEM_MAPPED_SPACE>>21)
#define MEM_NUM_USED_1GIG (MEM_MAPPED_SPACE>>(21+9))
#define MEM_NUM_1GIG (0x1000/8)
#define MEM_NUM_512GIG (0x1000/8)
#define SYS_FIXED_AREA 0x100000
public class CSysFixedArea
{
U8 pml2[MEM_NUM_PML2*0x1000],pml3[MEM_NUM_PML3*0x1000],
pml4[MEM_NUM_PML4*0x1000];
U8 pml2[MEM_NUM_2MEG*8],pml3[MEM_NUM_1GIG*8],pml4[MEM_NUM_512GIG*8];
$$=($$+15)&-16;
CFPU init_fpu_mmx;
CCPU boot_cpu;
@@ -3823,7 +3824,7 @@ class CKeyDevEntry
class CKeyDevGlbls
{
CKeyDevEntry put_key_root;
CKeyDevEntry put_key_head;
U0 (**fp_ctrl_alt_cbs)(I64 sc);
I64 ctrl_alt_in_irq_flags,
**ctrl_alt_ret_addr; //addr of ret addr on stack in kbd irq
@@ -3843,7 +3844,7 @@ class CSndData
public class CSndGlbls
{
F64 freq;
CSndData record_root;
CSndData record_head;
Bool record;
};
Kernel/KernelB.HPP
+4 -7
View File
@@ -26,7 +26,7 @@ public _intern IC_LBTS Bool LBts(
U8 *bit_field,I64 bit); //Locked bit test and set to one.
public _extern _BEQU Bool BEqu(
U8 *bit_field,I64 bit,Bool val);//Set bit equ to val.
public _extern _BIT_FIELD_EXTRACT_U32 U32 BFieldExtU32(
public _extern _BIT_FIELD_EXT_U32 U32 BFieldExtU32(
U8 *bit_field,I64 bit,I64 size); //Extract U32 from bit field.
public _extern _BIT_FIELD_OR_U32 U0 BFieldOrU32(
U8 *bit_field,I64 bit,U32 pattern); //Or U32 into bit field.
@@ -63,7 +63,7 @@ public _intern IC_STRLEN I64 StrLen(U8 *st); //String length.
#help_index "Data Types/Circular Queue"
#help_file "::/Doc/Que"
public _intern IC_QUE_INIT U0 QueInit(
CQue *root); //Init queue root links.
CQue *head); //Init queue head links.
public _intern IC_QUE_INS U0 QueIns(
CQue *entry,CQue *pred);//Insert item into que after predecessor.
public _intern IC_QUE_INS_REV U0 QueInsRev(
@@ -106,7 +106,7 @@ public _intern IC_SIN F64 Sin(F64 d); //Sine.
public _intern IC_SQR F64 Sqr(F64 d); //Square of F64.
public _intern IC_SQR_I64 I64 SqrI64(I64 i); //Square of I64.
public _intern IC_SQR_U64 U64 SqrU64(U64 i); //Square of U64.
public _intern IC_SQRT F64 Sqrt(F64 d); //Square root of F64.
public _intern IC_SQRT F64 Sqrt(F64 d); //Square head of F64.
public _intern IC_SWAP_I64 U0 SwapI64(
I64 *n1,I64 *n2); //Swap two I64s. Not atomic.
public _intern IC_SWAP_U16 U0 SwapU16(
@@ -176,6 +176,7 @@ public _extern _MEMSET_U32 U32 *MemSetU32(
U32 *dst,I64 val,I64 U32cnt); //Set chunk of U32s to value.
public _extern _MEMSET U8 *MemSetU8(
U8 *dst,I64 val,I64 U8cnt); //Set chunk of U8s to value.
_extern SYS_GIG_PAGES U8 sys_gig_pages;
_extern SYS_HEAP_DBG_FLAG U8 sys_heap_dbg;
_extern SYS_HEAP_INIT_FLAG U8 sys_heap_init_flag;
_extern SYS_HEAP_INIT_VAL U8 sys_heap_init_val;
@@ -278,8 +279,4 @@ public _intern IC_FS CTask *Fs(); //FS seg reg points to the current $LK,"CTask"
#help_file "::/Doc/TimeCycles"
public _intern IC_RDTSC I64 GetTSC(); //Get time stamp counter.
#help_index "Time/HPET"
#help_file "::/Doc/TimeHPET"
public _intern IC_HPET I64 HPET(); //Get high precision event timer.
#help_index ""
Kernel/KernelC.HPP
+15 -11
View File
@@ -128,10 +128,10 @@ public extern U0 ArcExpandBuf(CArcCtrl *c);
public extern Bool ArcFinishCompression(CArcCtrl *c);
#help_index "Data Types/Circular Queue"
public extern I64 QueCnt(CQue *root);
public extern CQue *QueCopy(CQue *root,CTask *mem_task=NULL);
public extern U0 QueDel(CQue *root,Bool querem=FALSE);
public extern I64 QueSize(CQue *root);
public extern I64 QueCnt(CQue *head);
public extern CQue *QueCopy(CQue *head,CTask *mem_task=NULL);
public extern U0 QueDel(CQue *head,Bool querem=FALSE);
public extern I64 QueSize(CQue *head);
#help_index "Data Types/Fifo"
public extern I64 FifoI64Cnt(CFifoI64 *f);
@@ -243,8 +243,8 @@ public extern U8 *DefineSub(I64 sub,U8 *dname);
#help_index "Devices;Memory/Page Tables"
public extern U8 *Mem32DevAlloc(I64 size,I64 alignment);
public extern U0 Mem32DevFree(U8 *base);
public extern U8 *Mem64DevAlloc(I64 *_pages2Meg);
public extern U0 Mem64DevFree(U8 *base,I64 pages2Meg);
public extern U8 *Mem64DevAlloc(I64 *_pages1Gig);
public extern U0 Mem64DevFree(U8 *base,I64 pages1Gig);
public extern CDevGlbls dev;
#help_index "DolDoc/Clipboard"
@@ -375,7 +375,7 @@ public extern I64 FileWrite(U8 *filename,
public extern CDirEntry *FilesFind(U8 *files_find_mask,I64 fuf_flags=0);
#help_index "File/System"
public extern CATARep *ATAIDDrvs(CATARep *root,CATARep **_ata_drv,
public extern CATARep *ATAIDDrvs(CATARep *head,CATARep **_ata_drv,
CATARep **_atapi_drv);
extern CBlkDev *ATAMount(U8 first_drv_let,
I64 type,I64 base0,I64 base1,I64 unit);
@@ -460,7 +460,7 @@ extern CMouseStateGlbls mouse_last;
#help_index "Install"
#help_file "::/Doc/Install"
extern CATARep *ATARepFind(CATARep *haystack_root,I64 needle_num);
extern CATARep *ATARepFind(CATARep *haystack_head,I64 needle_num);
public extern Bool DrvEnable(U8 drv_let,Bool val);
#help_index "Install;File/Cmd Line (Typically);Cmd Line (Typically);"
@@ -479,7 +479,7 @@ public extern CKeyDevEntry *KeyDevAdd(Bool (*fp_put_key)(I64 ch,I64 sc),
Bool (*fp_puts)(U8 *st),I64 priority,Bool key_descs=FALSE);
public extern U0 KeyDevRem(CKeyDevEntry *tempp);
extern CKeyDevGlbls keydev;
extern CSrvCmd sys_macro_root;
extern CSrvCmd sys_macro_head;
extern CTask *sys_macro_task;
#help_index "Keyboard Devices;Char/Input;StdIn"
@@ -554,6 +554,7 @@ public extern CHeapCtrl *HeapCtrlInit(CHeapCtrl *hc=NULL,
#help_index "Memory/Page Tables"
public extern Bool MemPagePresentMark(U8 *a,Bool val);
public extern I64 MemPageSize(U8 *a);
public extern I64 *MemPageTable(U8 *a);
#help_index "Messages"
@@ -611,7 +612,7 @@ public _extern SYS_PCI_SERVICES
#help_index "PCI;Info;File/System;Devices"
public extern I64 ATARep(Bool pmt=TRUE,
Bool just_ide=FALSE,CATARep **_root=NULL);
Bool just_ide=FALSE,CATARep **_head=NULL);
#help_index "Processor"
public extern U8 *IntEntryGet(I64 irq);
@@ -727,7 +728,6 @@ extern U8 *MPrintTime(CDate cdt);
public extern CDate Now();
public extern CDate Struct2Date(CDateStruct *_ds);
public extern CDate local_time_offset;
#help_index "Time/Date;Date"
#help_file "::/Doc/Date"
public extern I64 DayOfWeek(I64 i);
@@ -739,6 +739,10 @@ public extern I64 YearStartDate(I64 year);
public extern U16 mon_start_days1[12];
public extern U16 mon_start_days2[12];
#help_index "Time/HPET"
#help_file "::/Doc/TimeHPET"
public extern I64 HPET();
#help_index "Time/Jiffies"
#help_file "::/Doc/TimeJiffy"
public extern I64 SysTimerRead();//18.33333*65536Hz (SYS_TIMER_FREQ)
Kernel/KeyDev.CPP
+7 -7
View File
@@ -2,12 +2,12 @@ U0 PutKey(I64 ch=0,I64 sc=0)
{//See $LK,"Keyboard Devices",A="HI:Keyboard Devices/System"$.
CKeyDevEntry *tempp;
if (ch||sc) {
tempp=keydev.put_key_root.next;
tempp=keydev.put_key_head.next;
if (!Bt(&Fs->display_flags,DISPLAYf_SILENT)) {
if (kbd.scan_code & SCF_SCROLL && sys_focus_task==Fs)
while (kbd.scan_code & SCF_SCROLL)
Yield; //Wait on SCROLL LOCK Key
while (tempp!=&keydev.put_key_root) {
while (tempp!=&keydev.put_key_head) {
if ((!(sc&SCF_KEY_DESC) || tempp->flags & KDF_HAS_DESCS) &&
(*tempp->put_key)(ch,sc))
break;
@@ -33,12 +33,12 @@ U0 PutS(U8 *st)
U8 *ptr;
Bool cont=TRUE;
if (!st) return;
CKeyDevEntry *tempp=keydev.put_key_root.next;
CKeyDevEntry *tempp=keydev.put_key_head.next;
if (!Bt(&Fs->display_flags,DISPLAYf_SILENT)) {
if (kbd.scan_code & SCF_SCROLL && sys_focus_task==Fs)
while (kbd.scan_code & SCF_SCROLL)
Yield;
while (cont && tempp!=&keydev.put_key_root) {
while (cont && tempp!=&keydev.put_key_head) {
if (tempp->put_s) {
if ((*tempp->put_s)(st))
break;
@@ -70,7 +70,7 @@ U0 KeyDevRem(CKeyDevEntry *tempp)
CKeyDevEntry *KeyDevAdd(Bool (*fp_put_key)(I64 ch,I64 sc),
Bool (*fp_puts)(U8 *st),I64 priority,Bool key_descs=FALSE)
{//Places hook in StdOut chain. See $LK,"Keyboard Devices",A="HI:Keyboard Devices/System"$.
CKeyDevEntry *tempp=keydev.put_key_root.last,
CKeyDevEntry *tempp=keydev.put_key_head.last,
*tempp1=ACAlloc(sizeof(CKeyDevEntry));
tempp1->put_key=fp_put_key;
tempp1->put_s=fp_puts;
@@ -204,8 +204,8 @@ U0 KeyDevInit()
keydev.ctrl_alt_no_shift_descs=CAlloc(26*sizeof(U8 *));
keydev.ctrl_alt_shift_descs =CAlloc(26*sizeof(U8 *));
keydev.ctrl_alt_in_irq_flags =0;
MemSet(&keydev.put_key_root,0,sizeof(CKeyDevEntry));
QueInit(&keydev.put_key_root);
MemSet(&keydev.put_key_head,0,sizeof(CKeyDevEntry));
QueInit(&keydev.put_key_head);
KeyDevAdd(&KDInputFilterPutKey,&KDInputFilterPutS,0x40000000,FALSE);
KeyDevAdd(&KDRawPutKey,&KDRawPutS,0x60000000,FALSE);
CtrlAltCBSet('C',&CtrlAltC,"Cmd /Break Execution",,TRUE);
Kernel/Mem/HeapCtrl.CPP
+1 -1
View File
@@ -1,6 +1,6 @@
CHeapCtrl *HeapCtrlInit(CHeapCtrl *hc=NULL,CTask *task=NULL,CBlkPool *bp)
{//See $LK,"HeapLog",A="MN:HeapLog"$() for an example.
//Duplicated for $LK,"Adam Task",A="FF:::/Kernel/KStart.CPP,CHeapCtrl.bp"$.
//Duplicated for $LK,"Adam Task",A="FF:::/Kernel/KStart64.CPP,CHeapCtrl.bp"$.
if (!hc)
hc=ACAlloc(sizeof(CHeapCtrl));
hc->hc_signature=HEAP_CTRL_SIGNATURE_VAL;
Kernel/Mem/Mem512.CPP
+3 -2
View File
@@ -57,7 +57,7 @@ Return: NULL if out of memory.
} while (i<64-MEM_PAGE_BITS-1);
pages512=0;
res=NULL; //Out of memory
goto at_done;
goto at_done2;
}
if (res->pages<pages512)
m=res;
@@ -74,7 +74,8 @@ Return: NULL if out of memory.
}
}
at_done:
bp->used_u8s+=pages512<<MEM_PAGE_BITS;
bp->used_u8s+=res->pages<<MEM_PAGE_BITS;
at_done2:
LBtr(&bp->locked_flags,BPlf_LOCKED);
POPFD
return res;
Kernel/Mem/MemPhysical.CPP
+37 -27
View File
@@ -1,7 +1,7 @@
Bool Mem32DevIns(CMemRange *tempmr)
{
CMemRange *tempmr1=dev.mem32_root.next,*tempmr2;
while (tempmr1!=&dev.mem32_root) {
CMemRange *tempmr1=dev.mem32_head.next,*tempmr2;
while (tempmr1!=&dev.mem32_head) {
if (!tempmr1->type && tempmr->base>=tempmr1->base &&
tempmr->base+tempmr->size<=tempmr1->base+tempmr1->size) {
if (tempmr->base>tempmr1->base) {
@@ -32,14 +32,14 @@ U0 Mem32DevInit()
CMemRange *tempmr;
CMemE820 *m20=SYS_MEM_E820;
QueInit(&dev.mem32_root);
QueInit(&dev.mem32_head);
tempmr=AMAlloc(sizeof(CMemRange));
tempmr->type=MRT_UNUSED;
tempmr->flags=0;
//Maybe !!! Change this to 0xF0000000 !!!
tempmr->base=0xE0000000;
tempmr->size=0x10000000;
QueIns(tempmr,dev.mem32_root.last);
QueIns(tempmr,dev.mem32_head.last);
if (m20->type) {
while (m20->type) {
@@ -67,10 +67,13 @@ U0 MemPagesNotPresentMark()
m20++;
}
if (max_physical>=0x1000000+m01[1]<<16) {
a=(max_physical+0x1FFFFF)&~0x1FFFFF;
if (sys_gig_pages)
a=(max_physical+0x3FFFFFFF)&~0x3FFFFFFF;
else
a=(max_physical+0x1FFFFF)&~0x1FFFFF;
while (a<MEM_MAPPED_SPACE) {
MemPagePresentMark(a,FALSE);
a+=0x200000;
a+=MemPageSize(a);
}
}
}
@@ -83,8 +86,8 @@ U8 *Mem32DevAlloc(I64 size,I64 alignment)
CMemRange *tempmr,*tempmr1;
while (LBts(&sys_semas[SYS_SEMA_DEV_MEM],0))
Yield;
tempmr1=dev.mem32_root.next;
while (tempmr1!=&dev.mem32_root) {
tempmr1=dev.mem32_head.next;
while (tempmr1!=&dev.mem32_head) {
base=(tempmr1->base+alignment-1)&~(alignment-1);
limit=base+size-1;
if (!tempmr1->type &&
@@ -114,8 +117,8 @@ U0 Mem32DevFree(U8 *base)
if (!base) return;
while (LBts(&sys_semas[SYS_SEMA_DEV_MEM],0))
Yield;
tempmr=dev.mem32_root.next;
while (tempmr!=&dev.mem32_root) {
tempmr=dev.mem32_head.next;
while (tempmr!=&dev.mem32_head) {
if (tempmr->base==base) {
tempmr->type=MRT_UNUSED;
break;
@@ -125,40 +128,47 @@ U0 Mem32DevFree(U8 *base)
LBtr(&sys_semas[SYS_SEMA_DEV_MEM],0);
}
U8 *Mem64DevAlloc(I64 *_pages2Meg)
U8 *Mem64DevAlloc(I64 *_pages1Gig)
{//Alloc 64-bit addr space for device.
U8 *res;
I64 i=*_pages2Meg,*pte;
U8 *a;
I64 i=*_pages1Gig,*pte;
while (LBts(&sys_semas[SYS_SEMA_DEV_MEM],0))
Yield;
while (i--) {
dev.mem64_ptr-=0x200000;
pte=MemPageTable(dev.mem64_ptr);
*pte=*pte&~0x18 |0x11; //Uncached and present
InvlPg(dev.mem64_ptr);
a=dev.mem64_ptr-=1<<30;
do {
pte=MemPageTable(a);
*pte=*pte&~0x18 |0x11; //Uncached and present
InvlPg(dev.mem64_ptr);
a+=MemPageSize(a);
} while (a-dev.mem64_ptr<1<<30);
}
res=dev.mem64_ptr;
LBtr(&sys_semas[SYS_SEMA_DEV_MEM],0);
return res;
return dev.mem64_ptr;
}
U0 Mem64DevFree(U8 *base,I64 pages2Meg)
U0 Mem64DevFree(U8 *base,I64 pages1Gig)
{//Free 64-bit device address space.
if (!base) return;
while (LBts(&sys_semas[SYS_SEMA_DEV_MEM],0))
Yield;
if (base==dev.mem64_ptr)
dev.mem64_ptr+=pages2Meg*0x200000;
dev.mem64_ptr+=pages1Gig*1<<30;
//else not freed
LBtr(&sys_semas[SYS_SEMA_DEV_MEM],0);
}
U8 *MemVGAAlloc()
U0 UncachedAliasAlloc() //Make uncached alias for 4 lowest Gig.
{
I64 i=1,*a=Mem64DevAlloc(&i),*pte=MemPageTable(a);
*pte=0x197;
InvlPg(a);
return a;
I64 i=4,*pte;
U8 *a;
a=dev.uncached_alias=Mem64DevAlloc(&i);
do {
pte=MemPageTable(a);
*pte=0x197+a-dev.uncached_alias;
InvlPg(a);
a+=MemPageSize(a);
} while (a-dev.uncached_alias<1<<32);
}
I64 BIOSTotalMem()
@@ -191,4 +201,4 @@ I64 Scale2Mem(I64 min,I64 max,I64 limit=2*1024*1024*1024)
return max;
else
return min+(max-min)*i/limit;
}
}
Kernel/Mem/PageTables.CPP
+56 -36
View File
@@ -7,37 +7,59 @@ SYS_INIT_PAGE_TABLES::
MOV EDI,SYS_FIXED_AREA
XOR EAX,EAX
MOV ECX,sizeof(CSysFixedArea)/4
REP_STOSD //Init entire SYS_FIXED_AREA to zero
REP_STOSD //Init entire SYS_FIXED_AREA to zero
//PML2
MOV EAX,0x87 //bit 7 is page size (1==2Meg)
MOV EAX,0x80000001
CPUID
BT EDX,26
JC @@15
MOV U8 [SYS_GIG_PAGES],FALSE
//PML2: Use 2Meg PAges
MOV EAX,0x87 //bit 7 is page size (2Meg)
XOR EDX,EDX
MOV EDI,SYS_FIXED_AREA+CSysFixedArea.pml2
MOV ECX,MEM_NUM_PML2*0x200
@@20: MOV U32 [EDI],EAX
MOV ECX,MEM_NUM_2MEG
@@05: MOV U32 [EDI],EAX
ADD EDI,4
MOV U32 [EDI],EDX
ADD EDI,4
ADD EAX,0x200000
ADC EDX,0
LOOP @@20
//0xE0000000-0xFFFFFFFF: PCI Devs
MOV EAX,0x17 //Cache disabled
XOR EDX,EDX
MOV EDI,SYS_FIXED_AREA+CSysFixedArea.pml2+8*0x700
MOV ECX,0x800-0x700
@@25: OR U32 [EDI],EAX
ADD EDI,4
OR U32 [EDI],EDX
ADD EDI,4
LOOP @@25
//PML3
LOOP @@05
//PML3: Use 2Meg Pages
MOV EAX,SYS_FIXED_AREA+CSysFixedArea.pml2+7
XOR EDX,EDX
MOV EDI,SYS_FIXED_AREA+CSysFixedArea.pml3
MOV ECX,MEM_NUM_PML2
MOV ECX,MEM_NUM_USED_1GIG
@@10: MOV U32 [EDI],EAX
ADD EDI,4
MOV U32 [EDI],EDX
ADD EDI,4
ADD EAX,0x1000
ADC EDX,0
LOOP @@10
JMP @@25
@@15: MOV U8 [SYS_GIG_PAGES],TRUE
//PML3: Use 1Gig Pages
MOV EAX,0x87 //bit 7 is page size (1Gig)
XOR EDX,EDX
MOV EDI,SYS_FIXED_AREA+CSysFixedArea.pml3
MOV ECX,MEM_NUM_USED_1GIG
@@20: MOV U32 [EDI],EAX
ADD EDI,4
MOV U32 [EDI],EDX
ADD EDI,4
ADD EAX,0x40000000
ADC EDX,0
LOOP @@20
//PML4
@@25: MOV EAX,SYS_FIXED_AREA+CSysFixedArea.pml3+7
XOR EDX,EDX
MOV EDI,SYS_FIXED_AREA+CSysFixedArea.pml4
MOV ECX,MEM_NUM_1GIG/(0x1000/8)
@@30: MOV U32 [EDI],EAX
ADD EDI,4
MOV U32 [EDI],EDX
@@ -46,19 +68,6 @@ SYS_INIT_PAGE_TABLES::
ADC EDX,0
LOOP @@30
//PML4
MOV EAX,SYS_FIXED_AREA+CSysFixedArea.pml3+7
XOR EDX,EDX
MOV EDI,SYS_FIXED_AREA+CSysFixedArea.pml4
MOV ECX,MEM_NUM_PML3
@@35: MOV U32 [EDI],EAX
ADD EDI,4
MOV U32 [EDI],EDX
ADD EDI,4
ADD EAX,0x1000
ADC EDX,0
LOOP @@35
MOV U32 [SYS_CODE_BP],SYS_FIXED_AREA+CSysFixedArea.adam_bp
MOV U32 [SYS_CODE_BP+4],0
@@ -93,7 +102,7 @@ pain without MAlloc up-and-running.
//EBX=BASE EAX=SIZE
TEST U8 [SYS_MEM_INIT_FLAG],1
JZ @@40
JZ @@35
PUSH EAX
MOV EDI,EBX
MOV ECX,EAX
@@ -101,7 +110,7 @@ pain without MAlloc up-and-running.
REP_STOSB
POP EAX
@@40: SHR EAX,MEM_PAGE_BITS
@@35: SHR EAX,MEM_PAGE_BITS
MOV ESI,SYS_FIXED_AREA+CSysFixedArea.adam_bp
MOV EDI,U32 CBlkPool.mem_free_lst[ESI]
MOV U32 CMemBlk.next[EBX],EDI
@@ -117,7 +126,18 @@ pain without MAlloc up-and-running.
I64 *MemPageTable(U8 *a)
{//Point to page table entry for addr.
return SYS_FIXED_AREA+offset(CSysFixedArea.pml2)+a>>21*8;
if (sys_gig_pages)
return SYS_FIXED_AREA+offset(CSysFixedArea.pml3)+a>>30*8;
else
return SYS_FIXED_AREA+offset(CSysFixedArea.pml2)+a>>21*8;
}
I64 MemPageSize(U8 *)
{//Page table entry size for addr.
if (sys_gig_pages)
return 1<<30; //1Gig
else
return 1<<21; //2Meg
}
Bool MemPagePresentMark(U8 *a,Bool val)
Kernel/MultiProc.CPP
+20 -19
View File
@@ -139,10 +139,10 @@ U0 MPInt(U8 num,I64 cpu_num=1)
}
PUSHFD
CLI //Multitasking safe because each core has a local apic and IRQ's are off
while (*LAPIC_ICR_LOW(U32 *)&0x1000)
while (*(dev.uncached_alias+LAPIC_ICR_LOW)(U32 *)&0x1000)
PAUSE
*LAPIC_ICR_HIGH(U32 *)=dev.mp_apic_ids[cpu_num]<<24;
*LAPIC_ICR_LOW(U32 *)=0x4000+num;
*(dev.uncached_alias+LAPIC_ICR_HIGH)(U32 *)=dev.mp_apic_ids[cpu_num]<<24;
*(dev.uncached_alias+LAPIC_ICR_LOW)(U32 *)=0x4000+num;
POPFD
}
@@ -150,15 +150,15 @@ U0 MPIntAll(U8 num)
{//Generate interrupt for all but own core.
PUSHFD
CLI //Multitasking safe because each core has a local apic and IRQ's are off
while (*LAPIC_ICR_LOW(U32 *)&0x1000)
while (*(dev.uncached_alias+LAPIC_ICR_LOW)(U32 *)&0x1000)
PAUSE
*LAPIC_ICR_LOW(U32 *)=0xC4800+num;
*(dev.uncached_alias+LAPIC_ICR_LOW)(U32 *)=0xC4800+num;
POPFD
}
U0 MPNMInt()
{//Generate nonmaskable interrupt.
*LAPIC_ICR_LOW(U32 *)=0xC4400;
*(dev.uncached_alias+LAPIC_ICR_LOW)(U32 *)=0xC4400;
}
U0 MPHalt()
@@ -172,14 +172,14 @@ U0 MPAPICInit()
{//Called by adam during start-up
//and other cores during initialization
//after $LK,"Core0StartMP",A="MN:Core0StartMP"$().
*LAPIC_SVR(U32 *)|=LAPICF_APIC_ENABLED;
dev.mp_apic_ids[Gs->num]=*LAPIC_APIC_ID(U32 *)>>24;
*LAPIC_LDR(U32 *)=dev.mp_apic_ids[Gs->num]<<24;
*LAPIC_DFR(U32 *)=0xF0000000;
*(dev.uncached_alias+LAPIC_SVR)(U32 *)|=LAPICF_APIC_ENABLED;
dev.mp_apic_ids[Gs->num]=*(dev.uncached_alias+LAPIC_APIC_ID)(U32 *)>>24;
*(dev.uncached_alias+LAPIC_LDR)(U32 *)=dev.mp_apic_ids[Gs->num]<<24;
*(dev.uncached_alias+LAPIC_DFR)(U32 *)=0xF0000000;
// MemSet(LAPIC_IRR,0,0x20);
// MemSet(LAPIC_ISR,0,0x20);
// MemSet(LAPIC_TMR,0,0x20);
// MemSet(dev.uncached_alias+LAPIC_IRR,0,0x20);
// MemSet(dev.uncached_alias+LAPIC_ISR,0,0x20);
// MemSet(dev.uncached_alias+LAPIC_TMR,0,0x20);
SetRAX(Gs->tss->tr);
LTR AX
@@ -315,15 +315,16 @@ U0 Core0StartMP()
mp_cnt_initial=mp_cnt=1;
mp_cnt_lock=0;
*LAPIC_LVT_ERR(U32 *)=*LAPIC_LVT_ERR(U32 *)&0xFFFFFF00+MPN_VECT;
*(dev.uncached_alias+LAPIC_LVT_ERR)(U32 *)=
*(dev.uncached_alias+LAPIC_LVT_ERR)(U32 *)&0xFFFFFF00+MPN_VECT;
WBINVD //Not sure why this is needed. Might just need delay. $LK,"MemCpy",A="MN:MemCpy"$ above?
*LAPIC_ICR_LOW(U32 *)=0xC4500; //assert init IPI
*(dev.uncached_alias+LAPIC_ICR_LOW)(U32 *)=0xC4500; //assert init IPI
BusyWait(10000);
*LAPIC_ICR_LOW(U32 *)=0xC4600+MPN_VECT; //start-up
*(dev.uncached_alias+LAPIC_ICR_LOW)(U32 *)=0xC4600+MPN_VECT; //start-up
BusyWait(200);
*LAPIC_ICR_LOW(U32 *)=0xC4600+MPN_VECT;
*(dev.uncached_alias+LAPIC_ICR_LOW)(U32 *)=0xC4600+MPN_VECT;
BusyWait(100000);
for (i=0;i<10000;i++)
@@ -371,7 +372,7 @@ U0 Core0Init()
}
if (Bt(&ee.rdx,9)) {
//Unnecessary?
// SetMSR(IA32_LAPIC_BASE,LAPIC_BASE+0x900);
// SetMSR(IA32_LAPIC_BASE,dev.uncached_alias+LAPIC_BASE+0x900);
MPAPICInit;
}
}
@@ -379,7 +380,7 @@ U0 Core0Init()
interrupt U0 IntMPCrash()
{//Entering the debugger from another core causes an interrupt on core0
//Which calls this routine.
*LAPIC_EOI(U32 *)=0;
*(dev.uncached_alias+LAPIC_EOI)(U32 *)=0;
mp_cnt=1;
Raw(ON);
text.raw_flags|=RWF_SHOW_DOLLAR;
Kernel/SrvCmd.CPP
+4 -4
View File
@@ -4,10 +4,10 @@ U0 SrvCmdDel(CSrvCmd *tempc)
Free(tempc);
}
U0 SrvCmdQueDel(CSrvCmd *root)
U0 SrvCmdQueDel(CSrvCmd *head)
{
CSrvCmd *tempc=root->next,*tempc1;
while (tempc!=root) {
CSrvCmd *tempc=head->next,*tempc1;
while (tempc!=head) {
tempc1=tempc->next;
QueRem(tempc);
SrvCmdDel(tempc);
@@ -136,7 +136,7 @@ CSrvCmd *TaskMsg(CTask *_srv,CTask *master,I64 msg_code,I64 a1,I64 a2,I64 flags)
srv!=sys_macro_task && msg_code==MSG_KEY_DOWN) {
tempc1=AMAllocIdent(tempc);
CLI
QueIns(tempc1,sys_macro_root.last);
QueIns(tempc1,sys_macro_head.last);
}
CLI
while (Bt(&srv->task_flags,TASKf_FILTER_INPUT) &&
Kernel/StrPrint.CPP
+20 -18
View File
@@ -67,9 +67,7 @@ U8 *MPrintQ(U8 *ptr,I64 flags)
case '$$':
if (flags&SPF_DOLLAR) {
SPutChar(_dst,'\\',_buf);
SPutChar(_dst,'x',_buf);
SPutChar(_dst,'2',_buf);
SPutChar(_dst,'4',_buf);
SPutChar(_dst,'d',_buf);
} else {
SPutChar(_dst,ch,_buf);
SPutChar(_dst,ch,_buf);
@@ -115,7 +113,7 @@ U8 *MPrintQ(U8 *ptr,I64 flags)
U8 *MPrintq(U8 *ptr,I64 flags)
{
U8 **_buf,*buf,**_dst,*dst;
I64 i,ch,ch1;
I64 i,j,ch,ch1;
buf=MAlloc(STR_LEN);
_buf=&buf;
dst=buf;
@@ -127,14 +125,8 @@ U8 *MPrintq(U8 *ptr,I64 flags)
case '\\':
switch (ch1) {
start:
case 'n':
SPutChar(_dst,'\n',_buf);
break;
case 'r':
SPutChar(_dst,'\r',_buf);
break;
case '"':
SPutChar(_dst,'"',_buf);
case '0':
SPutChar(_dst,0,_buf);
break;
case '\'':
SPutChar(_dst,'\'',_buf);
@@ -142,15 +134,24 @@ U8 *MPrintq(U8 *ptr,I64 flags)
case '\`':
SPutChar(_dst,'\`',_buf);
break;
case '"':
SPutChar(_dst,'"',_buf);
break;
case '\\':
SPutChar(_dst,'\\',_buf);
break;
case 'd':
SPutChar(_dst,'$$',_buf);
break;
case 'n':
SPutChar(_dst,'\n',_buf);
break;
case 'r':
SPutChar(_dst,'\r',_buf);
break;
case 't':
SPutChar(_dst,'\t',_buf);
break;
case '0':
SPutChar(_dst,0,_buf);
break;
end:
ptr++;
break;
@@ -159,18 +160,19 @@ U8 *MPrintq(U8 *ptr,I64 flags)
case 'X':
i=0;
ptr++;
while (TRUE) {
for (j=0;j<2;j++) {
ch1=ToUpper(*ptr++);
if (Bt(chars_bmp_hex_numeric,ch1)) {
if (ch1<='9')
i=i<<4+ch1-'0';
else
i=i<<4+ch1-'A'+10;
} else
} else {
ptr--;
break;
}
}
SPutChar(_dst,i,_buf);
ptr--;
break;
default: