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 zcmZuz3s_WT8b0rtakz-gh=~aXqalhHm_hP_Xr^>5L*?R%f(0ZDUJ^(dmTrOz88cj} z75I@_E{kn#SIu_Mk+B?tbvMfp6}4y$gYZmK!ebZ&$n1a4jMY9*49xSt@Av-S?LXgt zC@gd@EObAr@Wi^~O3(X;0wT0Q+MwvP+>A(VxK6h?Os@;mFVX53M@B4-)ZNFY0ip_n z{5p3W11|Gp9`K(qz3p;>;Ksy?w}wsMKic{S)3;_$sq2lk)DxW=Q+@VbPOv;nB`lS+ zQi)|fNmS!0cG+ceUX6Kd&}A~NMnJR|)u^auV5q3g-9FWkH*QH+Cs+nAIq5GX+RS-I z!8p5=bAR4y)L6czHYxIl)TXq1TUtn}2Gf=|y0%mexe~IJyM#r*F!?U#$zPZVBv^9! z_ch3I!z28?cjIHQ!I#MO>DV7Wld6?8(Ca@)fmU1YabY6kaLY6oenG~wESgI^@k29M z<`SPU11!+VZ@vd-*vYM(c7^3+XM*|Qt=m$Q&Jev8GjM`z&|;0|aHq3R&s;BR^Rx{x zWSSN;$;VnuCF`|tCtqt3|G;*asH?B2O=X{IKKQNdDb7W=$#kUo;Nb0IYwiS#PKp@v zYs4j;WbaJmuyZ>3-kFGZ!zjNb1dSS4_%D{>Uka3w`W09QBl&Ix?q!!>*QK2HlUo>#i33?UAAw656cFg=X*B8 z%0eVZwqgz5B;r>57kT7#5)QGU9ei>!cF`_(kbiGOFs}1AwxO7%PWPoy-v`L2DfkSV z_?lGYtF%+kInQ#efwr%x&D(aKvDGuBoNr0DbRb{xx=btr-XQ5aXsA8>8#@pRc6mF0 zWhY|5YTEhW-B{{|8+^)MXn+s-oPB5lYWTa1@CCN=^YhT4V8cG=&prho;40~Unz|U` z)z4s&3Rn0w2N0rw!0#!>y9&B*MhT_>`*@uRu?i&c2g)dB7oO#-%kduANoUF07qJvq z`N9{Wr6WihUqU5X_{A^dPwez0!Rlt>exh@yx0*PmdGo|lPE}#mcaaN+Xd$%em6(Z9 z5>knKkxbTCB9NZ#o=W)ZMxLgRb1C5D}TEa~+bB+?uhb9y>E+tgJ$}HXSe|hd;1rO>cLQY5{xYPAqd99XjlNs{b zTL`DT#+kI4oBUh9b6C2Wy7U&uvdmn8t9&2Um9*silPtLisU|tV2`BcJuykep-HGL* zq(FxyEEiRm6&)Q^P{KKAF_K#9*E5p!_bRM|Fj4BsF4A0$dkUU{crZ(D=mwgY930dd z>*JMvVHJdLD_a_Qz#ou}PTHh4P^$-=m7-lUHp zY}(QqzOt)wyfU$>qbj8O{pyFvf@A99P_m!~{*z8TA(tn3(NfwGwIu!b@^8F)XRc79*WkbmR>dh`XgNUWL@=WW+*APdU3zj++o$%8ish zHdem>rnn%}nUK7F%#k|*YG#1B5&+T*p033M#>Rt7o( zW-%k;KNM6PnAT2;4VmC^5W(D?WYN z{-b_PTiC zj?KJLC)P?jLp;?9Lv>=A!;oZ;aY9F(_#BCAKrl(E$6kN8dVv}EXuxrT88|iIupMKf z6h?na87#BN_w|Sl5bDL4U!Aqoiz|QQ>=Uw~0T21!82-!8Hrp^me^M5Or<`k0GYqZg ztp@l4&wAeHPd(hS?IgFsO8<|0d020)xKd%Q=&leee0M4h z`rgvuOy!ooKey_bUh?h{e63m?J^JRMNWSqkL4u^-!W<+Xtk%E)Lp!dTCfWWhD0!b-}oVYb`jt_oCxR z-|b7^B5mEzDr|4RLl>hgN$kgbmAs*ynEJ7jobHFWlQ=-S`mxJ{kw#$8+Oi9lN#{yEz&Q)Bot6UlQSJMmv49;|T^6EGqR2l06 g4O=8n)2kiWqI@Vsc3VjX98h^mrxK=H%#02F4@WXsz5oCK delta 3027 zcmZuz3sjV48vdVu#sLJG5d{zIdi_}dEf7O zFW+r)bA5AjeNU@~W6>G)@MrEt81+&5sD$-9UY@IuF&Jh?8x7G0quw}s?yR`E##p)@ z5H%3!QeRX9hv=Xm!iSA5{KhQ!aEanCeMPrktb3v8n$4s(TupTTi5Rp94x00g*|~tZ z@XV!-xj09X)mps4Ke$L*w3yC|7s-$o5eZEf&4Pyc^xn&>_jLzL*+b3^TC-E|(wAh~ zW*Qz3>tn?x-#sp?&UuX44X-YI4Gya_pzypDN~n0PPq>Lcb! zn4PioBOS7Qprw<>;4|xIRpapmPfqDEhQ#U-jJL@OJr+-Ykxi9bv-3t?{qXKy&Q@^uLB4Cp zFz2#1x5}B&X0{dl@<489GI8oL4hu=U9w`f_c&A;yo>#AN2ipp+DNey&x?Z8@J`%gz z%EW$beIz!}O14ix7VmDQS0^CZ2eow0G*s!3LodbQa}^TF(Ro;kIC66yCh^kOR68FF zc)s;(nzR5Hf%oXtMXU&vkok*o3(wOT2`~>s7|r=3=79gTg$hg20=}h%?p+Qa;1sn# zhwZ>o; z6a#V`FAQx`P)r2Ee)CAKW`%E*J3i>r$4PlKF>s7TgSAQkT2Jv z0b^)II$qc4FEx4=bkM=tmscOy-NJPr<%&%qg&lIQ9n`Q9vw+QHLk0_Fr0->5CV1%r zZQq3D;9D=y$*&;R2OrUO+o1z?)2!EU3|LD?TM+_`r!%tQQ1N%ZqF=p%Am9hm@g|dS zQteL6(%>*%yc^S0c#Cey#|J7lZ(Jcp0duIK2#G3$(%pL*=6`OW<@@j<_~r)k?0&@J z2b#Mddax!`{S|iXp|jt?pZV~$g3G7K^ea1j0>>4Z)V5Xr#U@RO%gJ%1xs;W1i43!2 z0`8M3c1%JFS!PEhUL&vA5gy+6Cfn7;reBSh&51VCfZ?j~a;ed^Z`V&^Evd3&G?tN% zmIK%x)MeItb~L@lUCWy(l&XlQx44?Wjs>w zXS@6ci7Ugng%^2IEla4xhHW;JmbF|KII)f8VKeC%R7A==c%+Qw)3-;)ij0kvmqDMC zDia1*p=p%OBo&&1SVB=lazbl)g=I7TFV7{s;Ky`gyvg~p@nmJJRj!dRWgIBPFh0Q-Xt8qddWsj;a_Q z{hQ#!7*;F6tJtW13kyCZhm}#o7NrO&DknhyFqL)>=k4${PRXx@O=B77u#}@#KlJ=i z_WZr1t2vt~AYNiOcV>g<{1s#|SN97tz1tdMGX*gXXM)$bi5WHSSlO6o9VKN4Iv@91 zRw|YV*-~H)m9j@_q->q+z9Oe>*1kb zvr0aY#ist^mj?Ikx-BkyZex+Dzv!hwW%{6$-Tx@TpDgTgWMA=nmHgxlq(@|O4?kkt zrzu?lnOvkaJ5U`dMNH)SMM^3UV8)c-gWZ*v63t1;Vn$g!w_}D_SeBX`+ho?crjj!1aFG zD}BQC*7i!>)m*&F8qO$-Q$_q8NQgLaR9yZ)v3HM(^M50DifnP<55c$kj@<9Q(Z_Mz zx>+&nPCK+5#~%DI9hk}YI>>+nPXvj~7|&bd&UNZ6Ma>p=Q`5LAEJA#*qp!}g%Cedn zpR_P*Q8TmEa-7)5)eHt$eze5>$Lg0i#939{-*YP#?;hY_?JD}ha;{rkq?O*)U`2S1kRqJ)7{b#rO+2}DmW)rCGy;~Nm`uV#M_W9aMOpv#w$ z@g%JS#;C*pG>fG(`-LH?sGhATQ*J78eUi&6P!HaDUmT2<-=q&Z5QDL#vjd^*y}#dq zXujJ?rgtJ8pOWHEJm&L6UCryfIEBzoM2`xotLfuKU0sc+5{I*2_I!~0op@3`&MBl3 z;}tv`Vm~LkJ`dC z@P5{B-?&4M5#s6S~0iLYx z!3-ad`-h~k2lL7K9*poZx#Zg(WctdRHGOJNBNHD(U+%?dU$tLV_fz!kKHM8N_2jYb zsxNr1u^ZJ5msmi-shy%<;k diff --git a/pc-bios/bios.diff b/pc-bios/bios.diff index c355befc9d..86c36c11d1 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;