diff options
Diffstat (limited to 'apps/survey_baremetal.subx')
| -rw-r--r-- | apps/survey_baremetal.subx | 181 |
1 files changed, 23 insertions, 158 deletions
diff --git a/apps/survey_baremetal.subx b/apps/survey_baremetal.subx index d07fdb76..c33e0f82 100644 --- a/apps/survey_baremetal.subx +++ b/apps/survey_baremetal.subx @@ -380,7 +380,7 @@ test-subx-survey-computes-addresses: 5d/pop-to-ebp c3/return -# global scratch space for compute-offsets +# global scratch space for compute-offsets in the data segment == data compute-offsets:file-offset: # int @@ -1813,26 +1813,15 @@ $emit-output:end: 5d/pop-to-ebp c3/return -# global scratch space for emit-segments -== data - -emit-segments:datum: # slice - 0/imm32/start - 0/imm32/end - -== code - emit-segments: # in: (addr stream byte), out: (addr buffered-file), labels: (addr stream {(handle array byte), label-info}) # pseudocode: # var offset-of-next-instruction = 0 # var line: (stream byte 512) - # var contains-modrm?: boolean # line-loop: # while true # clear-stream(line) # read-line(in, line) # if (line->write == 0) break # end of file - # contains-modrm? = false # offset-of-next-instruction += num-bytes(line) # while true # var word-slice = next-word(line) @@ -1840,17 +1829,6 @@ emit-segments: # in: (addr stream byte), out: (addr buffered-file), labels: (ad # break # if slice-starts-with?(word-slice, "#") # comment # break - # if slice-equal?(word-slice, "==") # segment header lines - # break - # if has-metadata?(word-slice, "mod") - # contains-modrm? = true - # rewind-stream(line) - # while true - # var word-slice = next-word(line) - # if slice-empty?(word-slice) # end of line - # break - # if slice-starts-with?(word-slice, "#") # comment - # break # if is-label?(word-slice) # no need for label declarations anymore # goto line-loop # don't insert empty lines # if slice-equal?(word-slice, "==") # no need for segment header lines @@ -1861,21 +1839,23 @@ emit-segments: # in: (addr stream byte), out: (addr buffered-file), labels: (ad # continue # var datum: (addr slice) = next-token-from-slice(word-slice->start, word-slice->end, "/") # var info: (addr label-info) = get-slice(labels, datum) - # if has-metadata?(word-slice, "imm8") - # emit(out, info->address, 1) + # var curr-segment-name: (addr array byte) = lookup(info->segment-name) + # if !string-equal?(info->segment-name, "code") + # if has-metadata?(word-slice, "disp8") + # abort + # if has-metadata?(word-slice, "imm8") + # abort + # emit(out, info->address, 4) # global variables always translate to absolute addresses + # # code segment cases + # else if has-metadata?(word-slice, "imm8") + # abort # label should never go to imm8 # else if has-metadata?(word-slice, "imm32") # emit(out, info->address, 4) # else if has-metadata?(word-slice, "disp8") - # if contains-modrm? - # value = info->offset - # else - # value = info->offset - offset-of-next-instruction + # value = info->offset - offset-of-next-instruction # emit(out, value, 1) # else if has-metadata?(word-slice, "disp32") - # if contains-modrm? - # value = info->offset - # else - # value = info->offset - offset-of-next-instruction + # value = info->offset - offset-of-next-instruction # emit(out, value, 4) # else # abort @@ -1885,7 +1865,7 @@ emit-segments: # in: (addr stream byte), out: (addr buffered-file), labels: (ad # line: ecx # word-slice: edx # offset-of-next-instruction: ebx - # contains-modrm?: edi + # datum: edi # info: esi (inner loop only) # temporaries: eax, esi (outer loop) # @@ -1909,6 +1889,10 @@ emit-segments: # in: (addr stream byte), out: (addr buffered-file), labels: (ad 68/push 0/imm32/end 68/push 0/imm32/start 89/copy 3/mod/direct 2/rm32/edx . . . 4/r32/esp . . # copy esp to edx + # var datum/edi: slice + 68/push 0/imm32/end + 68/push 0/imm32/start + 89/copy 3/mod/direct 7/rm32/edi . . . 4/r32/esp . . # copy esp to edi # offset-of-next-instruction/ebx = 0 31/xor 3/mod/direct 3/rm32/ebx . . . 3/r32/ebx . . # clear ebx $emit-segments:line-loop: @@ -1974,125 +1958,6 @@ $emit-segments:check-for-end-of-input: 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 4/imm32 # add to esp # . ebx += eax 01/add 3/mod/direct 3/rm32/ebx . . . 0/r32/eax . . # add eax to ebx - # emit-modrm? = false - bf/copy-to-edi 0/imm32/false -$emit-segments:word-loop1-search-line-for-modrm: - # next-word(line, word-slice) - # . . push args - 52/push-edx - 51/push-ecx - # . . call - e8/call next-word/disp32 - # . . discard args - 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 8/imm32 # add to esp -#? # dump word-slice {{{ -#? # . write(2/stderr, "w: ") -#? # . . push args -#? 68/push "w: "/imm32 -#? 68/push 2/imm32/stderr -#? # . . call -#? e8/call write/disp32 -#? # . . discard args -#? 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 8/imm32 # add to esp -#? # . write-slice-buffered(Stderr, word-slice) -#? # . . push args -#? 52/push-edx -#? 68/push Stderr/imm32 -#? # . . call -#? e8/call write-slice-buffered/disp32 -#? # . . discard args -#? 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 8/imm32 # add to esp -#? # . flush(Stderr) -#? # . . push args -#? 68/push Stderr/imm32 -#? # . . call -#? e8/call flush/disp32 -#? # . . discard args -#? 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 4/imm32 # add to esp -#? # . write(2/stderr, "$\n") -#? # . . push args -#? 68/push "$\n"/imm32 -#? 68/push 2/imm32/stderr -#? # . . call -#? e8/call write/disp32 -#? # . . discard args -#? 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 8/imm32 # add to esp -#? # }}} -$emit-segments:word-loop1-check-for-end-of-line: - # if (slice-empty?(word-slice)) break - # . eax = slice-empty?(word-slice) - # . . push args - 52/push-edx - # . . call - e8/call slice-empty?/disp32 - # . . discard args - 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 4/imm32 # add to esp - # . if (eax != 0) break - 3d/compare-eax-and 0/imm32/false - 0f 85/jump-if-!= $emit-segments:rewind-line/disp32 -$emit-segments:word-loop1-check-for-comment: - # if (slice-starts-with?(word-slice, "#")) break - # . start/esi = word-slice->start - 8b/copy 0/mod/indirect 2/rm32/edx . . . 6/r32/esi . . # copy *edx to esi - # . c/eax = *start - 31/xor 3/mod/direct 0/rm32/eax . . . 0/r32/eax . . # clear eax - 8a/copy-byte 0/mod/indirect 6/rm32/esi . . . 0/r32/AL . . # copy byte at *esi to AL - # . if (eax == '#') break - 3d/compare-eax-and 0x23/imm32/hash - 0f 84/jump-if-= $emit-segments:rewind-line/disp32 -$emit-segments:word-loop1-check-for-label: - # if is-label?(word-slice) break - # . eax = is-label?(word-slice) - # . . push args - 52/push-edx - # . . call - e8/call is-label?/disp32 - # . . discard args - 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 4/imm32 # add to esp - # . if (eax != false) break - 3d/compare-eax-and 0/imm32/false - 0f 85/jump-if-!= $emit-segments:rewind-line/disp32 -$emit-segments:word-loop1-check-for-segment-header: - # if (slice-equal?(word-slice, "==")) break - # . eax = slice-equal?(word-slice, "==") - # . . push args - 68/push "=="/imm32 - 52/push-edx - # . . call - e8/call slice-equal?/disp32 - # . . discard args - 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 8/imm32 # add to esp - # . if (eax != false) break - 3d/compare-eax-and 0/imm32/false - 0f 85/jump-if-!= $emit-segments:rewind-line/disp32 -$emit-segments:word-loop1-check-for-mod: - # if has-metadata?(word-slice, "mod") contains-modrm? = true, break - # . eax = has-metadata?(word-slice, "mod") - # . . push args - 68/push "mod"/imm32 - 52/push-edx - # . . call - e8/call has-metadata?/disp32 - # . . discard args - 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 8/imm32 # add to esp - # . if (eax == false) continue - 3d/compare-eax-and 0/imm32/false - 0f 85/jump-if-!= $emit-segments:word-loop1-search-line-for-modrm/disp32 - # contains-modrm? = true - bf/copy-to-edi 1/imm32/true - # break - eb/jump $emit-segments:rewind-line/disp8 -$emit-segments:word-loop1-continue: - # otherwise scan next word - e9/jump $emit-segments:word-loop1-search-line-for-modrm/disp32 -$emit-segments:rewind-line: - # rewind-stream(line) - # . . push args - 51/push-ecx - # . . call - e8/call rewind-stream/disp32 - # . . discard args - 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 4/imm32 # add to esp $emit-segments:word-loop: # next-word(line, word-slice) # . . push args @@ -2210,9 +2075,9 @@ $emit-segments:2-character: e9/jump $emit-segments:word-loop/disp32 $emit-segments:check-metadata: # - if we get here, 'word-slice' must be a label to be looked up - # datum = next-token-from-slice(word-slice->start, word-slice->end, "/") + # datum/edi = next-token-from-slice(word-slice->start, word-slice->end, "/") # . . push args - 68/push emit-segments:datum/imm32 + 57/push-edi 68/push 0x2f/imm32/slash ff 6/subop/push 1/mod/*+disp8 2/rm32/edx . . . . 4/disp8 . # push *(edx+4) ff 6/subop/push 0/mod/indirect 2/rm32/edx . . . . . . # push *edx @@ -2231,7 +2096,7 @@ $emit-segments:check-metadata: #? 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 8/imm32 # add to esp #? # . write-slice-buffered(Stderr, datum) #? # . . push args -#? 68/push emit-segments:datum/imm32 +#? 57/push-edi #? 68/push Stderr/imm32 #? # . . call #? e8/call write-slice-buffered/disp32 @@ -2258,7 +2123,7 @@ $emit-segments:check-metadata: # . . push args 68/push "label table"/imm32 68/push 0x18/imm32/row-size - 68/push emit-segments:datum/imm32 + 57/push-edi ff 6/subop/push 1/mod/*+disp8 5/rm32/ebp . . . . 0x10/disp8 . # push *(ebp+16) # . . call e8/call get-slice/disp32 @@ -2463,7 +2328,7 @@ $emit-segments:next-line: e9/jump $emit-segments:line-loop/disp32 $emit-segments:end: # . reclaim locals - 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 0x214/imm32 # add to esp + 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 0x21c/imm32 # add to esp # . restore registers 5f/pop-to-edi 5e/pop-to-esi |