From 6208fac55119471cc6e6c6198febcf0de576d74c Mon Sep 17 00:00:00 2001 From: kieron Date: Sat, 10 Oct 2015 22:43:46 +0000 Subject: [PATCH] Cleanup git-svn-id: https://spexeah.com:8443/svn/Asuro@7 6dbc8c32-bb84-406f-8558-d1cf31a0ab0c --- Asuro.iso | Bin 5066752 -> 5066752 bytes lib/console.ppu | Bin 8501 -> 8501 bytes lib/kernel.ppu | Bin 1410 -> 1410 bytes lib/libpconsole.a | Bin 26948 -> 26948 bytes lib/libpkernel.a | Bin 17192 -> 17192 bytes lib/libpmultiboot.a | Bin 21818 -> 21822 bytes lib/multiboot.o | Bin 2336 -> 2340 bytes lib/multiboot.ppu | Bin 3007 -> 2886 bytes src/console.pas | 13 ------------- src/kernel.pas | 13 ------------- src/multiboot.pas | 17 ++++++----------- src/stub/stub.asm | 13 +------------ 12 files changed, 7 insertions(+), 49 deletions(-) diff --git a/Asuro.iso b/Asuro.iso index 0a79ff7f41721b637314480f786e21b2e159803c..ba0c077af1cfb7021c3d220cdc4f442ae566afba 100644 GIT binary patch delta 10516 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 delta 10512 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 b>=XNV-OJ)6r)56Jx1K^jzl-Pj*E{nM9czO@ diff --git a/lib/kernel.ppu b/lib/kernel.ppu index d94c4732af967495db1325f2b3741e7eac8f378d..f531ef5ec45d9ccd1fdae296bba71ccc321555cd 100644 GIT binary patch delta 108 zcmZqTZsML0z|u8YGHhaqGRKKqKRwkvzsPN@*JonnoxGkYkCAh-9J4Nv^kH^lWS!j4 zED0o6GRw%Yak4T1fhZ6&$}$5<_T>D$;{2Rc21fSD51A!^T7EJ20}bh7ISC{~SoHux C`Wqhr delta 108 zcmZqTZsML0z|t80Cv;+nGDqzzw!)0XXMHx->oYM*OWto8_dvbnWaehuJ1Ea{~hs+W{Ex(xifrfOkoCJ~~ta<=& CPaE3+ diff --git a/lib/libpconsole.a b/lib/libpconsole.a index d215f2f5833e04fe2efad262c5a4763d51233525..d8f1ab91fcb2924fa9584d5c4c1f59fe6b4c15d0 100644 GIT binary patch delta 567 zcmX?diSfuK#tG8wCZWZUKve)mPcjJ_qYF=V z@E6-`!IjSp(+v`s93$noS%~i>is0rSg2`|@z}hOrj-#rGkrGE$F+uJ(s)`j#=TQZw zs9i@9m~3F?Gx>qqfz4C2k29gTNx=#t(V~AIMPhS-(P9)MHXE2-Mio%7x{WFzVfPtT zK*LEH+2!J!Gu@sc+aj?!&+{W(035=T4g5J_4&3bE&kHvY$Z=+ztncDKc>zbtmnPF9SAOTs~WmMM*SYqlqzytsT CE2H87 delta 567 zcmX?diSfuK#tG8wMrH;kCI*HZm0Ve1?9CSvPB97SWZUKve)mPcjJ_qYF=V z@E6-`!IjSp(+v`s93$noS%~i>is0rSg2`|@z}hOrj-#rGkrGE$F+uJ(s)`j#=TQZw zs9i@9m~3F?Gx>qqfz4C2k29gTNx=#t(V~AIMPhS-(P9)MHXE2-Mio%7x{WFzVfPtT zK*LEH+2!J!Gu@sc+aj?!&+{W(035=T4g5J_4&3bE&kHvY$Z=+ztncDKc>zbtmnPF9SAOTs~WmMM*SYqlqzytt0 CJfkiE diff --git a/lib/libpkernel.a b/lib/libpkernel.a index 8c046e86662a32bee3889c603708ebffab5ae176..385b21b2dc6da6e62b05b21c53e906ac3712082d 100644 GIT binary patch delta 392 zcmZ3{#<-%5ae_3PiK&r+iN!`m9Y!c~^M8|*Op|3;xRLpS#(Mes3P50JVgk`I`M-(y zW;yodY*1xj{v+OxOeosSuxdLc{2QhWqD_pO8QB;vsn^KzlTQhUZO)KgiY&HSO9534 zmz2-uI_3E&YOK^y?3oNwGfxv$O_UDY9H7rnF$qAO4EHElbn<%>E`-Ofz-)o&u!MLL TSqCr#YivE`-Ofz-)o&u!MLL TSqCr#YivFb9iz}@G39-Xd?3Fd`A}cg{)tU+0xi-@A`lMhOGP5$rBt-!z_#=yY9$j!hY2cmfx z7}TJ&9$0*Gpp52ZdluWtN!AsN7bah1S7r@hWMBxIyiiz~brFyiJXw)LneppnK|%4! qQThU`KY(Hilk@fE_>Is49Gu8ZP(l!xQm(>-0+I?*gBU1whzS5~ZMIwh delta 675 zcmdnDigDK}#tG8wMkdBamZp{)m8LSm*qaylpJU?F%hy*hG%Fb9iz}@G39-Xd?3Fd`A}cg{)s}@+(>2$@b2IjBJw&1;i)k$q7upqb)Fbf!jJpx5@tQ;*;;`$WPXF z;hDV9U37AnRfwJ#0|NsiHv@wllvab%dQjR7O51_y$$>JOlkHh-C+8_FV04(gP*|CD z0wV)M@MJ{}WyZ&o1qH I$T`FW09E|0MgRZ+ diff --git a/lib/multiboot.o b/lib/multiboot.o index 6134b201460e0b9afe8609f4db46d2bcabdb63f9..ffdfd06d7b3b285641034d1b89d9c88cf41da67c 100644 GIT binary patch delta 198 zcmZ1=v_xov0^^j8imFVKEDWds#^>3b&vcSe+zcoy$iT#4!-P;Kz`(HCp2e1FasnGG zPjF;#h^udWV7Pyf%j9ad(8=f6<_pR&Fh~J4Fal{M5Y0b%BD?zJUMBX*d)O@)4JLnO zS7t1jEXkn`Bpo@_Sqp%QE=g0KyU@p#T5? delta 144 zcmZ1?v_NQr0^@{@imFVEY!gqaOwMK$-kis@i;>-pfq_AgfoZcni!IaSKDLm_PuS+l z@G~$-F)=VO0%;{Etp%lxCik*uGdfKE$*#=UFjGb>O841iiefCY$^ftX1~0Z6jtq~@iUWH2xq!xeHu74iV3mB0!Wfh22gNo7GQ z1EUFCoe)%=2vC-RVe%x70!Hb{%$(MYDwFMjr0(QuPD4iH$!j?^7%eAX<5Xv~pZt$g zfzfrcJeNG9_hfr66~@5HDO}2o;gdVKtaxLg#(@k=oP3_kf;$T+k^>S2>KEe9PyjiG gU&S}nC&bgq-#;WiGcU6QD8~r)AtOW4mwqIN^ARyGx*p#K2k%5`vKmZfNbZ!QQ+E;9a8H>;Qa56A3s7_QgWtqS8XXwPJ z7RIiP_jws7Col?6_Ggru%+BP;sIobXNs^V3ZE^v-R=pNbJ(G+)kmOBDEKZG2Oi3w< z&&e-mVASPi1&V?JBZOiBQrbYwB%=T%`4H+eGSf2{81>*9IH4LifXdXt8We#fS59hP zdPxSvbOVUuD4@6yR5cHftpQf81SGkksv%|@!p)Y3sulpM0jXn>Q3jH%xh0hasSJ!p zaCIt^c{pkrbtiXmSTmYUJ_aQ1Co^#xGP+JS;nZOCo*c`m&KNkkl~aK+eDX3*dB)hu z$2e6OlPACCRA$Va%+F;do)5JNXgotPh|L7_j{xW7L@w#c)m*~dH9)aCkT|3HvBCjEoE|lNGsD0eZbp0RR91 diff --git a/src/console.pas b/src/console.pas index 4155b0a3..851f01ab 100644 --- a/src/console.pas +++ b/src/console.pas @@ -1,16 +1,3 @@ -{ -///////////////////////////////////////////////////////// -// // -// Freepascal barebone OS // -// console.pas // -// // -///////////////////////////////////////////////////////// -// -// By: De Deyn Kim -// License: Public domain -// -} - unit console; interface diff --git a/src/kernel.pas b/src/kernel.pas index 0530d5ce..61d1b01d 100644 --- a/src/kernel.pas +++ b/src/kernel.pas @@ -1,16 +1,3 @@ -{ -///////////////////////////////////////////////////////// -// // -// Freepascal barebone OS // -// kernel.pas // -// // -///////////////////////////////////////////////////////// -// -// By: De Deyn Kim -// License: Public domain -// -} - unit kernel; interface diff --git a/src/multiboot.pas b/src/multiboot.pas index 140c9fc0..049a68d9 100644 --- a/src/multiboot.pas +++ b/src/multiboot.pas @@ -4,7 +4,6 @@ interface const KERNEL_STACKSIZE = $4000; - MULTIBOOT_BOOTLOADER_MAGIC = $2BADB002; type @@ -19,8 +18,8 @@ type Pmultiboot_info_t = ^multiboot_info_t; multiboot_info_t = packed record flags: DWORD; - mem_lower: DWORD; { Amount of memory available below 1mb } - mem_upper: DWORD; { Amount of memory available above 1mb } + mem_lower: DWORD; + mem_upper: DWORD; boot_device: DWORD; cmdline: DWORD; mods_count: DWORD; @@ -41,15 +40,11 @@ type Pmemory_map_t = ^memory_map_t; memory_map_t = packed record size: DWORD; - { You can declare these two as a single qword if your compiler supports it } - base_addr_low: DWORD; - base_addr_high: DWORD; - { And again, these can be made into one qword variable. } - length_low: DWORD; - length_high: DWORD; - mtype: DWORD; + base_addr : QWORD; + length : QWORD; + mtype: DWORD; end; implementation -end. \ No newline at end of file +end. diff --git a/src/stub/stub.asm b/src/stub/stub.asm index b361513e..c0701d27 100644 --- a/src/stub/stub.asm +++ b/src/stub/stub.asm @@ -1,14 +1,3 @@ -;///////////////////////////////////////////////////////// -;// // -;// Freepascal barebone OS // -;// stub.asm // -;// // -;///////////////////////////////////////////////////////// -;// -;// By: De Deyn Kim -;// License: Public domain -;// - ; ; Kernel stub ; @@ -76,4 +65,4 @@ section .bss ; align 32 KERNEL_STACK: - resb KERNEL_STACKSIZE \ No newline at end of file + resb KERNEL_STACKSIZE