projects
/
seabios.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
grml...
[seabios.git]
/
src
/
romlayout.S
diff --git
a/src/romlayout.S
b/src/romlayout.S
index f5c36fc30138fed59da0e62d58b85163171af268..5983a4a7b1c615e64acba65d30674078a8fedb0e 100644
(file)
--- a/
src/romlayout.S
+++ b/
src/romlayout.S
@@
-264,8
+264,10
@@
entry_pmm:
pushw %ds
movw %ss, %cx // Move %ss to %ds
movw %cx, %ds
pushw %ds
movw %ss, %cx // Move %ss to %ds
movw %cx, %ds
- leal 28(%esp), %eax // %eax points to start of args
- calll handle_pmm
+ movl $_cfunc32flat_handle_pmm, %eax // Setup: call32(handle_pmm, args, -1)
+ leal 28(%esp), %edx // %edx points to start of args
+ movl $-1, %ecx
+ calll call32
movw %ax, 12(%esp) // Modify %ax:%dx to return %eax
shrl $16, %eax
movw %ax, 4(%esp)
movw %ax, 12(%esp) // Modify %ax:%dx to return %eax
shrl $16, %eax
movw %ax, 4(%esp)
@@
-311,8
+313,8
@@
entry_pnp_real:
lretw
// APM entry points
lretw
// APM entry points
- DECLFUNC
apm16protected_entry
-
apm16protected_entry
:
+ DECLFUNC
entry_apm16
+
entry_apm16
:
pushfw // save flags
pushl %eax // dummy
ENTRY_ARG handle_apm16
pushfw // save flags
pushl %eax // dummy
ENTRY_ARG handle_apm16
@@
-321,8
+323,8
@@
apm16protected_entry:
lretw
.code32
lretw
.code32
- DECLFUNC
apm32protected_entry
-
apm32protected_entry
:
+ DECLFUNC
entry_apm32
+
entry_apm32
:
pushfl
pushl %gs
pushl %cs // Move second descriptor after %cs to %gs
pushfl
pushl %gs
pushl %cs // Move second descriptor after %cs to %gs
@@
-334,8
+336,8
@@
apm32protected_entry:
lretl
// PCI-BIOS 32bit entry point
lretl
// PCI-BIOS 32bit entry point
- DECLFUNC
pcibios32_entry
-
pcibios32_entry
:
+ DECLFUNC
entry_pcibios32
+
entry_pcibios32
:
pushfl
pushl %gs // Backup %gs and set %gs=%ds
pushl %ds
pushfl
pushl %gs // Backup %gs and set %gs=%ds
pushl %ds
@@
-346,8
+348,8
@@
pcibios32_entry:
lretl
// BIOS32 support
lretl
// BIOS32 support
- EXPORTFUNC
bios32_entry
-
bios32_entry
:
+ EXPORTFUNC
entry_bios32
+
entry_bios32
:
pushfl
#if CONFIG_PCIBIOS
// Check for PCI-BIOS request
pushfl
#if CONFIG_PCIBIOS
// Check for PCI-BIOS request
@@
-355,7
+357,7
@@
bios32_entry:
jne 1f
movl $BUILD_BIOS_ADDR, %ebx
movl $BUILD_BIOS_SIZE, %ecx
jne 1f
movl $BUILD_BIOS_ADDR, %ebx
movl $BUILD_BIOS_SIZE, %ecx
- movl $
pcibios32_entry
, %edx
+ movl $
entry_pcibios32
, %edx
xorb %al, %al
jmp 2f
#endif
xorb %al, %al
jmp 2f
#endif
@@
-366,8
+368,8
@@
bios32_entry:
lretl
// 32bit elf entry point
lretl
// 32bit elf entry point
- EXPORTFUNC
post32
-
post32
:
+ EXPORTFUNC
entry_elf
+
entry_elf
:
cli
cld
lidtl (BUILD_BIOS_ADDR + pmode_IDT_info)
cli
cld
lidtl (BUILD_BIOS_ADDR + pmode_IDT_info)