Fix register naming in backtrace

Signed-off-by: Harry Chen <i@harrychen.xyz>
master
Harry Chen 6 years ago
parent 7c20ebf6e0
commit f5227e28d3

@ -156,14 +156,13 @@ impl Context {
/// Push all callee-saved registers at the current kernel stack. /// Push all callee-saved registers at the current kernel stack.
/// Store current sp, switch to target. /// Store current sp, switch to target.
/// Pop all callee-saved registers, then return to the target. /// Pop all callee-saved registers, then return to the target.
#[naked] #[inline(always)]
#[inline(never)] pub unsafe fn switch(&mut self, target: &mut Self) {
pub unsafe extern fn switch(&mut self, _target: &mut Self) { extern "C" {
extern { fn switch_context(src: *mut Context, dst: *mut Context);
fn switch_context(src : &mut Context, dst : &mut Context);
} }
switch_context(self, _target); switch_context(self as *mut Context, target as *mut Context);
} }
/// Constructs a null Context for the current running thread. /// Constructs a null Context for the current running thread.

@ -25,7 +25,7 @@ pub fn fp() -> usize {
#[cfg(any(target_arch = "mips"))] #[cfg(any(target_arch = "mips"))]
unsafe { unsafe {
// fp = $30 // fp = $30
asm!("ori $0, $$$30, 0" : "=r"(ptr)); asm!("ori $0, $$30, 0" : "=r"(ptr));
} }
ptr ptr
@ -51,7 +51,7 @@ pub fn lr() -> usize {
#[cfg(target_arch = "mips")] #[cfg(target_arch = "mips")]
unsafe { unsafe {
asm!("ori $0, $$$31, 0" : "=r"(ptr)); asm!("ori $0, $$31, 0" : "=r"(ptr));
} }
ptr ptr

Loading…
Cancel
Save