github.com/mikpe.pdp10-tools
1
0
Fork 0
mirror of https://github.com/mikpe/pdp10-tools.git synced 2026-03-10 04:44:31 +00:00
Code Issues Projects Releases Wiki Activity

elf2boot: correct p_offset/p_vaddr alignment check

Browse Source
This commit is contained in:
Mikael Pettersson
2025-10-05 16:43:05 +02:00
parent 501d13d63d
commit 0cc02e669e
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
erlang/apps/elf2boot/src/elf2boot.erl
View File

@@ -503,13 +503,14 @@ frag(EC, Ehdr, Phdr) ->
, p_filesz = FileSz
, p_memsz = MemSz
, p_flags = Flags
, p_align = Align
} ->
Log2NrBytesPerWord = log2_nr_bytes_per_word(EC),
Wordsize = 1 bsl Log2NrBytesPerWord,
Log2NrWordsPerPage = 9,
Pagesize = Wordsize bsl Log2NrWordsPerPage,
case ((Offset band (Pagesize - 1)) =:= 0 andalso
(VAddr band (Pagesize - 1)) =:= 0 andalso
case (check_alignment(Offset, VAddr, Pagesize - 1) andalso
check_p_align(Offset, VAddr, Align) andalso
MemSz >= FileSz andalso
no_excess_flags(Flags)) of
true ->
@@ -523,6 +524,17 @@ frag(EC, Ehdr, Phdr) ->
_ -> error
end.
check_p_align(Offset, VAddr, PAlign) ->
case PAlign of
0 -> true;
1 -> true;
_ when (PAlign band (PAlign - 1)) =:= 0 -> check_alignment(Offset, VAddr, PAlign - 1);
_ -> false
end.
check_alignment(Offset, VAddr, Mask) ->
(Offset band Mask) =:= (VAddr band Mask).
no_excess_flags(Flags) ->
(Flags band 8#7) =:= Flags.