From acb98efbbff1c51cd9a594af7daa4fe8b4560916 Mon Sep 17 00:00:00 2001 From: aurel32 Date: Tue, 22 Apr 2008 20:37:21 +0000 Subject: [PATCH] bios: add support to memory above the pci hole (Izik Eidus) git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4237 c046a42c-6fe2-441c-8c8c-71466251a162 --- pc-bios/bios.bin | Bin 131072 -> 131072 bytes pc-bios/bios.diff | 130 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 127 insertions(+), 3 deletions(-) diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin index d437728ee8c306a908adca7ac9323c7c17a3e1de..6ba7ade3a1a0605c92050c30c7e428fe1527f159 100644 GIT binary patch delta 13231 zcmaKS30PD|*7iM@MMMNdqJW5~s30zlqQ(d=NqggDT&`kV0hbuujS^@uE{!%|FJeR! z%iXxIQA{-637ObxXU0r4YUE3tsL?263Y)~;IM8n4TWhvt~XO23o`BG zts%09%drTrXBUQs8HBldCl>RhJ zP1F3t3}u2s1)2Um+{@2wHjT&OL^A?9g)ZYFhMf#2?~Z^`nnU4QZH-Z+XG4{Tf=na4 zt-CVKzqqX)Wzh6+^4kbVY5QKNQTkJ<5oG#BSi^8(B_9jS#2!Za%Fre8?_R?E(Jb-< z-q0YHD-uS^WauI83L~dvXqCPqOsh53W}TrsnyRyd{7~hNAk$l+Y%qI>@|z&jD&FHu z8qEf75=Np&LYf#FM#heWGI3`Jxib>1+XL7R4zW_WMQn<6o0KvL550J9Wd6Ca?+gDQt* zWXKjN%90&Zw)7AB$Rs&T z*-nGaUl}O)%0471qahM9i8LDG2K+(CH|VBVD+TcO)A9vb*-{5>awu%MK~PcznJN|J zY6i58)(A2!uXs5OAlFAjwEhqJ&x4+LQmmEXg7+9D4KgKDkZCW~5l@~)dS=P4Gu|-X zHrg~+jwurbnTC3ehblPjr3c*^Z)#NYh6aDY9m( zsDL1+Sn)qaa8x!HGGtua3}m58mp~Ug47Lab1oB`EBq!I*5f#y`pJJ^H7BW0$szFC) zAi51&_!?kx6rrdxRPc;&u^vb8;|Bd|tk4iqinS8FvPtQ0`wcdKjF34}N1VkR_;UxZ z)l2}z&mE#m=XB{DFSx0ui?|!rK7iQ=aQnAvo(SGk#8jkMD;+LRyhrN{wg|KI2w6!7 z?9Xq)7m=p!&ugj#3V2;anzCEigUP)y(6tlJhG`F!vFXy)xpdEbQrs6EqH>CUgJADq zZ{JlA7C%T26bf2ix@kJo&9%2|+_kq;#;h1~eastU_l=DmXTNL@FxUk9Z2NSJl$hW& zNr?)w^!r1&u(6E2r&+tTMT$)q(sY4}kY9{OWRs;xEY5P+_nIS){}eFiD9OrADc(J=`AJr8KN~VqKT1Va1#3 z?B{V)eB1ONgYBu(QjnE_f=ss@GT8i$(sPBVz{*1;VjOfy{`#Q7=5G&G+6uB#B*^qI z_LXUZOjjM$Y7?N?ns-~7EXY)UkjxwhUHVUd!C*2_c2-PR48gcDV+#o#d(Lwjfv1AaadNL39BaDozO0;T~_0X__tlw zYZKp8Ti9!oIXZJkCTX1s3Ho{a3^sq0@YB5vd2E)RXsTtGF3_cWN*nDn*aE}M>|DSu zvZwUPUUDH5x`;RSlINK)P``hVR+}IeTk|3+2VKsnoSB`WG!kU`=K+H)P>C00miUc( zkR$?Y7oq{ALH+|qiQ1xdG)gX}Ft)*CZ!eF#(W6;%B|JAuF0dVoMS47LO?;Fmz1{YCY;q2LunX6JW_ZRNR-#xRw*wuifWvdC+}lNt zOoBwceHUA9N60`UPJnF#Zlen*tJx7?mK+HuUlvy|u_3@LJr5C$(sQ%)9Mk9C%F3B| z8j6uiFN$-SxYb~04lm0yc98{>p|zO0i>#gu9mSAcM41fj#ou<4>ysf?{B|d)M|}HE z(tZlG7Z>j&L#9A%+w7efbc#Pl74)*(0Xskdk2c|%*=-5HdPJ!0q^&R9l#FZT+ zWGcjp8+VY-Q=wyA?hclp=c(~8`x>)@%$o`w)4QQg4fvTQM@aa~c?xs82!GkdqwVC< zRA?<$Z727qLZaAn_lcNypqVJf?<8H{h4sUpZ#CEgJH0RbzEpr3UWWOum^8iDLFA z@0+jK2dmk=&W^s|hwF@8OtlHYnhr8|Ut zHwWU9_pM=}pQGEb!4LHOmSZg*=~^f*SISkqLm0V+M9zgl{U#8mche$;@O!jC`X+}S zBE)Xw0%j+x4fXi`u0VBP}6KAt>?j*;J3fxd9)`Jc^*WkXz&=yC~)JX zZ-!mCGA8M!ONVnAI1sBiePtc_=R9aDzO#Ycod>UrhL1_N_n>E+;avF-=Id`U!k;y! zGt175f(%@%l#e+bB0nZukQVQMh%raE9>T@{_YoWD8lFEaQV1KT_9JrtJ!qwGvRX~Q zh>Z+caSib0$(tXR_yG zS~7nD#E21V$;t)LN_?`0?8o0LYsfzqz|t1$*07oWfRt1^@{3{l8ZsdlTIq+OO!-cb zl_V}mL%=Lu#WL5KLrF{r1X)SuKokPF>vZA$Aa}nj?>{SNbGxW?<9)#`*YN&*lv|`* z>8~dUxy_Ykf~@r5l9MR0H&enJphM*(>V1e6XOxrP??b9MuAIzyACmO}v^X6ah7 zHGib?7w#c}%hoWj864}tv845) zS8tE3Xav$|FOSLGHgGlhIuD|f{k=pzxah%$Y^H8Tr*c$lCXf#?{r7SyOIKem`p64< zjYAuJeWY=;)`hF4qqu)Hg7xomo-0U z{`Pqv%+H$7RWl2kGn1MrE`u%9EJbOmn+jl(qSQ^6e5r$A(OE|Rp@ROqj{$|_Xzs!^wv_x>2%RDuHC95{bCIyUX?jo5gesy7%n zASWGRCL=z8E-;-e{s7{|j%Kp;1JFPuxq#ivCi36|$cVKD)|3VQPy7BRGISS#U za=9v9E?((W7QA90n#Ir}=J|4iEy!E0QsO_$$>hb*LVx~6xmxs&Bks~&K|ZKOuP+XT zk;VyO%j-djV{xz&8HXa5&WYM;9c;n^^R0t_u3*=}b4~RnYLsr6r5ohQVrcf-{uO+u zXJ-$ey6B{3T=t`nERioz_6jm^3A7Ritsq%TpsjyciN8RKmOyli0XULH`mv!}I%)C> za%2g#(myTrsg_Rq9|TwhQmdtt{=jrR)zV2%A>gT&PI}bcXVub4w`1R>tK!wtN%y0L^3(@hm)OUa(4kgWf}QbzGgrdGv&A!e3-DYoYKcjOUW8Hl|ICW?M5$dF~wZn|xGU17_GWy}54|I3z_Ew3x&e_#Ba zv5+G#Rm{eQ#S1qt^jo-j;j%^B7H?h{v}6Qxgl^tpf61j~&`vzRoL9y@%UNX<^Olo- z%OO_(5Yvx$l;1$jX;7NuB^``UhUkdpxCs3?8)KKVdtDUbU4%bPVbU}%buMd=a&ZI` zr*rX*262EN=ER>qT!zjEih8!I4`0l7b=<##`TpfkM=i#Et3UT}6g@Dh`ugiTX0PSa zwH|3O_x>r9N?e-nk+Pl7pMJ=sLzq-g$9lx-yRrpLJd_)EL@9fL7wmp>)|bhLb9tbb zycr)nn#ted@;gNh_Ue1K{}wUQwkWpdho^*CW#u)ldaH=sG(anHcrkfy07+a@M7Elt zgE*#$%qfP}?9<#2FcM27Y zt$ESzRjkmH+G6M^_A!vi66h-q(~}V;kR%S#lMhOueUET7FiFqcxe<8(se7*Xmoj;s zGLTOwb0N7<0%u!4D`Yo-R{AY(*ytVJI7?3yl4GUNLF~7XTrGvzmbryq&k@dAvj2ro z92OOl&=t@^f4|UR3o=Q+n6htr&LihCsIo++(+do?po&DJbj~9EV#&T)w)7TF{a?NS zeQ2zBXfaBc8{;<>{wZLi1m8-w!&lA?^$#EleZ~yHg-*x>P_J^1n z7Ixnv(#Qmh#HdB2*aW#^#!~Xk1aZ^nTlA%yOMfplvj5X9>6TQpp8e`eU;It7a0EB7 zb>2t*;}$gh|NSFN%+N+m_<&sw!=5i>g*_JEjm0)R@_Xnf)4+x75jVaPsK*;$#DW&` z$L=BQ*)$?gk$lQyKbihmNWv}9HhCuM@OKCadj5;%{nbZk^KnFGYAz(17U&%}gSqIy zqa%G*!Rv{G(OrsFcB$@rVc+L@Et_mU*}e*jMKPar z`VdM*dmcIRAuJbL6q25+VQzR7m)Zh@QVHnS72`55*k|ssSK^V1lC!8v7{Z;;Lm2acI#Za1OC2`@d-b@$Y>}H)W8Ww}FiQ`Lt@&MP z2>E6Wq>9@Xkoq+cC+ZiF?wg>szH|Yu7Bc&j`FMGueu6d4nipF6{5-#Vtj)v7aKt4{ zrG~W^u=ZWnewVfFtUaE!Ygv03YyZyLgIN0y*6zjH_smj_9+UsN8gu=8#?`xsy`f^i zamdxJtQN7sDt3}%zau88*g=l{f!LcWMmTm4u_1!oh$YJ~pQL{TwfYP5yy$is zJ8rri$Bqx(c6#fsQgLo~dwxon~!LurFAf6YKzMbAoMU zZBDQ?tj!5l%GxgxY$(QJ_9fV>9P=Sq0>^v^7S1srf;r|ee?A1G9P=eu)f_T%GjtAC z)EOtuC-Ljy_h$DW`s{ks9+9J~p#@3Z0Gsqlv%JU{iyb!^!?5E+#^*D=bnj!wrIPVB zb}ZgxyoAV$Wc&(2FESpQ=|je?T+GO*+}CQAVJaC*W->C4pN9$_a!uyyPQ1u)S!L|I zS@i}}eX2U>g}nw={R6umQnjalklP!fvuK$~!ZtyiIC~~1RqjkTsaDQ-fmG|&6knO+ z-nC{j6;7%w*5;%d$=aM$gISxCsxNDEQgvl*PO7%7{Sv8uoAENKE_2L>R3|y+L#l%u z^C1=Cm=CE89P=gBdoz$!Jw)4VQnDEe#N_EGoSUIHbZL(Kuy^Vr$h$Aw#nOaw~@(P;SI6)U98IO$UnEjSy7om%C|x9$oAWZt^RX$ z-*Wu-!-gxLT=^tyE4jK2G~(yeNYhWCWlZ}S_*p=prdnoiaRWY5H`(RWNdHeDMxQZ_ z-_w|-=4pOmhCr}Lq3M1?n86`fBxi{=toV^&kwOCsRl9K1*HrUQ>KtaNd9gJ=hkyTw z&+A6M!?^4mI8dhD-@$dSH%s*)z;57F)L`>pZIrMFa&||#Cbm<<`Chu#t{5!c@bVDvl-wDy;*ePV(PUtEAIFXd?gx+H5H1f?($k%t7 zTw={@VwPg?dyANwL4GM#nf^QpQyzw!2>qV5!`Zp+G;23wN3<^{VSGj@6wk=b%~CU? z6k(QP5}fF!PNbJ7m00uq=%z_#DNIw151nb=B(}5RXS&Swv`L27aI0&E0G=dAqXP3j z9=%Tv5oNO!ngGF)0|UbQ4OGPwV$vkCbq}=E7Kv}X^aO&HTWPwrcbi@ zr0_*{4Qq!gJp`Fv&nClnL(9g19zyB2*<{{sXfa}4HVYPGXXd56ABuf+q2qlPJG#li zJ_~JjwpQzXcZ1;$AzSu9lztnqULQ8R3%`_zzDnxXQ-|m6f*lAPn5}0U~LedQR&0V_C${8xT-TFLa1&KgD1Rw#Tr~*h2Y7 z*_DE-(`X9O?uBj<=k~p|d*1Hy-FJ6S+w;|)!F#XnCB=IoKC~p0MZoSc7G{#q_CkvO zL?*kE!ivub2HP`bv${cbAIqL(nWQ>XwnMq(hp#&7=#;U#Sq7U!S+8o9p|MGNtZY<) z#T_0xd)&>3?N4jz?F!z?e0~?+?ij!Agy~|qb~)2<>HA=2jLMUlpUsJE|=@E{rRYz zF9lPMvhFZl>~gs#*hi|s*2CnpPvL0W+#_@&>gA03QZOltj?k5^oC)@!ylXf@mypdz zpd&eO7;;6+5fXO|G8 zQhx-xiK~yENUngBfQ{Ot5DudC7;%0E_d?Gd4~w^kKv+9#&fO8mN&V;Wy14c@8E_0@ z#7~ctiN~P5_``8hbPUdjQ@$XBkAq&MktZ%4hr5wqoP*S+{;AzlG$&sDH;is14meL% z-GtFGR}So)EGWYLol^zn;hmk+SUX2h!VeP1P3R`BJV(0x3Z+5AtG+B0>5wY&<*(2! zvQO2Q&qSJ1^(FPA$yHxck#?vej$ff?z{&5F@B<|E77R_geVN|uPS^iHOV85aZ|T`y z^l4wZXFN^N{7pEk2si2J%k)r6{rTv%m*QhW=r9Z~5Fl^h+Dq~2C;I*djX@L_5G{q2zzg%IY-xiQAwX8tfD~G-o6@F^HnLS5 zzB6qc3YLm~H3Pr?{8D_qNXFg+jhOK@G2H`MJbjd0y$AFB|K9oDg|(OBqfWegA0mT7 zzdl-X`4~(0fVqJBG9^Nyh x&4sue-udeRvc(D7!2cd@lQRyTMz3?hIREv@Y=n=jX z7H$^3n1zpfrFK@SCayLukb1TtH%CKh*g=0q6=eE2ps}8RPOgxb_&9-fZ9xu-~d&qnot;%rekrSrbz!)AQVbX=?q+*JGhyRJ7hK z{ce?-$9ejj@&ttnGM(q{XCdpx9)A+^cj&6`?($HRKo|IvxBd>}VR>41Khrp`r(33$j^oW}0rc9f_ zJWOzhhOx04rYCta^byDE$psnO#mDLm2Fv{!7wKp}t#^>7SMCZj-Q1i-SM8_V6J(ms zB|fFWtl`tmN$@y`6P4y<@;Jy7$Gk%BjsyG1Si5YKbY7ly~(HniH3Bey;z`gYJZ+$u#>E%UTVp%$suCIwlf=XI7l18lE}$rmaD2H3nwSpr0N z8{}z~!mA#8DDtrKF$oE>O$xFlhUBH!Q0LLS{L8b>!kS``cL~uVrrdcNp zhM3CO@6o#6mgq$5M_ zh{7fXR)MI1AS*(Bc{3qFjLPCSBW>r;h za_ALNAdeA$TXyN>~4#V-{HNC3SFq#vSp|w{YD#(M$(332i0-mFY zP~E9IqNgCNe-!T}tZIF&!g8^fdSKAx&J$B7Iwl5AN}Y6lQuR00UM7c7y|8+oO^S+i zTBIl?Mv!UbF?=vW*@OfgBNwJXkltB}SP|vdjx%{szrKM-8|OLBO1g& zj41dB`FJ`6cU#N?dVbhoh^tLYdfEON&KR@*_hGb;7LObzRnuXZ_~kLu<4wpA3lEdh zHzA~T7FtHG#9`T~4a<_lE*lPro%~;MDC?FHgTb z{UrN)d3xp4M_LKd)6<;OMo%XzXFz0zA8QlNuZ8H7U`L4tY!0-h_$R)s~HK3w;cF9?hJLZ*Y#(mT!sWzO^ALT31YtCqejtD0~<&G^MRZ#d#PmJ{(vR*NjOVsBd^${#HV~ zWS+WX){oBwjBfduBtZc&dn;pAGHB9Yy4O z#FrKAoCBfa_#zTE2il8$i%9$&=oGFmaygHD@n`1`_mj*y&?W5BenyEG{ld-C3#;@3 zC(ShwNB0xQ9Oxou?w=C0jqAeGy=4A87!q}9FN+gNWs{z1OTbA4 zRpax9Rpi`Wa%CO_wN2a08!|a+W9=4+FN-5aIVK3}+Is zaQt?YaSLH^{}Ve+4$r)F2i?dEm*`$zxJ;K}AwgC^;M=9kw!|xW>6fT+C%Lc?;zi?y zor|D*OW~g;N1$2yQRyej*wOI!Nc}t-5GEcdASp{=SVq}9%yorL^5eT|9WCV0V}#h&TSu)NdWaC)JL~9^ZI&CXD(*%3 zhR?NGy-dRj@{+$w4b^5%E)TrMbIyretxe1nEF{Q^`f5`O6>iN-{>m7|UVL2LdAI}9 zkNPS$!KWx#NB_1Jm%nbf#cu5Qzjlxd%b|5}@K%$bib_~x=c7=i8f(!ylv}rE z(MO6b`VhptbrcXJS5u*Fvq(OaC%2QsDfoirt*ZxjS74;qqxm{)S0F4 zn@)|ym7}&3bp^B&du=D7Dz9yg+EE(7Lc-)&@N*?>Xa`8S&8O~Z3tMU z?=d}e<4^{(!PlJb99V(?E^j@!oamB!a(OJus_`qO7ndiw^f6qPP{v^!9x1G7rL+)a zr4QG%Moo1KC7=-!3&@gG2o*oxMmDEHKk?W$@@Xn`7pHF{4^kmy?)YtNn7&npHxB-S zZP=?HK4v2w#z%i5!y=iHS2)L_5#tQ=ir`QiH>e|r+HE6?(;zs5zKvcJxQEVM_cgo=yfR^xC-BNF<>;u%-62alI=YlOjKf0#Kd~eTThzpG%`|4sjr(xuwYSMIBLq&{WivT^ss+ZHNMIS(&ubvJd4Z3SR&5Z6 zesP2T%Ap4w;*YAIR~$!&+sJVvv=`TJC0C5_7jeN>;=Kx96Au*-c@=Jl3dqt`&~b6R zQJOz({t@=+zffn?8Rdod((wCU8vpLK$R)2`gt*SwbC|GVTfD!pDq4F(*=X#(coh41 zFAZ2aYH{RJ@1@*SXZ(mctD2?a%W7{Ego+dL$ruxK9@sOVaV`vBLc<#Ox~{xkw}r9D zX>!~~V!QI{?_0>4)esdvX`7a}vwV5p4rh5g6!W%|TDFi2t06MJrOPVb*Oj+FY-V!! zRZa7)>gsEif?_J03mz6J2(d`ts#d-Y4MlAs9oIl~Os6euTI;jzsXl1+s9CiRztv_{ zpElDxh?<8_npGVmnM)vKv|rU1&8oIEYh34j(+);O>hz%h(#|WZmBDO=8wVYq8iyiq}C8-CN#P zsctCgwjSDv>uscF9mGIO(s@0Ei_tdn+ImRv`dC+G)3I6|wp-aUU1yc*vhArYv=&cj zEzTu3)(o02^YII^lTGE?^P?Mymqhl;&a5_YYs+lCFLx_0COxC7DNQYBqHe5fj zDQ?(}vaIH$#7s`6LqtZJXBkwBG4`0sSER2k($}i-TXc^cAZ8ZXzZ(;slbR4?4kN)& zA5(e4^G1cNMDYq^QQ4UNoHU+W|Im>AoU|LWX~=#PoirGchV(Rr>B`(7Ez_Om&`X)lCzDiXL3?p{4)NUxe-V4?za-iO9mUSsEVsStH2u%qcG<*pn@wuN-X%W<)!3#y>?(gXc_Wvc zFhNkp0d%4a<_|_HR$==CUwo19q!y-)UggHOQYJ0ojZHdH<*4X*OzQy zOEs=XzOFlt!xE8%R=e!Dw-Gxw zl53AQXtj%v&zN?!IE}3!>8R%YcHM)#%?!r!>WOap7QFH0O#cSg4{_6Lw&FSki>7YNMR0i9(gQ_&1fj@Rzm;0TUnpQXVm1l z;u`cx2*p%htH1*fZ5W4V5#LP^5~#PJQNQvc{e(qq&1ATz=;2^GGh&x~BKkTGBNaF144}vNt?Cjo<|b z9l{HjsQ+5xXNJz<1qfKA+m^&ioAgVh2OhrMv`N45eZc2y$T%~!di};4whvG|wL^wW zw#3izIAY{llf%a%{b)(7XxN5aPM`r9GW}$=$>CELWtJ}6q#tdG6?y5m>1OUOWGcFg zvE!p)mTolaXL5aD57e8buWiy@TO!4pA!`U&pw+Y&=(S;AbEVPX{%Upuqq3VBS9n*M zHEwvWHd=nV8gGD9zN)w^i&v8+76@uvfJ)p2;iKVF8dsA-3q*BZi|$Zy^Q<8LUM1&Y zUq9R6z9;(iF!{v-5#n!|q`4J(cZ%51bmm&1JkruQb;1TR(+cavW$VdJE36QYWDwZ~ zVJSh@t~rLB9XT=V|Ie16EjP_w*>~5Rm%p!BID)I#PWOHK3@cXrU!SVCRFaVcq2l^= zjP~Nhb)@}f2=0@(mK_k|!F3&`;>R8`O+v2Vkv2PSMr14^N{xq1d#xq&H$#MYVJ)$3 zhW37!)*|82=JpzLYBLN7v#&wh&iuHH9Z{w-8?3!$4e`l?4q~UZBsveehJ>T0;ZU<) z8KNDs-Cjdd@?fO+&Khzm5Bjto4+cYyJxv$O4!rT5l~$}Kb$RgDc6Pxk)y0WvtzztE zskW@MS^7f(!6G@UN{GA#g8OY|2A*jxxk1|ogX)!7(<`lI*=4NxpGL(rvUdxlPnfux zW$8cIRY*PS%5a2i4fhNtM?J2J{azRhc;TTu^^ob*RVIh0YV>5nXcX!i`t`#qvOFKc z#E({yxAS3m)ZSG*KdPGhe3UW#hHDJ$>TM&b%ZF_7O(V(L3Y)~g8A-FZVWYTg4as{O z76;6%W1};OpYPKf#CIE<&$zqNYR_O`KS%OR#tn8005CvKB6=XUc)eX`Z zZj6^V)c+5I0dMfxX!To3uD%DYhqmVi?BE=Sv^kd-Yy+MP|AbsqZ6$ z9@RF?=65TIWjD0D(R`gp!`#t?VP1Zt2VE4eFLi! zx!l02v0QFo)ew{$SQWFBvnm)-7pwf3iHlXvB~4hBk4hJL(t6UFI7Jt$U$O;MhGG zg>M%Y7oIKrvhY@6O`&d2&>nJbFN_d>OvXIhkwol+OJd6uQoRob1b(*n$(F+WpV(*h zJL!AV_nzKO`o9k`?V2ZR>DnrJ#(}YUxlSA84GT!-`_Lxi=38ihze_MVYU^y0{#pgT zZLu&*-{S8VR;g8-hrh`OY?40SL-02_1)Jo|vHNE~6>O5;Yqe&dg7z_$W=D*j-RQT< zw)^KK3s$Km+od?^p}CCy&Y?qPnmZS#e=r`3`SCMo4K_JEw_2sTNaUc6gDViM_O?m& zBP~)rf-)UBmyG=Y+7FCoe$WluBx*IHU2fPuQ3C^A&CB%39J2od7#hA7AqyV(Rx0s= zOz+OYAB0(?dS##>({JYxkNq$}jGRjb?}v!M9&?ersw%S|x;)$~(~!Aj*?wp}D0Lp| z8H+D3@pgi0tf!wYXRlaktyN=v`8SvOE8eJi+O86<=+7(3$NOQ%;037|#{C%=@j3*A zG=J9o!P)$mNogGwC&;StISrX(a(Kp1Je(R3YnN5yZ5oqGCKW-%pby`*;4fop@QqG2 z*3dbr1_Pc}q0J-QL2&0axK%Psb*{JM5m-HBY+pqSGdfA$A&&enFW7wroj-I!GCXq*0=-RHGnS69`qUb2@kqwWBAk)EaE#TI+J8R*6L8jG-1_OIKnDiu(FYu8W ze&Me6RE}xgZ3ZleKN4}g@NLR3ab+B=aDIh%;xC-3Osp%hUsp_qQn;RJ5(guXt|puf?Vka`PaB>wlQRoU{G>wHd_s z5X5HqV-(qT|Llu`$?;s-t*sKdQ?#4&T1#TRa?JzZ@@whYDaI6&qh5JOv-)`kdoXL1 zT^jH;2OeWG+NWVRX0QcUjr@zNKkd*;H9l62HGwoA1;0$T_#i@yW{@j~Ab6lW#ll)= zw)OavGgojAC$k$KA9~pXpP0I&uoS`dq31}4!!V@t`a@L_-^mH%#?wg!aYAZ$YAl#G ze&APW{?n#TpOT~tYtv!=`a@*nVdxRQ{!rD%pEGMKR`@4hs18V=+rONieBn+&b@Sv4 zG(e_Z$d$uTEBcp`&yTPFP@A#lB|aXr zR8_61elb4zoM1^-hLqCvs;W+_9;X3PDe*lHCpv^2qr1>9dHgxSqI5b&H>=6hsz-CN z`!Vw0J_ttJ82%Y;l_G_y=T& z1KXU5I0HWgo~#I;4*$3e{hE9B?cJx(nStNI1aI-)7i3EXObE$5v_DBugopcQ3(DiW z`{%N9vY;r3NPPwL68n8Ydfb9dKF;gsR*Urcb#m?&^a{Lp{oHer-nxE{deHB$pQ9rE z<~pgr1%18deXb}6Nx$1LI=bLGt>{fhUZcJKML+x(z0{vR8$?T{(#V*z!X-thpewG^ zqp@{g1{Yil5AmaS`dz*Ike>SNOY!Q-YvH}YqpHSn1}fpP*zCZkK0>_!sY45{g~y*6 zbPt+=cyuW-P>9v7Svsq*1J>{Zl3N9meoNY{4z=|7r)9_P&YgmabkU=VoJ{Dpq|EuB<6tHaf>WG*~8ND7@`(7j*UA$bZq d4c@836wi$AtcC65p$a-*oQB>p1BLqc{trnf0`UL< diff --git a/pc-bios/bios.diff b/pc-bios/bios.diff index 16b9887710..ce5f7032ba 100644 --- a/pc-bios/bios.diff +++ b/pc-bios/bios.diff @@ -1,10 +1,134 @@ +Index: rombios.c +=================================================================== +RCS file: /cvsroot/bochs/bochs/bios/rombios.c,v +retrieving revision 1.205 +diff -u -d -p -r1.205 rombios.c +--- rombios.c 21 Mar 2008 19:06:31 -0000 1.205 ++++ rombios.c 10 Apr 2008 09:47:48 -0000 +@@ -4395,22 +4395,25 @@ BX_DEBUG_INT15("case default:\n"); + #endif // BX_USE_PS2_MOUSE + + +-void set_e820_range(ES, DI, start, end, type) ++void set_e820_range(ES, DI, start, end, extra_start, extra_end, type) + Bit16u ES; + Bit16u DI; + Bit32u start; + Bit32u end; ++ Bit8u extra_start; ++ Bit8u extra_end; + Bit16u type; + { + write_word(ES, DI, start); + write_word(ES, DI+2, start >> 16); +- write_word(ES, DI+4, 0x00); ++ write_word(ES, DI+4, extra_start); + write_word(ES, DI+6, 0x00); + + end -= start; ++ extra_end -= extra_start; + write_word(ES, DI+8, end); + write_word(ES, DI+10, end >> 16); +- write_word(ES, DI+12, 0x0000); ++ write_word(ES, DI+12, extra_end); + write_word(ES, DI+14, 0x0000); + + write_word(ES, DI+16, type); +@@ -4423,7 +4426,9 @@ int15_function32(regs, ES, DS, FLAGS) + Bit16u ES, DS, FLAGS; + { + Bit32u extended_memory_size=0; // 64bits long ++ Bit32u extra_lowbits_memory_size=0; + Bit16u CX,DX; ++ Bit8u extra_highbits_memory_size=0; + + BX_DEBUG_INT15("int15 AX=%04x\n",regs.u.r16.ax); + +@@ -4497,11 +4502,18 @@ ASM_END + extended_memory_size += (1L * 1024 * 1024); + } + ++ extra_lowbits_memory_size = inb_cmos(0x5c); ++ extra_lowbits_memory_size <<= 8; ++ extra_lowbits_memory_size |= inb_cmos(0x5b); ++ extra_lowbits_memory_size *= 64; ++ extra_lowbits_memory_size *= 1024; ++ extra_highbits_memory_size = inb_cmos(0x5d); ++ + switch(regs.u.r16.bx) + { + case 0: + set_e820_range(ES, regs.u.r16.di, +- 0x0000000L, 0x0009fc00L, 1); ++ 0x0000000L, 0x0009fc00L, 0, 0, 1); + regs.u.r32.ebx = 1; + regs.u.r32.eax = 0x534D4150; + regs.u.r32.ecx = 0x14; +@@ -4510,7 +4522,7 @@ ASM_END + break; + case 1: + set_e820_range(ES, regs.u.r16.di, +- 0x0009fc00L, 0x000a0000L, 2); ++ 0x0009fc00L, 0x000a0000L, 0, 0, 2); + regs.u.r32.ebx = 2; + regs.u.r32.eax = 0x534D4150; + regs.u.r32.ecx = 0x14; +@@ -4519,7 +4531,7 @@ ASM_END + break; + case 2: + set_e820_range(ES, regs.u.r16.di, +- 0x000e8000L, 0x00100000L, 2); ++ 0x000e8000L, 0x00100000L, 0, 0, 2); + regs.u.r32.ebx = 3; + regs.u.r32.eax = 0x534D4150; + regs.u.r32.ecx = 0x14; +@@ -4529,7 +4541,7 @@ ASM_END + case 3: + set_e820_range(ES, regs.u.r16.di, + 0x00100000L, +- extended_memory_size - ACPI_DATA_SIZE, 1); ++ extended_memory_size - ACPI_DATA_SIZE ,0, 0, 1); + regs.u.r32.ebx = 4; + regs.u.r32.eax = 0x534D4150; + regs.u.r32.ecx = 0x14; +@@ -4539,7 +4551,7 @@ ASM_END + case 4: + set_e820_range(ES, regs.u.r16.di, + extended_memory_size - ACPI_DATA_SIZE, +- extended_memory_size, 3); // ACPI RAM ++ extended_memory_size ,0, 0, 3); // ACPI RAM + regs.u.r32.ebx = 5; + regs.u.r32.eax = 0x534D4150; + regs.u.r32.ecx = 0x14; +@@ -4549,7 +4561,20 @@ ASM_END + case 5: + /* 256KB BIOS area at the end of 4 GB */ + set_e820_range(ES, regs.u.r16.di, +- 0xfffc0000L, 0x00000000L, 2); ++ 0xfffc0000L, 0x00000000L ,0, 0, 2); ++ if (extra_highbits_memory_size || extra_lowbits_memory_size) ++ regs.u.r32.ebx = 6; ++ else ++ regs.u.r32.ebx = 0; ++ regs.u.r32.eax = 0x534D4150; ++ regs.u.r32.ecx = 0x14; ++ CLEAR_CF(); ++ return; ++ case 6: ++ /* Maping of memory above 4 GB */ ++ set_e820_range(ES, regs.u.r16.di, 0x00000000L, ++ extra_lowbits_memory_size, 1, extra_highbits_memory_size ++ + 1, 1); + regs.u.r32.ebx = 0; + regs.u.r32.eax = 0x534D4150; + regs.u.r32.ecx = 0x14; Index: rombios.h =================================================================== RCS file: /cvsroot/bochs/bochs/bios/rombios.h,v retrieving revision 1.6 diff -u -d -p -r1.6 rombios.h --- rombios.h 26 Jan 2008 09:15:27 -0000 1.6 -+++ rombios.h 28 Mar 2008 10:22:04 -0000 ++++ rombios.h 10 Apr 2008 09:47:48 -0000 @@ -19,7 +19,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA @@ -20,7 +144,7 @@ RCS file: /cvsroot/bochs/bochs/bios/rombios32.c,v retrieving revision 1.24 diff -u -d -p -r1.24 rombios32.c --- rombios32.c 6 Mar 2008 20:18:20 -0000 1.24 -+++ rombios32.c 28 Mar 2008 10:22:04 -0000 ++++ rombios32.c 10 Apr 2008 09:47:48 -0000 @@ -477,7 +477,12 @@ void smp_probe(void) sipi_vector = AP_BOOT_ADDR >> 12; writel(APIC_BASE + APIC_ICR_LOW, 0x000C4600 | sipi_vector); @@ -40,7 +164,7 @@ RCS file: /cvsroot/bochs/bochs/bios/rombios32start.S,v retrieving revision 1.4 diff -u -d -p -r1.4 rombios32start.S --- rombios32start.S 26 Jan 2008 09:15:27 -0000 1.4 -+++ rombios32start.S 28 Mar 2008 10:22:04 -0000 ++++ rombios32start.S 10 Apr 2008 09:47:48 -0000 @@ -42,7 +42,7 @@ _start: smp_ap_boot_code_start: xor %ax, %ax -- 2.50.1