about summary refs log tree commit diff stats
path: root/subx/034compute_segment_address.cc
diff options
context:
space:
mode:
authorKartik Agaram <vc@akkartik.com>2019-07-22 20:04:14 -0700
committerKartik Agaram <vc@akkartik.com>2019-07-22 20:04:14 -0700
commit4e8f5fa43b16a5fb267dc41231e28d9497157639 (patch)
treedc520332d77a7042b42ff0af8073bea79c77fe98 /subx/034compute_segment_address.cc
parentc4ccc215cf213cf134d34bebee334b9a32a75967 (diff)
downloadmu-4e8f5fa43b16a5fb267dc41231e28d9497157639.tar.gz
5454
Bugfix fifteen -- on the C++ side.
Diffstat (limited to 'subx/034compute_segment_address.cc')
-rw-r--r--subx/034compute_segment_address.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/subx/034compute_segment_address.cc b/subx/034compute_segment_address.cc
index 9eb1615d..61c3739a 100644
--- a/subx/034compute_segment_address.cc
+++ b/subx/034compute_segment_address.cc
@@ -37,7 +37,7 @@ void compute_segment_starts(program& p) {
     if (curr.start >= 0x08000000) {
       // valid address for user space, so assume we're creating a real ELF binary, not just running a test
       curr.start &= 0xfffff000;  // same number of zeros as the p_align used when emitting the ELF binary
-      curr.start |= p_offset;
+      curr.start |= (p_offset & 0xfff);
       trace(99, "transform") << "segment " << i << " begins at address 0x" << HEXWORD << curr.start << end();
     }
     p_offset += size_of(curr);