Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add FrameDescriptionEntry::{initial_address, len} methods #237

Merged
merged 1 commit into from
Aug 18, 2017
Merged

Add FrameDescriptionEntry::{initial_address, len} methods #237

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 24 additions & 10 deletions src/cfi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1215,11 +1215,25 @@ where
}
}

/// The first address for which this entry has unwind information for.
pub fn initial_address(&self) -> u64 {
self.initial_address
}

/// The number of bytes of instructions that this entry has unwind
/// information for.
pub fn len(&self) -> u64 {
self.address_range
}

/// Return `true` if the given address is within this FDE, `false`
/// otherwise.
///
/// This is equivalent to `entry.initial_address() <= address <
/// entry.initial_address() + entry.len()`.
pub fn contains(&self, address: u64) -> bool {
let start = self.initial_address;
let end = start + self.address_range;
let start = self.initial_address();
let end = start + self.len();
start <= address && address < end
}

Expand Down Expand Up @@ -1632,7 +1646,7 @@ where
fde: Option<&'fde FrameDescriptionEntry<Section, R, R::Offset>>,
) -> UnwindTable<'cie, 'fde, 'ctx, Section, R> {
assert!(ctx.stack.len() >= 1);
let next_start_address = fde.map_or(0, |fde| fde.initial_address);
let next_start_address = fde.map_or(0, |fde| fde.initial_address());
let instructions = fde.map_or_else(|| cie.instructions(), |fde| fde.instructions());
UnwindTable {
ctx: ctx,
Expand Down Expand Up @@ -1664,7 +1678,7 @@ where

let row = self.ctx.row_mut();
row.end_address = if let Some(fde) = self.fde {
fde.initial_address + fde.address_range
fde.initial_address() + fde.len()
} else {
0
};
Expand Down Expand Up @@ -2862,11 +2876,11 @@ mod tests {

let section = match fde.cie.address_size {
4 => section
.e32(endian, fde.initial_address as u32)
.e32(endian, fde.address_range as u32),
.e32(endian, fde.initial_address() as u32)
.e32(endian, fde.len() as u32),
8 => section
.e64(endian, fde.initial_address)
.e64(endian, fde.address_range),
.e64(endian, fde.initial_address())
.e64(endian, fde.len()),
x => panic!("Unsupported address size: {}", x),
};

Expand Down Expand Up @@ -4876,8 +4890,8 @@ mod tests {
assert_eq!(
unwind_info,
UnwindTableRow {
start_address: fde1.initial_address + 100,
end_address: fde1.initial_address + fde1.address_range,
start_address: fde1.initial_address() + 100,
end_address: fde1.initial_address() + fde1.len(),
cfa: CfaRule::RegisterAndOffset {
register: 4,
offset: -12,
Expand Down