Skip to content

Commit

Permalink
Merge probe-rs#206
Browse files Browse the repository at this point in the history
206: fix unwinding exceptions that push FPU registers onto the stack r=jonas-schievink a=japaric

the correct value of constant EXC_RETURN_MARKER is 0xFFFF_FFE0 but the value was typo-ed in the
refactor part of PR probe-rs#163 probe-rs#203 

knurling-rs/probe-run@226c693#diff-42cb6807ad74b3e201c5a7ca98b911c5fa08380e942be6e4ac5807f8377f87fcL755

Co-authored-by: Jorge Aparicio <jorge.aparicio@ferrous-systems.com>
  • Loading branch information
bors[bot] and japaric committed May 18, 2021
2 parents 0cea117 + cb42786 commit 0d8464f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/cortexm.rs
Expand Up @@ -5,7 +5,7 @@ use std::{mem, ops::Range};
use crate::VectorTable;

pub(crate) const ADDRESS_SIZE: u8 = mem::size_of::<u32>() as u8;
pub(crate) const EXC_RETURN_MARKER: u32 = 0xFFFF_FFF0;
pub(crate) const EXC_RETURN_MARKER: u32 = 0xFFFF_FFE0;
const THUMB_BIT: u32 = 1;
// According to the ARM Cortex-M Reference Manual RAM memory must be located in this address range
// (vendors still place e.g. Core-Coupled RAM outside this address range)
Expand Down

0 comments on commit 0d8464f

Please sign in to comment.