diff options
| -rw-r--r-- | html/subx/010---vm.cc.html | 2 | ||||
| -rw-r--r-- | html/subx/012elf.cc.html | 2 | ||||
| -rw-r--r-- | subx/010---vm.cc | 2 | ||||
| -rw-r--r-- | subx/012elf.cc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/html/subx/010---vm.cc.html b/html/subx/010---vm.cc.html index 1d5ce504..0be40175 100644 --- a/html/subx/010---vm.cc.html +++ b/html/subx/010---vm.cc.html @@ -173,7 +173,7 @@ if ('onhashchange' in window) { <span id="L112" class="LineNr">112 </span><span class="SalientComment">//:: simulated RAM</span> <span id="L113" class="LineNr">113 </span> <span id="L114" class="LineNr">114 </span><span class="Delimiter">:(before "End Types")</span> -<span id="L115" class="LineNr">115 </span><span class="Normal">const</span> <span class="Normal">uint32_t</span> <a href='010---vm.cc.html#L115'>SEGMENT_ALIGNMENT</a> = <span class="Constant">0x1000000</span><span class="Delimiter">;</span> +<span id="L115" class="LineNr">115 </span><span class="Normal">const</span> <span class="Normal">uint32_t</span> <a href='010---vm.cc.html#L115'>SEGMENT_ALIGNMENT</a> = <span class="Constant">0x1000000</span><span class="Delimiter">;</span> <span class="Comment">// 16MB</span> <span id="L116" class="LineNr">116 </span><span class="Normal">inline</span> <span class="Normal">uint32_t</span> <a href='010---vm.cc.html#L116'>align_upwards</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> x<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> align<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L117" class="LineNr">117 </span> <span class="Identifier">return</span> <span class="Delimiter">(</span>x+align-<span class="Constant">1</span><span class="Delimiter">)</span> & -<span class="Delimiter">(</span>align<span class="Delimiter">);</span> <span id="L118" class="LineNr">118 </span><span class="Delimiter">}</span> diff --git a/html/subx/012elf.cc.html b/html/subx/012elf.cc.html index e38c23ba..7bc7680f 100644 --- a/html/subx/012elf.cc.html +++ b/html/subx/012elf.cc.html @@ -187,7 +187,7 @@ if ('onhashchange' in window) { <span id="L128" class="LineNr">128 </span><span class="Delimiter">}</span> <span id="L129" class="LineNr">129 </span> <span id="L130" class="LineNr">130 </span><span class="Delimiter">:(before "End Includes")</span> -<span id="L131" class="LineNr">131 </span><span class="Comment">// Very primitive/fixed/insecure ELF segments for now.</span> +<span id="L131" class="LineNr">131 </span><span class="Comment">// Very primitive/fixed/insecure ELF segments for now: just consecutive VMAs.</span> <span id="L132" class="LineNr">132 </span><span class="Comment">// code: 0x09000000 -> 0x09ffffff</span> <span id="L133" class="LineNr">133 </span><span class="Comment">// data/heap: 0x0a000000 -> 0x0affffff</span> <span id="L134" class="LineNr">134 </span><span class="Comment">// stack: 0x0b000ffc -> 0x0b000000 (downward)</span> diff --git a/subx/010---vm.cc b/subx/010---vm.cc index 7e5b8d79..3744d721 100644 --- a/subx/010---vm.cc +++ b/subx/010---vm.cc @@ -112,7 +112,7 @@ SF = ZF = OF = false; //:: simulated RAM :(before "End Types") -const uint32_t SEGMENT_ALIGNMENT = 0x1000000; +const uint32_t SEGMENT_ALIGNMENT = 0x1000000; // 16MB inline uint32_t align_upwards(uint32_t x, uint32_t align) { return (x+align-1) & -(align); } diff --git a/subx/012elf.cc b/subx/012elf.cc index 21019d18..47aba102 100644 --- a/subx/012elf.cc +++ b/subx/012elf.cc @@ -128,7 +128,7 @@ void load_segment_from_program_header(uint8_t* elf_contents, int segment_index, } :(before "End Includes") -// Very primitive/fixed/insecure ELF segments for now. +// Very primitive/fixed/insecure ELF segments for now: just consecutive VMAs. // code: 0x09000000 -> 0x09ffffff // data/heap: 0x0a000000 -> 0x0affffff // stack: 0x0b000ffc -> 0x0b000000 (downward) |