diff options
| author | Michael Brown | 2008-11-19 01:18:32 +0100 |
|---|---|---|
| committer | Michael Brown | 2008-11-19 20:12:53 +0100 |
| commit | dc60c2414658f27b88f212bba8a36180ab8657fb (patch) | |
| tree | d4ad6d883d3fe6d4f7dfb9f75786f2815537d7dd /src/arch/i386/interface | |
| parent | [pxe] Move all PXE files to arch/i386 (diff) | |
| download | ipxe-dc60c2414658f27b88f212bba8a36180ab8657fb.tar.gz ipxe-dc60c2414658f27b88f212bba8a36180ab8657fb.tar.xz ipxe-dc60c2414658f27b88f212bba8a36180ab8657fb.zip | |
[i386] Rename __cdecl to __asmcall
__cdecl is a misleading name, since it currently encapsulates both
cdecl and regparm(0) attributes. Rename to __asmcall.
Diffstat (limited to 'src/arch/i386/interface')
| -rw-r--r-- | src/arch/i386/interface/pcbios/int13.c | 2 | ||||
| -rw-r--r-- | src/arch/i386/interface/pxe/pxe_call.c | 4 | ||||
| -rw-r--r-- | src/arch/i386/interface/syslinux/com32_call.c | 6 | ||||
| -rw-r--r-- | src/arch/i386/interface/syslinux/comboot_call.c | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/arch/i386/interface/pcbios/int13.c b/src/arch/i386/interface/pcbios/int13.c index 6f61e4a1c..a18039e03 100644 --- a/src/arch/i386/interface/pcbios/int13.c +++ b/src/arch/i386/interface/pcbios/int13.c @@ -322,7 +322,7 @@ static int int13_get_extended_parameters ( struct int13_drive *drive, * INT 13 handler * */ -static __cdecl void int13 ( struct i386_all_regs *ix86 ) { +static __asmcall void int13 ( struct i386_all_regs *ix86 ) { int command = ix86->regs.ah; unsigned int bios_drive = ix86->regs.dl; struct int13_drive *drive; diff --git a/src/arch/i386/interface/pxe/pxe_call.c b/src/arch/i386/interface/pxe/pxe_call.c index 7122c4eb8..04aaf3b20 100644 --- a/src/arch/i386/interface/pxe/pxe_call.c +++ b/src/arch/i386/interface/pxe/pxe_call.c @@ -119,7 +119,7 @@ static PXENV_EXIT_t pxenv_unknown ( struct s_PXENV_UNKNOWN *pxenv_unknown ) { * @v es:di Address of PXE parameter block * @ret ax PXE exit code */ -__cdecl void pxe_api_call ( struct i386_all_regs *ix86 ) { +__asmcall void pxe_api_call ( struct i386_all_regs *ix86 ) { int opcode = ix86->regs.bx; userptr_t parameters = real_to_user ( ix86->segs.es, ix86->regs.di ); size_t param_len; @@ -339,7 +339,7 @@ __cdecl void pxe_api_call ( struct i386_all_regs *ix86 ) { * @v es:di Address of PXE parameter block * @ret ax PXE exit code */ -__cdecl void pxe_loader_call ( struct i386_all_regs *ix86 ) { +__asmcall void pxe_loader_call ( struct i386_all_regs *ix86 ) { userptr_t uparams = real_to_user ( ix86->segs.es, ix86->regs.di ); struct s_UNDI_LOADER params; PXENV_EXIT_t ret; diff --git a/src/arch/i386/interface/syslinux/com32_call.c b/src/arch/i386/interface/syslinux/com32_call.c index 586730cf0..4a782dce6 100644 --- a/src/arch/i386/interface/syslinux/com32_call.c +++ b/src/arch/i386/interface/syslinux/com32_call.c @@ -41,7 +41,7 @@ uint16_t __bss16 ( com32_saved_sp ); /** * Interrupt call helper */ -void __cdecl com32_intcall ( uint8_t interrupt, physaddr_t inregs_phys, physaddr_t outregs_phys ) { +void __asmcall com32_intcall ( uint8_t interrupt, physaddr_t inregs_phys, physaddr_t outregs_phys ) { memcpy_user ( virt_to_user( &com32_regs ), 0, phys_to_user ( inregs_phys ), 0, @@ -111,7 +111,7 @@ void __cdecl com32_intcall ( uint8_t interrupt, physaddr_t inregs_phys, physaddr /** * Farcall helper */ -void __cdecl com32_farcall ( uint32_t proc, physaddr_t inregs_phys, physaddr_t outregs_phys ) { +void __asmcall com32_farcall ( uint32_t proc, physaddr_t inregs_phys, physaddr_t outregs_phys ) { memcpy_user ( virt_to_user( &com32_regs ), 0, phys_to_user ( inregs_phys ), 0, @@ -170,7 +170,7 @@ void __cdecl com32_farcall ( uint32_t proc, physaddr_t inregs_phys, physaddr_t o /** * CDECL farcall helper */ -int __cdecl com32_cfarcall ( uint32_t proc, physaddr_t stack, size_t stacksz ) { +int __asmcall com32_cfarcall ( uint32_t proc, physaddr_t stack, size_t stacksz ) { int32_t eax; copy_user_to_rm_stack ( phys_to_user ( stack ), stacksz ); diff --git a/src/arch/i386/interface/syslinux/comboot_call.c b/src/arch/i386/interface/syslinux/comboot_call.c index 5a400ede5..977d44f3d 100644 --- a/src/arch/i386/interface/syslinux/comboot_call.c +++ b/src/arch/i386/interface/syslinux/comboot_call.c @@ -212,7 +212,7 @@ void comboot_run_kernel ( ) /** * Terminate program interrupt handler */ -static __cdecl void int20 ( struct i386_all_regs *ix86 __unused ) { +static __asmcall void int20 ( struct i386_all_regs *ix86 __unused ) { longjmp ( comboot_return, COMBOOT_RETURN_EXIT ); } @@ -220,7 +220,7 @@ static __cdecl void int20 ( struct i386_all_regs *ix86 __unused ) { /** * DOS-compatible API */ -static __cdecl void int21 ( struct i386_all_regs *ix86 ) { +static __asmcall void int21 ( struct i386_all_regs *ix86 ) { ix86->flags |= CF; switch ( ix86->regs.ah ) { @@ -287,7 +287,7 @@ static __cdecl void int21 ( struct i386_all_regs *ix86 ) { /** * SYSLINUX API */ -static __cdecl void int22 ( struct i386_all_regs *ix86 ) { +static __asmcall void int22 ( struct i386_all_regs *ix86 ) { ix86->flags |= CF; switch ( ix86->regs.ax ) { |
