Bochs/bochs/patches/bochs-bios-win32.diff
2011-04-03 10:29:19 +00:00

75 lines
1.7 KiB
Diff

diff -Nurd bios-orig/rombios32.ld bios/rombios32.ld
--- bios-orig/rombios32.ld Sat Jan 26 09:15:27 2008
+++ bios/rombios32.ld Sat Mar 22 09:29:24 2008
@@ -1,4 +1,3 @@
-OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
OUTPUT_ARCH(i386)
ENTRY(_start);
SECTIONS
diff -Nurd bios-orig/rombios32start.S bios/rombios32start.S
--- bios-orig/rombios32start.S Sat Jan 26 09:15:27 2008
+++ bios/rombios32start.S Sat Mar 22 09:30:49 2008
@@ -21,12 +21,12 @@
#include "rombios.h"
.globl _start
-.globl smp_ap_boot_code_start
-.globl smp_ap_boot_code_end
-.global smm_relocation_start
-.global smm_relocation_end
-.global smm_code_start
-.global smm_code_end
+.globl _smp_ap_boot_code_start
+.globl _smp_ap_boot_code_end
+.global _smm_relocation_start
+.global _smm_relocation_end
+.global _smm_code_start
+.global _smm_code_end
_start:
/* clear bss section */
@@ -36,20 +36,20 @@
sub %edi, %ecx
rep stosb
- jmp rombios32_init
+ jmp _rombios32_init
.code16
-smp_ap_boot_code_start:
+_smp_ap_boot_code_start:
xor %ax, %ax
mov %ax, %ds
incw CPU_COUNT_ADDR
1:
hlt
jmp 1b
-smp_ap_boot_code_end:
+_smp_ap_boot_code_end:
/* code to relocate SMBASE to 0xa0000 */
-smm_relocation_start:
+_smm_relocation_start:
mov $0x38000 + 0x7efc, %ebx
addr32 mov (%ebx), %al /* revision ID to see if x86_64 or x86 */
cmp $0x64, %al
@@ -66,10 +66,10 @@
movw $0xb3, %dx
outb %al, %dx
rsm
-smm_relocation_end:
+_smm_relocation_end:
/* minimal SMM code to enable or disable ACPI */
-smm_code_start:
+_smm_code_start:
movw $0xb2, %dx
inb %dx, %al
cmp $0xf0, %al
@@ -95,4 +95,4 @@
2:
rsm
-smm_code_end:
+_smm_code_end: