david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

Use librm_arch_initialise for librm, arch_initialise for others.

This commit is contained in:
Michael Brown 2005-04-10 18:22:31 +00:00
parent 560027899e
commit 997b51c1e6
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/arch/i386/core/setup.S
View File

@ -39,6 +39,8 @@
#define ENTER_FROM_EXTERNAL call ext_to_kir
#define RETURN_TO_EXTERNAL call kir_to_ext
#define ENTRY_POINT kir_call
#define ENTRY_POINT_REGISTER di
#define INIT_FUNC arch_initialise
#else /* KEEP_IT_REAL */
@ -50,11 +52,11 @@
call prot_to_real ; \
.code16
#define ENTRY_POINT _prot_call /* _prot_call = OFFSET ( prot_call ) in librm */
#define ENTRY_POINT_REGISTER di
#define INIT_FUNC librm_arch_initialise
#endif /* KEEP_IT_REAL */
#define ENTRY_POINT_REGISTER di
.section ".text16"
.code16
.globl setup16
@ -76,7 +78,8 @@ setup16:
#define RETURN_TO_EXTERNAL call int_to_ext
#define ENTRY_POINT int_call
#define ENTRY_POINT_REGISTER edi
#define INIT_FUNC arch_initialise
.section ".text"
.code32
.globl setup
@ -145,7 +148,7 @@ setup:
* subsequent calls. librm will use this facility, since
* arch_initialise() causes librm to be relocated.
*/
pushl $arch_initialise
pushl $INIT_FUNC
push %cs /* lcall %es:[x]di == %cs:[x]di */
call *%ENTRY_POINT_REGISTER
popl %ebp /* discard */