From 597a0559fd7fd0f2151276f25d9e97dff468ea23 Mon Sep 17 00:00:00 2001 From: bellard Date: Wed, 1 Nov 2006 19:19:17 +0000 Subject: [PATCH] update from latest Bochs BIOS git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2208 c046a42c-6fe2-441c-8c8c-71466251a162 --- pc-bios/bios.bin | Bin 131072 -> 131072 bytes pc-bios/bios.diff | 56 +++++++++------------------------------------- 2 files changed, 11 insertions(+), 45 deletions(-) diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin index 0161bde0f0c3aa503fe1ab5f7d3b329af7c1021e..14ea6a60662bcf306ebc4b058f80455178b673ec 100644 GIT binary patch delta 3175 zc-nPVdt6jy8a~gNakz-gh=~aXqalhHm_hP_Xr?rlp#tNIf(0ZD-ngU;OEu#1IDr(Uh2H}~egr8v$Ak%lwjM@It+d`lk(vj%R6tN* zkXz@DW58u@%me-trngV4Ucj6-;0mI245oAr(=KkOsbYs_3J-~iB?MVp-Ki zE^ZYr0lnPZ)tCyLAuHG5d%VQWkA{8%Hgg4!VhPyr3mm@==fQek;L2j)2J~^2>#-N; zB5oTIhjV1>MkL}i`Cua+!^!GcB;b9rB^D)kom`8>29$G}IMm5#$o5U}VcEd*T+e1$ zSqS9FR;+xCm$!3Q zb|MC>s+|kojiqk5!6om73iy!A*@q^ehP%fIUtlXYKMxHuHtcim?9=c8u9EI&Xow+B z`79PGaD`iQ03kB)TxK!emCL-MyU2w@bRx9rm6(Z9 z5>ko#kwn&4B9N|aW+nVJBhS$7TB`d=+og{+>qa%b+O9)dYx({gLd$OIF@5Pe8!<7X zX5AE97U9JhM)Fl9X03>q3CTGxSaTjYG4w;ChFlD5s z3hIJwBB8OC=%$!;juM>@EhuPQEU18$SUTeW>fFKd9&~g>wzD{QYR}Df7A;;0GbG!a z52v=uSv1Z5+qiRBI+%v^7RIv7x&l{NAJ$d082pngsc3OdQi2ms>@8w3$v?90PD)I4 zIP1=&>awDvg9=J?4mugpD{{|f{mu;Qz)uu=vWqlVf6|FP()4&Qs(*)UszG>xeGjd;*s3gUWs2H{`B#}( zeiikmXP7RCCr3A8dSZ<4kZHTh_m2ow8F{;k+Q#@Am#Srtq#5LEUBpo*ag%O;zQM)4 zM>&Pq&?R>oIwT%SN8U|G-e7^STO8t5NPSL5DBL66XL7qn%Bznp)s2)sF;>3+rm!Hx zS&%e*%#k|*Y`g%3X3+T*p033M#>mIpclW-%keKV?)L znA%Q?4V)Sgk!X)|5q@`JQ06cs+GCv1Q71f4;u;W4lIyY8->sf!20j{aoL~k{4LEGam?)XipHc?PEb@Il zq67GPA?9wdmU?03Z-RY7HZ z@^$K@yM1ZPHI>2CVbFGQevMd-7**qNt6{Stf%+m0)M@I_cAa7v!2``>UWOkG%l>Qh zC>m#sGFv~hVa*l52bok-^KevemI`9#yBM=k45{uKwfB+#Txeds6r9Q*X~sOIK_1 zXKTXgHzHqc$TnuBsZ(>+JG0W#^VPG{JUPdwST<3v4by13sLSYaCrRDV&a#};3x`5S z_;H7+O)BPGh4n-sbBd9V{rHw}JB&UWk9H$`dSq==3PabX=}Csa+1HdN*#?F$Bct62 zV?9rj1=o-QD=EK**=|p^Hs`a#Hge(`!lpdd+C0n(54Sc8GT}k`%L>cL=ru&hS6KMx z$f9qs*7tOaaO-2?!v%sTFI4ct+o8gfT46hR=^HHart5KPVSC?zP||#sZ9k4_VPI|i zzk2Z_>#^>*J2S>0chwc>iQx*y(7;sELD$1V>>JOY_>`^8}Qa_IxO$6Y?J(YA?uei%a& z=ALfaD?7t7B|RS;3rHzDS8>Iza8=-6O)Cg6H~~jq9mm58V_l$Oix_EowF6t^kAz5J TE6IQZ3QuuW!ZeGSv7ui8M>1Hx delta 3027 zc-nPVeN>cX7Jq;5jC=?(BMK-ej7ol%%wQ=Pnjhn|tERw|3RvP<8<7;r98TpXxS-1n zirX^q;1>>Qr;hEGrl;qP*^M!1-BTnVfnlBs#E%!TnA8#hdG~qW8Lj=JGjrzL`@8r4 z?tSj_JolM`f`Ed8fRn1>Sae!F{HeRq23@Q!*0_HAi*t4Hdj0G;gFa4g&>3dWos~G( zkU-Z1q8|jhGytc7Lv%0@QNzX-e{B~0xn%L@KHJUb>z=b+wVTxXE6J`u5xoXsp>w`A zyB07Pp1IU97uQI#T7%d4`xi)y2Ge=*0vXaE+Sqi#Ech`W&)vfMfSxcZZ^*SlV|EEX z_@WHkO~aF5eWb(`u-k3bx{h7&X8t#`se3|PyGf=N5l_D83n{9k+ zA0m&#>`I^?YLV*?4V^RwpMt;9My`*=&iJcsWjzyk;9s`2=oCnt0mLlSfd!y9CU4vVKh-{x)2j_ZZ>!@E74eb1fy zMegmxT+7;eR4!wi*}muJ`*J%|iA#rZSV-D+NLx6?7k24dVZC2Zn0?Px#VO1O*DLVc zhh%qJ8QBl556K2v$+ii|<$GG`l?h1oM=hN*4b@uY(~F7tOoe1}bRL!>k=&SvNxbwG z)y&5No^Sn%rYyh(;9WX(5nBXG$^6B*iD&5yBh14PN%Q}RIpBY3p~6zMfNyD`dzZr> zI6)oHU>k6h_^(6?93*We(qSiOR$>_nDw44pd1Os8it!TZOvVbNP<;xjRE)CmS%mU@ zS2OKe1vig>kmG4sj2t4S;akil|4By~f2)aRWFQ;-XHDeXT1>`!^vAU*;u+~H>lpVE z^2ItdU<|Fy#H)U~i;dn58+5Wh71oDzw{YD@xe`-&afjR5M!$Rs8KQ>6fn|6!@NW zyv`_GRI>xK{BW2q-i2u@{F!bk!uu)~H?A0?fH_oeL$V4Hbk|;{^FKAvihcM1d~*YN zdOs5IJuTP|9as~p{{{zk)7fw0FMQNm!R>D|{ld<%z;QN{+P*5N#N=1%c5xhOE@Ml% zNQOBu0r$uh2PPqnEOQ_RuaK7Gfaot@ee(=Ucg=488RK!3$>sm$QsxARA_mQ*`1 z8q3H>a#Sk$#(|0R;#A`Exx3xlgY2frU=*7oyT_{x?qo42*Jvy@X_WIPZIxxM(&O8T zJW>c^@^z9}j&Tbw@S<9#P>Bs&?IsOtxlHi(R#u1Iq-Cl?Qts79%DPOnThN`{_TTcVc^1qlL&W|ZyD8sC+Y4XOGWoe2rD%CgN&@QDLu6e}@=ngLi;@$OoCk|K zoMSY`<`&I)%x2$Fk}MT82B&tCw!Jt(E!i}~_j@(@dqjfK`xQeKGbQJ-a{Vu_Y5 zd#n*s-bg-&VmT(Yo0u9DPNA}s%-jd|IH^@BpC55ByadD~2P zgo8ey*$doahgop?uqKB2$?ci*pgm(`FDdVqly^tmE6c$J%;W>AH!A~4-J=(pRq}-_ zG4+?cFt~5$Epgd18*Qe3+Y5tA_@I>6|FFOxE$ne*U-3JY{G1JBMrU&mK4RM^X(hVPvrVVN~#WE#+0yw-BlNp%_*s3R(TS)eTGN6VIGaaeit@BTJL%ML z9DDG;aAGF!agqTi9t#zjF^RV(p6%3HY|R!nscB+079q*w?5ne^vaDvt$1TiiYi71u zjuZR1n!#Yp50=FLS_2D*IIF7rJ8s3|T>~7fUAE6HXS=m$$ho)R#7UBM46BLz7>Ul@{X^=wBOb5p7N;{vt<_2BLI#KAcEO?tlr@fb@wI}pL%`+FUT4z(Sy+e>cHymC+Hh}xI1j>JIA)EKIggOt}~~i zGxs)?w)gl&XUbb4j;~lB(->{>Di!4L5SI9@s*16!k(tI;NLZtOa+*TxARY;R!{vR5 K)6eDx%l`+|y%<;k diff --git a/pc-bios/bios.diff b/pc-bios/bios.diff index c355befc9d3..86c36c11d17 100644 --- a/pc-bios/bios.diff +++ b/pc-bios/bios.diff @@ -1,10 +1,10 @@ Index: rombios.h =================================================================== RCS file: /cvsroot/bochs/bochs/bios/rombios.h,v -retrieving revision 1.2 -diff -u -w -r1.2 rombios.h ---- rombios.h 1 Oct 2006 16:39:18 -0000 1.2 -+++ rombios.h 2 Oct 2006 18:31:41 -0000 +retrieving revision 1.3 +diff -u -w -r1.3 rombios.h +--- rombios.h 3 Oct 2006 20:27:30 -0000 1.3 ++++ rombios.h 1 Nov 2006 19:16:34 -0000 @@ -19,7 +19,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA @@ -12,50 +12,16 @@ diff -u -w -r1.2 rombios.h -//#define BX_QEMU +#define BX_QEMU - #define BX_ROMBIOS32 1 - #define DEBUG_ROMBIOS 0 + #ifndef LEGACY + # define BX_ROMBIOS32 1 Index: rombios32.c =================================================================== RCS file: /cvsroot/bochs/bochs/bios/rombios32.c,v -retrieving revision 1.6 -diff -u -w -r1.6 rombios32.c ---- rombios32.c 2 Oct 2006 06:29:37 -0000 1.6 -+++ rombios32.c 2 Oct 2006 18:31:41 -0000 -@@ -45,6 +45,8 @@ - : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) \ - : "0" (index)) - -+#define wbinvd() asm volatile("wbinvd") -+ - #define CPUID_APIC (1 << 9) - - #define APIC_BASE ((uint8_t *)0xfee00000) -@@ -591,6 +593,7 @@ - PCIDevice *d = &i440_pcidev; - int v; - -+ wbinvd(); - v = pci_config_readb(d, 0x59); - v = (v & 0x0f) | (0x10); - pci_config_writeb(d, 0x59, v); -@@ -645,7 +648,7 @@ - outb(0xb3, 0x01); - - /* raise an SMI interrupt */ -- outb(0xb2, 0x01); -+ outb(0xb2, 0x00); - - /* wait until SMM code executed */ - while (inb(0xb3) != 0x00); -@@ -656,6 +659,7 @@ - /* copy the SMM code */ - memcpy((void *)0xa8000, &smm_code_start, - &smm_code_end - &smm_code_start); -+ wbinvd(); - - /* close the SMM memory window and enable normal SMM */ - pci_config_writeb(&i440_pcidev, 0x72, 0x02 | 0x08); -@@ -848,6 +852,11 @@ +retrieving revision 1.8 +diff -u -w -r1.8 rombios32.c +--- rombios32.c 3 Oct 2006 20:27:30 -0000 1.8 ++++ rombios32.c 1 Nov 2006 19:16:34 -0000 +@@ -852,6 +852,11 @@ int ioapic_id, i, len; int mp_config_table_size; -- 2.47.3