M-Labs
/
libfringe
3
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Unbreak or1k. 

close #53
This commit is contained in:
whitequark 2016-09-16 13:04:57 +00:00 committed by edef
parent 84d6cef719
commit 809215921b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/arch/or1k.rs
View File

@ -41,6 +41,7 @@
// * The 1st init trampoline tells the unwinder to restore r2 and r9 // * The 1st init trampoline tells the unwinder to restore r2 and r9
// from the stack frame at r2 (in the parent stack), thus continuing // from the stack frame at r2 (in the parent stack), thus continuing
// unwinding at the swap call site instead of falling off the end of context stack. // unwinding at the swap call site instead of falling off the end of context stack.
use core::mem;
use stack::Stack; use stack::Stack;
pub const STACK_ALIGNMENT: usize = 4; pub const STACK_ALIGNMENT: usize = 4;
@ -101,11 +102,11 @@ pub unsafe fn init(stack: &Stack, f: unsafe extern "C" fn(usize, StackPointer) -
# doesn't point to the start of the symbol. This confuses gdb's backtraces, # doesn't point to the start of the symbol. This confuses gdb's backtraces,
# causing them to think the parent function is trampoline_1 instead of # causing them to think the parent function is trampoline_1 instead of
# trampoline_2. # trampoline_2.
nop l.nop
# Call the provided function. # Call the provided function.
l.lwz r4, 8(r1) l.lwz r5, 8(r1)
l.jalr r4 l.jalr r5
l.nop l.nop
"# "#
: : : : "volatile") : : : : "volatile")