Revision e0b3073f
| b/pc-bios/bios.diff | ||
|---|---|---|
| 4 | 4 |
retrieving revision 1.130 |
| 5 | 5 |
diff -u -w -r1.130 rombios.c |
| 6 | 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 | 8 |
@@ -8570,7 +8570,10 @@ |
| 9 | 9 |
use32 386 |
| 10 | 10 |
#define APM_PROT32 |
| ... | ... | |
| 16 | 16 |
|
| 17 | 17 |
#define APM_REAL |
| 18 | 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 | 47 |
Index: apmbios.S |
| 20 | 48 |
=================================================================== |
| 21 | 49 |
RCS file: /cvsroot/bochs/bochs/bios/apmbios.S,v |
| 22 | 50 |
retrieving revision 1.1 |
| 23 | 51 |
diff -u -w -r1.1 apmbios.S |
| 24 | 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 | 54 |
@@ -1,6 +1,9 @@ |
| 27 | 55 |
// APM BIOS support for the Bochs BIOS |
| 28 | 56 |
// Copyright (C) 2004 Fabrice Bellard |
Also available in: Unified diff