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 zcmZo@;Am*z*uc!i=(U-J%l^BZiGqrPic4Zis+EF~fq|L6p@F`kxq_jYm5GIwf$8={ zM#dLxj9<2UaWHOVWW2up4=1BEtK^aE!8_O)0$zOm(fKC!aA@b#E;kl~Cjqt-K{xAEtJB2@Z_m^uB;hP}gE;lY4#!}U8H;&c=r2@O}UxV1Z_j~gZme+i{ z4^B@IU=+7r2-Pz6JJdnDd!Y)O;UX1KkwUnL31jf?lI@!W7z@}Ly|*h%FdkxLQoA<& zxg=wqk>a)B9V`q1FP6UrS>&`^7RsLv<{Rx6hw|IOe5Kt2*S1fWV%){Z#BgnUunZ#; zBjeTWVX};;m;?`Bea*ak&(+|rwy%FdfpluRp#q}}Ej75x$x2LoFGX^qVm>%iR7{z#O`WAmi zZ^k{-0vN*?H%*TSVC-OAKK)?;qaS1Mc7s61dCZJq+s}tE3NbOsU)ugSjPU>yq^27q>@8GiEU|FaIV0328-M%7&QICg-+uqR6 zsKChhV*0`fj8hm7Za16A*u*3mwc`MLr`xyC&ZmY4I^9^h!nnKL*!m6_-kyGWGNUml z(5EmeGX9>fIfYS~F?zc16h?W*(&@QV7^Mw2~{Ocsn?t%k8(p6T{n+4G;9z zy?b#myZH!9=PhXd@$vcHguBa4iifeoP3ols zv*Ce&7rX^7E*)&fENN_ zwqTc=AhNmYOfO78M)JM*lh@@|5B0tf6V%Zl!%yacJpu9)*n*u9J|D;vpu%z`gb(%< z$fB7bKG;+9@?2b0>O0*2ce(ussRo5tHAoih7c?KvW8A?F3X`nqyQVS9)>ksVXv=Fo zP{RDeFAox+I~W-PUZ{bzLmkJ=5b#0_!UtQ<$`J5^4aDEEkRjm3v0N7ym46^>LA-Oh zU{Cy4spnAuiGiGQ3nB&$VGc&Ho3G@8;`V=im)n1paG1)CAeGo0eTAXRjmPGHsle`K zXCQg8qX1N{R)B;XOU1g}gg`m50VLtlAepvOt1dSa zAsePr$^T_+|H}kG>TICuv5Tf~7BjX_xjp6Il<=t+ zr)o~yG|gkW&PM(gz3DnL7^Qi4=77DogNGsD#oFm1GZ>BPU*|L*VQD$Q-*T9t`N)qQ za~J}4I4}gfNKNm&49YofzdGao?6}Bmc)Pdm*Nds?Wm(Nf{_L0mRdo=gxzp{-j#*HF z4G@7(h6e(6EP#rw&uKow1`1GfSb%;9Wy=3$pZ=G9seh3T(!$eV@FV~t@}dEx9u$lQ zV0(iDy4`+t$NlN8`}9I5y%X%9<|8cs%l`Z?`vrIJ*|g>(9L+~KUff{@<@MhQa#;*8 z_+rbx$j3Zc4D$cY_*mrs%PBGZda;$c`3Q%6;`!+DsQ7N) zi&-FbX+gUfI(K}Z_oC;2TGVSF2>1WI7q!y^7ci<#kDt$2B+Wj52g8SbAO7!T_^|)O z|CbvXY?w=>cQAZN+pRSH&3r}|xgGOg_#g~BIRAwml3^#O`z>Jf5PSDy?$4Jme=smG zFvJ@h#a~#!&%nSKJAL&6Mm;8hh0|{@VAK_S&cMK6!&GW<@S#9j=fyO`+uNlUGCDE( z2rT?@I4vwK+=i*tB<6VKb!>9KzW}L@+ZwbG`0Ukzvr2}cN z@~2xZVKil2I=x^CqqN%oB@7?*_!;FU{xCeyccbq>--EsvePWp`X@*a_)zVoao=rMz z!0=@Hx+RSF*_>Q{ubOPNec@6@D>du9e1!mKPlc4!vdrXEh4Rdj429&J#NuLwKOhj&#ly@;8<^C6?Yu=n9z zKbT&)9^UnW`Gx)AT`!nkSWf@_kkN$2cK42&>Bf&3-NlX_eDU?ri@iE8xOTkg+wo$J z-isu|7s=BnJYqEFV_OL6_6Os4 zR*hqei1Hx delta 3027 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 NP(0`xm@)jB3INo-7+3%R 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;