Skip to content

Version 3 #2

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

Merged
merged 2 commits into from
Jun 17, 2022
Merged

Version 3 #2

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c75a22f
Fix align when aligned bug
markdryan Jun 17, 2022
5841029
Version 3
markdryan Jun 17, 2022
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
Next Next commit
Fix align when aligned bug 
There was a bug in the linker which caused it to incorrectly
compute the address of labels preceeded by an align directive
that was already aligned, e.g., align 8 on 0x8000, was not
working correctly.  The bug is fixed and a test case has been
added.

Signed-off-by: Mark Ryan <[email protected]>
  • Loading branch information
@markdryan
markdryan committed Jun 17, 2022
commit c75a22f32b5f03c5a9e8cd02acf51b3bb01159ca
3 changes: 2 additions & 1 deletion src/salink.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,8 @@ static void prv_complete_absolutes_e(void)
align = 1 << label->id;
mask = align - 1;
adjust = (real_off + label->off) & mask;
real_off += align - adjust;
if (adjust > 0)
real_off += align - adjust;
continue;
}
if (label->off > 0xffff - real_off) {
Expand Down
9 changes: 9 additions & 0 deletions tests/test_align_aligned/align_aligned.s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.Main
align 8
ld hl, l1
.l1
nop
ld hl, l2
align 8
.l2
ret
21 changes: 21 additions & 0 deletions tests/test_align_aligned/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#!/bin/bash

set -e
rm align_aligned 2>/dev/null 1>&2 || true
rm *.x 2>/dev/null 1>&2 || true

../../saimport *.s
../../salink 2>/dev/null 1>&2
offset=`od -An -j1 -t x1 -N2 align_aligned | xargs`
if [ "$offset" != "03 80" ]; then
exit 1
fi

offset=`od -An -j5 -t x1 -N2 align_aligned | xargs`
if [ "$offset" != "08 80" ]; then
exit 1
fi

rm align_aligned
rm *.x