about summary refs log tree commit diff stats
path: root/html/subx/034compute_segment_address.cc.html
diff options
context:
space:
mode:
authorKartik Agaram <vc@akkartik.com>2019-07-25 00:08:23 -0700
committerKartik Agaram <vc@akkartik.com>2019-07-25 00:10:56 -0700
commit695f9bf8d0a7d0a871b8ab75270ceb29715d9be3 (patch)
tree358d7fda9f7eb1714d9a7f0e0838be2bd64d336f /html/subx/034compute_segment_address.cc.html
parent51a20da6b30f4afe0405d13bf862b5d72ccefa6d (diff)
downloadmu-695f9bf8d0a7d0a871b8ab75270ceb29715d9be3.tar.gz
5468
Diffstat (limited to 'html/subx/034compute_segment_address.cc.html')
-rw-r--r--html/subx/034compute_segment_address.cc.html6
1 files changed, 3 insertions, 3 deletions
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) {
 <span id="L12" class="LineNr">12 </span>      <span class="Constant">&quot;05/add-to-EAX  0x0d0c0b0a/imm32\n&quot;</span>
 <span id="L13" class="LineNr">13 </span>      <span class="Comment">// code starts at 0x09000000 + p_offset, which is 0x54 for a single-segment binary</span>
 <span id="L14" class="LineNr">14 </span>  <span class="Delimiter">);</span>
-<span id="L15" class="LineNr">15 </span>  <a href='003trace.cc.html#L281'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L15" class="LineNr">15 </span>  <a href='003trace.cc.html#L290'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
 <span id="L16" class="LineNr">16 </span>      <span class="Constant">&quot;load: 0x09000054 -&gt; 05\n&quot;</span>
 <span id="L17" class="LineNr">17 </span>      <span class="Constant">&quot;load: 0x09000055 -&gt; 0a\n&quot;</span>
 <span id="L18" class="LineNr">18 </span>      <span class="Constant">&quot;load: 0x09000056 -&gt; 0b\n&quot;</span>
@@ -95,8 +95,8 @@ if ('onhashchange' in window) {
 <span id="L37" class="LineNr">37 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>start &gt;= <span class="Constant">0x08000000</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L38" class="LineNr">38 </span>      <span class="Comment">// valid address for user space, so assume we're creating a real ELF binary, not just running a test</span>
 <span id="L39" class="LineNr">39 </span>      curr<span class="Delimiter">.</span>start &amp;= <span class="Constant">0xfffff000</span><span class="Delimiter">;</span>  <span class="Comment">// same number of zeros as the p_align used when emitting the ELF binary</span>
-<span id="L40" class="LineNr">40 </span>      curr<span class="Delimiter">.</span>start |= p_offset<span class="Delimiter">;</span>
-<span id="L41" class="LineNr">41 </span>      <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;segment &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot; begins at address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L408'>HEXWORD</a> &lt;&lt; curr<span class="Delimiter">.</span>start &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L40" class="LineNr">40 </span>      curr<span class="Delimiter">.</span>start |= <span class="Delimiter">(</span>p_offset &amp; <span class="Constant">0xfff</span><span class="Delimiter">);</span>
+<span id="L41" class="LineNr">41 </span>      <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;segment &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot; begins at address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L409'>HEXWORD</a> &lt;&lt; curr<span class="Delimiter">.</span>start &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L42" class="LineNr">42 </span>    <span class="Delimiter">}</span>
 <span id="L43" class="LineNr">43 </span>    p_offset += size_of<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
 <span id="L44" class="LineNr">44 </span>    assert<span class="Delimiter">(</span>p_offset &lt; <a href='010---vm.cc.html#L92'>SEGMENT_ALIGNMENT</a><span class="Delimiter">);</span>  <span class="Comment">// for now we get less and less available space in each successive segment</span>