From cc99ec9af54c7a0b8276dbcbb736ed4ad839be09 Mon Sep 17 00:00:00 2001 From: kieron Date: Tue, 16 May 2017 14:46:06 +0000 Subject: [PATCH] More Bochs git-svn-id: https://spexeah.com:8443/svn/Asuro@28 6dbc8c32-bb84-406f-8558-d1cf31a0ab0c --- .bochsrc | 1 + Asuro.iso | Bin 5066752 -> 5066752 bytes bin/kernel.bin | Bin 12516 -> 12516 bytes iso/boot/asuro.bin | Bin 12516 -> 12516 bytes lib/bios_data_area.ppu | Bin 2002 -> 2002 bytes lib/gdt.ppu | Bin 2227 -> 2227 bytes lib/kernel.o | Bin 4672 -> 4644 bytes lib/kernel.ppu | Bin 1666 -> 1666 bytes lib/libpkernel.a | Bin 23332 -> 23240 bytes src/kernel.pas | 7 +------ 10 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.bochsrc b/.bochsrc index 8c385ef8..a7842072 100644 --- a/.bochsrc +++ b/.bochsrc @@ -776,3 +776,4 @@ i440fxsupport: enabled=1 # floppya: 1_44=[fd:], status=inserted #======================================================================= display_library: sdl +magic_break: enabled=1 diff --git a/Asuro.iso b/Asuro.iso index 0abbc2880831d91b85e958d3987fddfa359f23e3..f04c9fc43aea4af6a033e5504a2aaa618222c362 100644 GIT binary patch delta 9923 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 delta 436 zcmaEo_#|yK_%o=(>LftwzJpi}Al6$T>xBgekYEO~dSX9xyMA~f0o3zC87K%b0ca@0 zizy%z;z9a6fc7)I*a~7MfQ(oTWI+_NgB0d~6q=EuX@0mg>kDQEhJ!D-9A0oUngFHefTRt9(h#fpKvsVOxqB~= zHQ~i|pj$dz|L|{f{qw>bsPpyP&F+Gnthzct&!lzUN^5-dpCN6>RpuAcK!HtsX*;ek zzYqX2`L|y__=*E8!^pI`RxFuubAaRqw#^r$5*Q~bESS7RK|%IAvj77NivWWl5X%9v fHV|6?u`3VTk^(FhVs}t@)%1;K&_eX%I9{rB+ncfemmNhyBD?k`B&J%X7GSB4QQ15 zu@qko3BDmBmBjh=B$t90lYBw&yu~YR01Di%{lLrN(jm-)t^v?SA?nA}k^XkUD<#e8 zulNy~@eo`m!KGK$gRYk?dl`!t3}Y%%uAfWrvc)&B7$bHCwIlzqB`;%JovU8fyp^pD z^YsM(Zt)`Sm*lIsD{8AVAI~X5efGYQ!Ht6mM{uI8QYR*i}n5lx9lC!zs4{UR!=53JuwP&JsH1JgIQ`y*)z=6H%Dg#Ah z(13Rz-Vokayr;8Y153(fnuw?I(#77s{@$C>v%PnF2Cm)3|--^ delta 436 zcmaEo_#|yK_%o=(>LftwzJpi}Al6$T>xBgekYEO~dSX9xyMA~f0o3zC87K%b0ca@0 zizy%z;z9a6fc7)I*a~7MfQ(oTWI+_NgB0d~6q=EuX@0mg>kDQEhJ!D-9A0oUngFHefTRt9(h#fpKvsVOxqB~= zHQ~i|pj$dz|L|{f{qw>bsPpyP&F+Gnthzct&!lzUN^5-dpCN6>RpuAcK!HtsX*;ek zzYqX2`L|y__=*E8!^pI`RxFuubAaRqw#^r$5*Q~bESS7RK|%IAvj77NivWWl5X%9v fHV|6?u`3Vn5hPu|{puw6v9b0-{n-nF>!)AzVtu22UYrmYbwX}#ZctS*DeI()Nu@T# zWR0qhNk<=$t)rQkT%~%Ex)oC(*CXNzN3|pBzF7vVEioAnSFRi-TZkg35wVeDf{Wwae-2Wq zy~PZ@$LXpdvV{%5@&GV!5?{aqL*!h<#0uTTP->zi73W z;i$=Fa;3q-p3E+iNozT?duS-gI6)>=C=^TS%!u!0*cA*coa_$EkTYdH$dGO6ovKY( zdR(myGBv~ggLrh9uAw{=HLgTuzrqXoP0QJ`iQ7Z_zD;>e92r2RH(n> zxYexlThmq63oHD;vc9rHqt=o<1;Y;Z9x)pGH?nu%3VoZBpmM^f%GtPqDqC?|Y8c**E1hQAyBZOGR)@HZQ7GV~1}GJMjo zYkRu0J;R-bd-T?)f}sFsH1UL`F!K{>85y6y{U-i^)`-PswPV5F^)cq5*-T)PsUyGh&~hV iQjf-n`t|qmq&T5PLs!eGI-+)Nm%HTu8vhgdhxlLmrUzyK delta 1833 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 diff --git a/src/kernel.pas b/src/kernel.pas index ae2ad09a..fdfc7985 100644 --- a/src/kernel.pas +++ b/src/kernel.pas @@ -24,7 +24,7 @@ var begin mbi:= mbinfo; mbm:= mbmagic; - //gdt.init(); + gdt.init(); console.init(); console.writestringln('Booting Asuro...'); if (mbm <> MULTIBOOT_BOOTLOADER_MAGIC) then begin @@ -34,11 +34,6 @@ begin util.halt_and_catch_fire; end; console.clear(); - asm - MOV dds, DS - end; - console.writehexln(dds); - util.halt_and_catch_fire; console.setdefaultattribute(console.combinecolors(Green, Black)); console.writestringln('Asuro Booted Correctly!'); console.writestringln('');