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

Update ABI user

Browse Source
This commit is contained in:
Gary Guo 2023-08-06 14:30:50 +01:00
parent de5dd40a4f
commit a421b6d55c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/panicking.rs
View File

@ -21,7 +21,7 @@ pub fn begin_panic<E: Exception>(exception: E) -> UnwindReasonCode {
unsafe { unsafe {
(*ex).exception_class = u64::from_be_bytes(E::CLASS); (*ex).exception_class = u64::from_be_bytes(E::CLASS);
(*ex).exception_cleanup = Some(exception_cleanup::<E>); (*ex).exception_cleanup = Some(exception_cleanup::<E>);
_Unwind_RaiseException(&mut *ex) _Unwind_RaiseException(ex)
} }
} }

6
src/personality.rs
View File

@ -136,11 +136,11 @@ fn find_eh_action(
} }
#[lang = "eh_personality"] #[lang = "eh_personality"]
fn rust_eh_personality( unsafe fn rust_eh_personality(
version: c_int, version: c_int,
actions: UnwindAction, actions: UnwindAction,
_exception_class: u64, _exception_class: u64,
exception: &mut UnwindException, exception: *mut UnwindException,
unwind_ctx: &mut UnwindContext<'_>, unwind_ctx: &mut UnwindContext<'_>,
) -> UnwindReasonCode { ) -> UnwindReasonCode {
if version != 1 { if version != 1 {
@ -170,7 +170,7 @@ fn rust_eh_personality(
_Unwind_SetGR( _Unwind_SetGR(
unwind_ctx, unwind_ctx,
Arch::UNWIND_DATA_REG.0 .0 as _, Arch::UNWIND_DATA_REG.0 .0 as _,
exception as *mut _ as usize, exception as usize,
); );
_Unwind_SetGR(unwind_ctx, Arch::UNWIND_DATA_REG.1 .0 as _, 0); _Unwind_SetGR(unwind_ctx, Arch::UNWIND_DATA_REG.1 .0 as _, 0);
_Unwind_SetIP(unwind_ctx, lpad); _Unwind_SetIP(unwind_ctx, lpad);

4
src/personality_dummy.rs
View File

@ -2,11 +2,11 @@ use crate::abi::*;
use crate::util::*; use crate::util::*;
#[lang = "eh_personality"] #[lang = "eh_personality"]
extern "C" fn personality( unsafe extern "C" fn personality(
version: c_int, version: c_int,
_actions: UnwindAction, _actions: UnwindAction,
_exception_class: u64, _exception_class: u64,
_exception: &mut UnwindException, _exception: *mut UnwindException,
_ctx: &mut UnwindContext<'_>, _ctx: &mut UnwindContext<'_>,
) -> UnwindReasonCode { ) -> UnwindReasonCode {
if version != 1 { if version != 1 {