From 695f9bf8d0a7d0a871b8ab75270ceb29715d9be3 Mon Sep 17 00:00:00 2001 From: Kartik Agaram Date: Thu, 25 Jul 2019 00:08:23 -0700 Subject: 5468 --- html/subx/034compute_segment_address.cc.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'html/subx/034compute_segment_address.cc.html') diff --git a/html/subx/034compute_segment_address.cc.html b/html/subx/034compute_segment_address.cc.html index 06225394..f761044d 100644 --- a/html/subx/034compute_segment_address.cc.html +++ b/html/subx/034compute_segment_address.cc.html @@ -70,7 +70,7 @@ if ('onhashchange' in window) { 12 "05/add-to-EAX 0x0d0c0b0a/imm32\n" 13 // code starts at 0x09000000 + p_offset, which is 0x54 for a single-segment binary 14 ); -15 CHECK_TRACE_CONTENTS( +15 CHECK_TRACE_CONTENTS( 16 "load: 0x09000054 -> 05\n" 17 "load: 0x09000055 -> 0a\n" 18 "load: 0x09000056 -> 0b\n" @@ -95,8 +95,8 @@ if ('onhashchange' in window) { 37 if (curr.start >= 0x08000000) { 38 // valid address for user space, so assume we're creating a real ELF binary, not just running a test 39 curr.start &= 0xfffff000; // same number of zeros as the p_align used when emitting the ELF binary -40 curr.start |= p_offset; -41 trace(99, "transform") << "segment " << i << " begins at address 0x" << HEXWORD << curr.start << end(); +40 curr.start |= (p_offset & 0xfff); +41 trace(99, "transform") << "segment " << i << " begins at address 0x" << HEXWORD << curr.start << end(); 42 } 43 p_offset += size_of(curr); 44 assert(p_offset < SEGMENT_ALIGNMENT); // for now we get less and less available space in each successive segment -- cgit 1.4.1-2-gfad0