diff options
| author | Kartik Agaram <vc@akkartik.com> | 2019-11-18 12:50:01 -0800 |
|---|---|---|
| committer | Kartik Agaram <vc@akkartik.com> | 2019-11-18 12:50:01 -0800 |
| commit | 6488bfcf851023e1b8e84be6ebbb793f895f3d0f (patch) | |
| tree | 6e279f6850a7f9c0ccf77c1d6549892c8d5fffb9 /apps/assort.subx | |
| parent | 442fdabe305fa35bf1649a072b9a7b3b87cd50e9 (diff) | |
| download | mu-6488bfcf851023e1b8e84be6ebbb793f895f3d0f.tar.gz | |
5753
Binaries are now identical again. There's a little hack here that we should clean up at some point. But it requires more thought. Ordering compiler phases is hard. So far we're only at the start of the slippery slope into that abyss.
Diffstat (limited to 'apps/assort.subx')
| -rw-r--r-- | apps/assort.subx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/assort.subx b/apps/assort.subx index e78cde41..c3a98a87 100644 --- a/apps/assort.subx +++ b/apps/assort.subx @@ -459,13 +459,13 @@ read-segments: # in : (address buffered-file), table : (address stream {string, # clear-stream(line) # read-line-buffered(in, line) # if (line->write == 0) break # end of file - # var word-slice = next-word(line) + # var word-slice = next-word-or-string(line) # if slice-empty?(word-slice) # whitespace # continue # if slice-starts-with?(word-slice, "#") # comment # continue # if slice-equal?(word-slice, "==") - # var segment-name = next-word(line) + # var segment-name = next-word-or-string(line) # segment-slot = leaky-get-or-insert-slice(table, segment-name, row-size=8) # curr-segment = *segment-slot # if curr-segment != 0 @@ -557,12 +557,12 @@ $read-segments:check0: #? # . . discard args #? 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 8/imm32 # add to esp #? # }}} - # next-word(line, word-slice) + # next-word-or-string(line, word-slice) # . . push args 52/push-edx 51/push-ecx # . . call - e8/call next-word/disp32 + e8/call next-word-or-string/disp32 # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 8/imm32 # add to esp $read-segments:check1: @@ -667,12 +667,12 @@ $read-segments:check-for-segment-header: # . if (eax == 0) goto check3 3d/compare-eax-and 0/imm32 0f 84/jump-if-equal $read-segments:regular-line/disp32 - # segment-name = next-word(line) + # segment-name = next-word-or-string(line) # . . push args 52/push-edx 51/push-ecx # . . call - e8/call next-word/disp32 + e8/call next-word-or-string/disp32 # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 8/imm32 # add to esp #? # dump segment name {{{ |