From dd0379c6088f62a891dcd4fb082d8e63421c863a Mon Sep 17 00:00:00 2001 From: Jonas 'Sortie' Termansen Date: Mon, 8 Jul 2013 17:33:19 +0200 Subject: [PATCH] Fix calltrace implementation on x86 and x86-64. --- sortix/x64/calltrace.s | 2 ++ sortix/x86/calltrace.s | 2 ++ 2 files changed, 4 insertions(+) diff --git a/sortix/x64/calltrace.s b/sortix/x64/calltrace.s index d2997826..85302d0b 100644 --- a/sortix/x64/calltrace.s +++ b/sortix/x64/calltrace.s @@ -29,6 +29,7 @@ .type calltrace, @function calltrace: push %rbp + push %rbx movq %rsp, %rbp xorl %edi, %edi movq %rbp, %rbx @@ -45,6 +46,7 @@ calltrace_unwind: jmp calltrace_unwind calltrace_done: + popq %rbx popq %rbp retq diff --git a/sortix/x86/calltrace.s b/sortix/x86/calltrace.s index 92e37f3d..d9a8f219 100644 --- a/sortix/x86/calltrace.s +++ b/sortix/x86/calltrace.s @@ -29,6 +29,7 @@ .type calltrace, @function calltrace: push %ebp + push %ebx movl %esp, %ebp xorl %edi, %edi movl %ebp, %ebx @@ -47,6 +48,7 @@ calltrace_unwind: jmp calltrace_unwind calltrace_done: + popl %ebx popl %ebp retl