don't add no-frame-pointer-elim for inline functions

and make syscall functions inline
this gets the tests all passing on i386
This commit is contained in:
Andrew Kelley 2016-05-18 18:30:03 -07:00
parent 762e686d17
commit b08bc84a36
3 changed files with 15 additions and 15 deletions

View File

@ -1130,7 +1130,7 @@ static void resolve_function_proto(CodeGen *g, AstNode *node, FnTableEntry *fn_t
if (!fn_table_entry->is_extern) {
LLVMAddFunctionAttr(fn_table_entry->fn_value, LLVMNoUnwindAttribute);
}
if (!g->is_release_build) {
if (!g->is_release_build && !fn_proto->is_inline) {
ZigLLVMAddFunctionAttr(fn_table_entry->fn_value, "no-frame-pointer-elim", "true");
ZigLLVMAddFunctionAttr(fn_table_entry->fn_value, "no-frame-pointer-elim-non-leaf", nullptr);
}

View File

@ -419,20 +419,20 @@ pub const F_GETOWN_EX = 16;
pub const F_GETOWNER_UIDS = 17;
pub fn syscall0(number: isize) -> isize {
pub inline fn syscall0(number: isize) -> isize {
asm volatile ("int $0x80"
: [ret] "={eax}" (-> isize)
: [number] "{eax}" (number))
}
pub fn syscall1(number: isize, arg1: isize) -> isize {
pub inline fn syscall1(number: isize, arg1: isize) -> isize {
asm volatile ("int $0x80"
: [ret] "={eax}" (-> isize)
: [number] "{eax}" (number),
[arg1] "{ebx}" (arg1))
}
pub fn syscall2(number: isize, arg1: isize, arg2: isize) -> isize {
pub inline fn syscall2(number: isize, arg1: isize, arg2: isize) -> isize {
asm volatile ("int $0x80"
: [ret] "={eax}" (-> isize)
: [number] "{eax}" (number),
@ -440,7 +440,7 @@ pub fn syscall2(number: isize, arg1: isize, arg2: isize) -> isize {
[arg2] "{ecx}" (arg2))
}
pub fn syscall3(number: isize, arg1: isize, arg2: isize, arg3: isize) -> isize {
pub inline fn syscall3(number: isize, arg1: isize, arg2: isize, arg3: isize) -> isize {
asm volatile ("int $0x80"
: [ret] "={eax}" (-> isize)
: [number] "{eax}" (number),
@ -449,7 +449,7 @@ pub fn syscall3(number: isize, arg1: isize, arg2: isize, arg3: isize) -> isize {
[arg3] "{edx}" (arg3))
}
pub fn syscall4(number: isize, arg1: isize, arg2: isize, arg3: isize, arg4: isize) -> isize {
pub inline fn syscall4(number: isize, arg1: isize, arg2: isize, arg3: isize, arg4: isize) -> isize {
asm volatile ("int $0x80"
: [ret] "={eax}" (-> isize)
: [number] "{eax}" (number),
@ -459,7 +459,7 @@ pub fn syscall4(number: isize, arg1: isize, arg2: isize, arg3: isize, arg4: isiz
[arg4] "{esi}" (arg4))
}
pub fn syscall5(number: isize, arg1: isize, arg2: isize, arg3: isize,
pub inline fn syscall5(number: isize, arg1: isize, arg2: isize, arg3: isize,
arg4: isize, arg5: isize) -> isize
{
asm volatile ("int $0x80"
@ -472,7 +472,7 @@ pub fn syscall5(number: isize, arg1: isize, arg2: isize, arg3: isize,
[arg5] "{edi}" (arg5))
}
pub fn syscall6(number: isize, arg1: isize, arg2: isize, arg3: isize,
pub inline fn syscall6(number: isize, arg1: isize, arg2: isize, arg3: isize,
arg4: isize, arg5: isize, arg6: isize) -> isize
{
asm volatile ("int $0x80"

View File

@ -370,14 +370,14 @@ pub const F_GETOWN_EX = 16;
pub const F_GETOWNER_UIDS = 17;
pub fn syscall0(number: isize) -> isize {
pub inline fn syscall0(number: isize) -> isize {
asm volatile ("syscall"
: [ret] "={rax}" (-> isize)
: [number] "{rax}" (number)
: "rcx", "r11")
}
pub fn syscall1(number: isize, arg1: isize) -> isize {
pub inline fn syscall1(number: isize, arg1: isize) -> isize {
asm volatile ("syscall"
: [ret] "={rax}" (-> isize)
: [number] "{rax}" (number),
@ -385,7 +385,7 @@ pub fn syscall1(number: isize, arg1: isize) -> isize {
: "rcx", "r11")
}
pub fn syscall2(number: isize, arg1: isize, arg2: isize) -> isize {
pub inline fn syscall2(number: isize, arg1: isize, arg2: isize) -> isize {
asm volatile ("syscall"
: [ret] "={rax}" (-> isize)
: [number] "{rax}" (number),
@ -394,7 +394,7 @@ pub fn syscall2(number: isize, arg1: isize, arg2: isize) -> isize {
: "rcx", "r11")
}
pub fn syscall3(number: isize, arg1: isize, arg2: isize, arg3: isize) -> isize {
pub inline fn syscall3(number: isize, arg1: isize, arg2: isize, arg3: isize) -> isize {
asm volatile ("syscall"
: [ret] "={rax}" (-> isize)
: [number] "{rax}" (number),
@ -404,7 +404,7 @@ pub fn syscall3(number: isize, arg1: isize, arg2: isize, arg3: isize) -> isize {
: "rcx", "r11")
}
pub fn syscall4(number: isize, arg1: isize, arg2: isize, arg3: isize, arg4: isize) -> isize {
pub inline fn syscall4(number: isize, arg1: isize, arg2: isize, arg3: isize, arg4: isize) -> isize {
asm volatile ("syscall"
: [ret] "={rax}" (-> isize)
: [number] "{rax}" (number),
@ -415,7 +415,7 @@ pub fn syscall4(number: isize, arg1: isize, arg2: isize, arg3: isize, arg4: isiz
: "rcx", "r11")
}
pub fn syscall5(number: isize, arg1: isize, arg2: isize, arg3: isize, arg4: isize, arg5: isize) -> isize {
pub inline fn syscall5(number: isize, arg1: isize, arg2: isize, arg3: isize, arg4: isize, arg5: isize) -> isize {
asm volatile ("syscall"
: [ret] "={rax}" (-> isize)
: [number] "{rax}" (number),
@ -427,7 +427,7 @@ pub fn syscall5(number: isize, arg1: isize, arg2: isize, arg3: isize, arg4: isiz
: "rcx", "r11")
}
pub fn syscall6(number: isize, arg1: isize, arg2: isize, arg3: isize, arg4: isize,
pub inline fn syscall6(number: isize, arg1: isize, arg2: isize, arg3: isize, arg4: isize,
arg5: isize, arg6: isize) -> isize
{
asm volatile ("syscall"