From a362e519b0f8e02354980f5af961ce79d5f48556 Mon Sep 17 00:00:00 2001 From: zhaoyanbai Date: Thu, 10 Jul 2014 00:01:29 +0800 Subject: [PATCH] delete binary file shell & hello --- .gitignore | 4 ++-- bin/hello | Bin 17211 -> 0 bytes bin/shell | Bin 17296 -> 0 bytes boot/multiboot.S | 2 ++ drivers/ide.c | 16 +++++++++------- kernel/setup.c | 2 -- lib/libc.S | 7 +++++++ 7 files changed, 20 insertions(+), 11 deletions(-) delete mode 100755 bin/hello delete mode 100755 bin/shell diff --git a/.gitignore b/.gitignore index 27fa5fc..bd1f8f4 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,6 @@ *.map *.diff *.swp -bin/hw -bin/sh +bin/hello +bin/shell a.* diff --git a/bin/hello b/bin/hello deleted file mode 100755 index 9df53d89f0491da600e6835ba85c0bafe8bbc43d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17211 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 Cz;aCh diff --git a/bin/shell b/bin/shell deleted file mode 100755 index 2be5a31a4b149db06511776db49fd4aacaafa143..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17296 zcmdUWe{@{Mb^o3B-tIn0YwcPRw!o&5edJ&#Se9%<4A=o1J&YY28!QD(AYvu0b{DUH zWPcb;Y%r{CwApY#91cnI-3GT!`XeO`$)Rc*T-O9*L7KE~NlQ+DqCK({WA5C!bLYO9*@v7>Hwhs~KL(iu=-6J%UP(mHUn?;y zsew#dOx0Aycz*U;HvU%E5aG{<$}mZM0}(xE+5AUD4L%~j!r%I4rknX^JOLuIh^RgP zX6{6Np*>h|?0j3Joo{WlMyy7gh(_1=h+ch3Q8+=MKxH+K9(7&!)t8>&XY}n#B3XQ5 z?2K1lVRJaYsWIpgi&jSiEVk!~C$wbUXa%r;ZlO_$3!^z_>WPA5Kekom+wDSo@Ue{| zzd0Bht{Du6hH2lC>`x2Ml+rRh;!L5RV^+?Y5+yE4cfvzA*6c-w4!=@xg4{wdG)$qx zN0z*peA1GRh%*k8Olxsz!I^?lhmUd76dFDvO)#F@Gfo*}tVZim>i-W5&bSgeA9`Dj zqnDp?U1hbbui)5Y>(PkSIBGFsYV0GqUX1u;zO~Vw?yC{kb@v~UT(hMSr>=7*(|@O| z+#`Jru07~X?cFoA?7>-k_e@>$P~h8`oMS%kXw+#BYb>-+<&VAih9QoLBY9`aJNTi) zM{=Xhf-9vzLDQ$D9wTKptRHD@#2lm%tI>e(e@m47iE(IO1d_yC>(^wj3teq#ETy zdocf6{HI>Z$$~SPdpZ26yAe0uM-44ri`VY=h&~^~-C!uR*TtQ4a(q&@q5ZDJQpncF zKkMZhFF4~+?9;5-?TYWD?ul-ykgYH5nI9kavYsqBCz-W_d2{S57}Ak52!kBPW;oqH zlrh1A6Mnx}{-jJ0E;x1h*2c5b{k%+9S8(d{t&Qg;f4fXxUvTE+g$y8ln3+ERDbQ9=kkZ`07QO`2}a3!`k@t zrRA+338I`66skcP^j9yWnogM02K6l^U|MWNFYDlLFYs#umz29UD#- z+E04o$4QVX3CkYTvaWgX`-ROXzZ2`}>B+zH&f71(XXIabaq>gbrYAiDyK}|%e%`X(H#{8+^J@9lyF5hU0%0M4%=t5T@M1v}I_!)U+E3)$8pBYktr07|4FX>9 z$3f>i$SG_-k>Au9E^I#OUFHjt$o|O z+6a^vqV_FHfOsP3gsrlT_Z6}i@ z_7P`%J{H+~3l3&r{>9hc&L7LY5gK$(@7;5n?yuRq=XAwG!O*aC8U}JskJWK`v~tin zEo;|G+U87P#5u`RbI(c2`uFZR-JF@0wVWOd=X%F2q#e7EK3(TbWrL-(<|s86oT;On zz3BY2e#B}t5&it{sX#9mfa510KG7hEM&EW_H#F>Pc;2%29m)FMdJ@w^!mF2MR%3k! z?y=U!dd#9LCR`VFKmNRBk64XBjn+=MF5_k5&2{FlTzB*V*LCyz8tV~=4)Ke!b)JlY zDL1_5x+D7<=L@2P2LwG)kY)JDQ(U|MNOtV4HrI8DsCUq^bAy)s+5B(!H==mo^~kt3 zZ`sQ_6Mf5ws16aDh{OZ8k=SjEc|pq>6hs(d{5^Hbbr*tQZMD7MSU1b}>F)(COX5}& z(bK0~_cAa3lV$u}MD&$YuDisGkCySf@do$Aw$uj;B5gj_^ zx{JN|?lS)0i0I{0uDi{PH?}YV`i8veol~y6eHy;KgvSUqkGt*-Ui|K|{MCYJ>$vM) z2>lNUqRDaB{je9`S(g8A zg6Pb+>u&bqjSWn|{TD0OXGV-nSZ`P1ouA|ezif=IN`b<@$&bS`R_7_nkQWM zN-sWM#_u+WR!_Jtr?uL@?vZ$W9v2Ow8zx-0$;;oGGovr9Wg^fVF^D!!xNge~nz)DN zxIuLL#Efxh&6x>BgZ6EcC_3S~AM?s_4wyMB`O?~>vOV}&vq_Yha9#L*N#~m$H4j)h zUq2{EBrR-qmr1m5!gXuCw9@?;zuP3bZ{pnZr)Uy=X2NwBc=_)x+wYJ`l$tn?|C>Y) zOt>!Qc}dqDW&SCXC_mx4S9|fPGJd{Aba3K4^WP%+%7p78!6?Z$zR3c({}$0TzjECL z_)ya0YhG@E0QlV&(Y2GVyU5EQk?r&NTSV7Sy6$(p_|}|hd{Yh_kH1CqPm`|u=uDai zB@Nm+ZV|0|*LDBQOJn?TNl(j1^zyr|%dt@FxmD@`eq__%e%Ez*|3>5GFjGAdwfcyD z?_JmB>{#Q8X#I^hUfZyE{VnZF8df%~YFg2-yt!p%^VQ2&HY~m^+TCz-BqQsWwk+Xx zU?#c4L-Z8(jTn{>^f2fWL*udkq+>T8iEl6AkMFf?j=SoS_yJS%haa|Vj=R(FcUT&K z<-?YJuT+R1$^U#nLBGd9E`Z8n)|F6&+!}lOwmhUg|vVGseOW64AHH^Rp0bHO3FFSB0 zUc&!tjK5`m-oI9F(gA2T?y4yx{ zj`HHb_fY;Fl&=g7g8oA&HwTWP+<@}RKqblxP+k>y4fG39UQMFoEC* zqWGV%MNhY?H-@MR1`%uzW5}Z5jWBT?n1=USHnJH}WCpG?hN!YL+e4xb1_T2qJ_fx2 z!-;#;W-umPGSRs#ndt0l+D6M#{r#C`JEEz+Xp+|7(%!IkTf_3EM*7#Twus;~~jA*J_JSbvKkfg0a+5D>yR-u19$BUKVb zY=#EXnG}hTltp%e#B4YRWcd={nFDa&!Vt~u? z&js1_THkIGYn41ZO=6ua4^Ysmu-XiwS=C$7$ofBh#Io_tA&Lh}4Xj67XrL=jVm(I8 z80wbt*L&n|DCv6zL~Vu%{`C<(Hb{~&Hk+k>JT|JVY`a;@N=Ha+0lhJlvD2L;U_jb- ztF&#BDy(Xgs1l||#N7$CyBW6>XC z<(4tz8)|Opq~&JV;-bV5%lZtQe<$o&j;MckQ6uV8FiQyG1p4!OQA83^(M2M}Ee~a= z@~fcY1?zCmvhm3$iXTQUkS0;LgU6ey5+vq85IBMlfuo^npJgMMi((MpTVl}_rHWY) zeup5c#y=lScEBJCJr47A+>AOC=a-?cc`E!k)I7sc{1L=BIRdY$5zuMj-~X?UfN_yW z;AI$Q77VBL7sZOd;!0)Nio+!mW5}u`s$?I;ajmkzkCX*;;=2%YOYLS}ps*Y%6(O}scCzLgI!U{iw@F2eOeP-}E%T{?bf8Sd4 ze3@%fap{kMKLEGigySQCpc>!uq6of4Ea>1J{z_3P0GauzB%W+&;g zEoG{OXn>3>AZ!VQeQ3W9!5aX+yx+31*CH2IHW$|;;R@7%%mLZ!`*o6!2*_ky zuk>=1UKF?-EE~b{i~W|3T^LcsJZBcJS1cPnT~TG50*k@E1?)8kbVgKRDt4|{>{~qS zs?3&9DbIK*y;*u(+L#x{^B za_6{CiQMiHsmd%;m06@J^Ejz;9Z?O(z)ikV4E&TSb6owAKF|99DF(K~TAbEv{bhzL zSAuH267(<`QeS*4S{7CUUkIkKu%6N~&iqHpR>7tWGJm}_(R&fCVyxJUu=+Kei1>Cu zGxGl~qUH*yYguB}L14bj_+K+V@Q--aAl5@8Z0^ad+~yCr8YJk(5ZRp9*W4=mS@8lh zZDeRu#Y9PjF%+!Gd!TS-GTKLCuFOL2srngk^%A

N!A{Nhn$M13>d66t7H>SR~8c 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 diff --git a/boot/multiboot.S b/boot/multiboot.S index 7b8feb3..ab7e631 100644 --- a/boot/multiboot.S +++ b/boot/multiboot.S @@ -18,6 +18,7 @@ #include "system.h" #include "task.h" .global kernel_entry +.global main .extern check_kernel .extern setup_kernel .extern init_pgd @@ -42,6 +43,7 @@ .code32 .align 32 kernel_entry: +main: # Reset EFLAGS pushl $0 popf diff --git a/drivers/ide.c b/drivers/ide.c index 3d2f6cc..2dee625 100644 --- a/drivers/ide.c +++ b/drivers/ide.c @@ -202,15 +202,17 @@ void ide_status() void ide_debug() { - u32 device; - u32 nsect = 1; - u32 retires = 100; - u64 sect_nr = 0; - int count=SECT_SIZE; + unsigned int nsect = 1; + char *buf = kmalloc(1*SECT_SIZE, 0); + if(buf == 0) + panic("out of memory"); + + ide_do_read(0, nsect, buf); - nsect = (count + SECT_SIZE -1)/SECT_SIZE; + u16_t sig = *((u16_t *) (buf+510)); + printk("%s SIG: %04x\n", __func__, sig); - ide_cmd_out(0, nsect, sect_nr, HD_CMD_READ_EXT); + kfree(buf); } diff --git a/kernel/setup.c b/kernel/setup.c index afeef42..90d81db 100644 --- a/kernel/setup.c +++ b/kernel/setup.c @@ -54,8 +54,6 @@ const char *version = " by " BUIDER; -int main() { } // for libc - void setup_kernel() { extern char kernel_begin, kernel_end; diff --git a/lib/libc.S b/lib/libc.S index 0d3c9af..2bd52c1 100644 --- a/lib/libc.S +++ b/lib/libc.S @@ -9,8 +9,15 @@ _start: nop nop + pushl $0 # env + pushl $0 # argv + pushl $1 # argc + call main + + add $12, %esp + nop nop nop -- 2.55.0