mikros/unwinding
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove fp from RISC-V context if d is not enabled

Browse Source
This commit is contained in:
Gary Guo 2021-08-26 22:39:07 +01:00
parent 2988ed52fb
commit 0bb383ea30
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/unwinder/arch/riscv64.rs
View File

@ -6,6 +6,7 @@ use gimli::{Register, RiscV};
#[derive(Clone, Default)]
pub struct Context {
pub gp: [usize; 32],
#[cfg(target_feature = "d")]
pub fp: [usize; 32],
}
@ -15,6 +16,7 @@ impl fmt::Debug for Context {
for i in 0..=31 {
fmt.field(RiscV::register_name(Register(i as _)).unwrap(), &self.gp[i]);
}
#[cfg(target_feature = "d")]
for i in 0..=31 {
fmt.field(
RiscV::register_name(Register((i + 32) as _)).unwrap(),
@ -31,6 +33,7 @@ impl ops::Index<Register> for Context {
fn index(&self, reg: Register) -> &usize {
match reg {
Register(0..=31) => &self.gp[reg.0 as usize],
#[cfg(target_feature = "d")]
Register(32..=63) => &self.fp[(reg.0 - 32) as usize],
_ => unimplemented!(),
}
@ -41,6 +44,7 @@ impl ops::IndexMut<gimli::Register> for Context {
fn index_mut(&mut self, reg: Register) -> &mut usize {
match reg {
Register(0..=31) => &mut self.gp[reg.0 as usize],
#[cfg(target_feature = "d")]
Register(32..=63) => &mut self.fp[(reg.0 - 32) as usize],
_ => unimplemented!(),
}
@ -169,10 +173,7 @@ pub extern "C-unwind" fn save_context() -> Context {
}
#[cfg(not(target_feature = "d"))]
unsafe {
asm!(
concat!(code!(save_gp), "ret"),
options(noreturn)
);
asm!(concat!(code!(save_gp), "ret"), options(noreturn));
}
}