gwj / at91sam9263 · Commits

Commit e0b3073f53dd9c0a2206932c58b5f83a87f7525b

Authored by bellard
1 parent 29517134

BIOS workarounds for kqemu 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1758 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 30 additions and 2 deletions
pc-bios/bios.bin
View file @e0b3073
No preview for this file type
pc-bios/bios.diff
  View file @e0b3073
@@ -4,7 +4,7 @@ RCS file: /cvsroot/bochs/bochs/bios/rombios.c,v @@ -4,7 +4,7 @@ RCS file: /cvsroot/bochs/bochs/bios/rombios.c,v
4 retrieving revision 1.130 4 retrieving revision 1.130
5 diff -u -w -r1.130 rombios.c 5 diff -u -w -r1.130 rombios.c
6 --- rombios.c 13 Feb 2005 08:47:30 -0000 1.130 6 --- rombios.c 13 Feb 2005 08:47:30 -0000 1.130
7 -+++ rombios.c 6 Apr 2005 22:38:16 -0000 7 ++++ rombios.c 9 Feb 2006 21:49:38 -0000
8 @@ -8570,7 +8570,10 @@ 8 @@ -8570,7 +8570,10 @@
9 use32 386 9 use32 386
10 #define APM_PROT32 10 #define APM_PROT32
@@ -16,13 +16,41 @@ diff -u -w -r1.130 rombios.c @@ -16,13 +16,41 @@ diff -u -w -r1.130 rombios.c
16 16
17 #define APM_REAL 17 #define APM_REAL
18 #include "apmbios.S" 18 #include "apmbios.S"
  19 +@@ -8611,6 +8614,7 @@
  20 + mov al, #0x80
  21 + bios32_end:
  22 + popf
  23 ++ and dword ptr[esp+4],0xfffffffc ;; reset CS.RPL for kqemu
  24 + retf
  25 +
  26 + .align 16
  27 +@@ -8721,17 +8725,17 @@
  28 + pci_pro_fail:
  29 + pop edi
  30 + pop esi
  31 +- sti
  32 + popf
  33 + stc
  34 ++ and dword ptr[esp+4],0xfffffffc ;; reset CS.RPL for kqemu
  35 + retf
  36 + pci_pro_ok:
  37 + xor ah, ah
  38 + pop edi
  39 + pop esi
  40 +- sti
  41 + popf
  42 + clc
  43 ++ and dword ptr[esp+4],0xfffffffc ;; reset CS.RPL for kqemu
  44 + retf
  45 +
  46 + pci_pro_select_reg:
19 Index: apmbios.S 47 Index: apmbios.S
20 =================================================================== 48 ===================================================================
21 RCS file: /cvsroot/bochs/bochs/bios/apmbios.S,v 49 RCS file: /cvsroot/bochs/bochs/bios/apmbios.S,v
22 retrieving revision 1.1 50 retrieving revision 1.1
23 diff -u -w -r1.1 apmbios.S 51 diff -u -w -r1.1 apmbios.S
24 --- apmbios.S 20 Jun 2004 18:27:09 -0000 1.1 52 --- apmbios.S 20 Jun 2004 18:27:09 -0000 1.1
25 -+++ apmbios.S 6 Apr 2005 22:38:16 -0000 53 ++++ apmbios.S 9 Feb 2006 21:49:38 -0000
26 @@ -1,6 +1,9 @@ 54 @@ -1,6 +1,9 @@
27 // APM BIOS support for the Bochs BIOS 55 // APM BIOS support for the Bochs BIOS
28 // Copyright (C) 2004 Fabrice Bellard 56 // Copyright (C) 2004 Fabrice Bellard