language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-26 21:39:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

changes after review

Browse source
This commit is contained in:
Folkert 2022-10-16 13:26:48 +02:00
parent 73e48c9b7c
commit a063bfcd30
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/linker/src/pe.rs
View file

@ -1151,12 +1151,14 @@ fn write_image_base_relocation(
next_block_start += header.size_of_block.get(LE);
}
// extra space that we'll use for the new relocations
let shift_amount = relocations.len() * 2;
// this is 8 in practice
const HEADER_WIDTH: usize = std::mem::size_of::<ImageBaseRelocation>();
const ENTRY_WIDTH: usize = std::mem::size_of::<u16>();
// extra space that we'll use for the new relocations
let shift_amount = relocations.len() * ENTRY_WIDTH;
let mut found_block = false;
// now, starting from the back, shift sections that need to be shifted and add the
@ -1182,7 +1184,7 @@ fn write_image_base_relocation(
let new_size = header.size_of_block.get(LE) + shift_amount as u32;
header.size_of_block.set(LE, new_size);
let number_of_entries = (new_size as usize - HEADER_WIDTH) / 2;
let number_of_entries = (new_size as usize - HEADER_WIDTH) / ENTRY_WIDTH;
let entries = load_structs_inplace_mut::<u16>(
mmap,
block_start + HEADER_WIDTH,
@ -1197,14 +1199,14 @@ fn write_image_base_relocation(
found_block = true;
}
std::cmp::Ordering::Less => {
if !found_block {
if found_block {
break;
} else {
// we don't currently implement adding a new block if the block does not
// already exist. Adding that logic is not hard, but let's see if we can get
// away with not having it.
internal_error!("the .rdata section with our dummy .dll info is not covered by a relocation block");
}
break;
}
}
}