diff options
| author | Kartik Agaram <vc@akkartik.com> | 2019-07-11 22:27:01 -0700 |
|---|---|---|
| committer | Kartik Agaram <vc@akkartik.com> | 2019-07-11 22:27:01 -0700 |
| commit | 7fed7232c47408efe5c3e1b913035e415343c66c (patch) | |
| tree | 15df9a6a11d5cd0356b516bcd4670bea1e1d7cd8 /subx | |
| parent | 2c45de094b4851c3cabed4ab6a1c916d41a22e8a (diff) | |
| download | mu-7fed7232c47408efe5c3e1b913035e415343c66c.tar.gz | |
.
Diffstat (limited to 'subx')
| -rw-r--r-- | subx/apps/survey.subx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/subx/apps/survey.subx b/subx/apps/survey.subx index 5ae984d1..c13f7f61 100644 --- a/subx/apps/survey.subx +++ b/subx/apps/survey.subx @@ -332,7 +332,7 @@ compute-offsets:word-slice: 0/imm32/start compute-offsets:word-slice:end: 0/imm32/end -compute-offsets:segment-start: # slice +compute-offsets:segment-tmp: # slice 0/imm32/start 0/imm32/end @@ -367,11 +367,11 @@ compute-offsets: # in : (address buffered-file), segments : (address stream {st # curr-segment-name = next-word(line) # if slice-empty?(curr-segment-name) # abort - # segment-start = next-word(line) - # if slice-empty?(segment-start) + # segment-tmp = next-word(line) + # if slice-empty?(segment-tmp) # abort # seg = get-or-insert-slice(segments, curr-segment-name) - # seg->starting-address = parse-hex-int(segment-start) + # seg->starting-address = parse-hex-int(segment-tmp) # seg->file-offset = *file-offset # trace("segment '", curr-segment-name, "' is at file offset ", seg->file-offset) # segment-offset = 0 @@ -695,15 +695,15 @@ $compute-offsets:construct-next-segment: # . if (EAX != 0) abort 3d/compare-EAX-and 0/imm32 0f 85/jump-if-not-equal $compute-offsets:abort/disp32 - # next-word(line/ECX, segment-start) - 68/push compute-offsets:segment-start/imm32 + # next-word(line/ECX, segment-tmp) + 68/push compute-offsets:segment-tmp/imm32 51/push-ECX e8/call next-word/disp32 # . discard args 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP - # if slice-empty?(segment-start) abort - # . EAX = slice-empty?(segment-start) - 68/push compute-offsets:segment-start/imm32 + # if slice-empty?(segment-tmp) abort + # . EAX = slice-empty?(segment-tmp) + 68/push compute-offsets:segment-tmp/imm32 e8/call slice-empty?/disp32 # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 4/imm32 # add to ESP @@ -721,9 +721,9 @@ $compute-offsets:construct-next-segment: 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 0xc/imm32 # add to ESP # . EBX = EAX 89/copy 3/mod/direct 3/rm32/EBX . . . 0/r32/EAX . . # copy EAX to EBX - # seg->address = parse-hex-int(segment-start) - # . EAX = parse-hex-int(segment-start) - 68/push compute-offsets:segment-start/imm32 + # seg->address = parse-hex-int(segment-tmp) + # . EAX = parse-hex-int(segment-tmp) + 68/push compute-offsets:segment-tmp/imm32 e8/call parse-hex-int/disp32 # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 4/imm32 # add to ESP |