From 6e887d55053e040226e9b11786e72617e828623f Mon Sep 17 00:00:00 2001
From: Jiajie Chen <jiegec@qq.com>
Date: Tue, 8 Jan 2019 19:08:17 +0800
Subject: [PATCH] Replace hardcoded instruction length with size_of in
 backtrace

---
 kernel/src/backtrace.rs | 4 +++-
 kernel/src/lib.rs       | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/kernel/src/backtrace.rs b/kernel/src/backtrace.rs
index 1c6f865..0c45cc7 100644
--- a/kernel/src/backtrace.rs
+++ b/kernel/src/backtrace.rs
@@ -1,3 +1,5 @@
+use core::intrinsics::size_of;
+
 extern "C" {
     fn stext();
     fn etext();
@@ -45,7 +47,7 @@ pub fn backtrace() {
         let mut current_fp = fp();
         let mut stack_num = 0;
         while current_pc >= stext as usize && current_pc <= etext as usize && current_fp as usize != 0 {
-            println!("#{} {:#018X} fp {:#018X}", stack_num, current_pc - 4, current_fp);
+            println!("#{} {:#018X} fp {:#018X}", stack_num, current_pc - size_of::<usize>(), current_fp);
             stack_num = stack_num + 1;
             #[cfg(any(target_arch = "riscv32", target_arch = "riscv64"))]
             {
diff --git a/kernel/src/lib.rs b/kernel/src/lib.rs
index 29e5ce0..d059360 100644
--- a/kernel/src/lib.rs
+++ b/kernel/src/lib.rs
@@ -6,6 +6,7 @@
 #![feature(optin_builtin_traits)]
 #![feature(panic_info_message)]
 #![feature(global_asm)]
+#![feature(core_intrinsics)]
 #![no_std]
 
 // just keep it ...