diff options
| -rw-r--r-- | tnslc/compile/compile.tnsl | 72 | ||||
| -rw-r--r-- | tnslc/compile/isa_x86.tnsl | 8 |
2 files changed, 62 insertions, 18 deletions
diff --git a/tnslc/compile/compile.tnsl b/tnslc/compile/compile.tnsl index 7dccd17..80c1456 100644 --- a/tnslc/compile/compile.tnsl +++ b/tnslc/compile/compile.tnsl @@ -84,11 +84,11 @@ ;; if (r == 3) ;return "dx" ;; if (r == 4) - ;return "sp" + ;return "si" ;; if (r == 5) - ;return "bp" + ;return "di" ;; if (r == 6) - ;return "si" + ;return "bp" ;; if (r == 7) ;/ ;return string_from_int(r) @@ -293,8 +293,46 @@ ;/ ;/ +/; eval_value (~int cur, ~{}Token data, ~VTrack tab, gsc, ~{}charp hsec, csec, dsec, int reg) + /; if (token_is(cur, data, ";/")) + ;return + ;/ + + /; loop (cur` < len data`) + /; if (data`{cur`}.token_type == TOKEN_TYPE.LITERAL) + + ;; else if (data`{cur`}.token_type == TOKEN_TYPE.DEFWORD) + + ;/ + ;/ +;/ + # Sets up a call and reports back where the return value is stored /; eval_call (~int cur, ~{}Token data, ~VTrack tab, gsc, ~{}charp hsec, csec, dsec) [{}charp] + + # Store the name of the function we are calling + ;{}charp to_call = data`{cur`}.data` + + # Set read head to first parameter + ;cur` = cur` + 2 + ;int reg = 0 + /; loop (!token_is(cur, data, ")")) + /; if (token_is(cur, data, ",")) + ;cur`++ + ;; else + /; if (reg < 7) + ;eval_value(cur, data, tab, gsc, hsec, csec, dsec, reg) + ;reg++ + ;; else + ;eval_value(cur, data, tab, gsc, hsec, csec, dsec, reg) + ;push_asm(get_reg(8, "bp")) + ;/ + ;/ + ;/ + + ;{}charp call_ist = call_asm(to_call) + + ;add_strings(csec, ~call_ist) ;return "ax" ;/ @@ -320,11 +358,6 @@ ;add_strings(csec, ~tmp) ;/ -# Value evaluation, reports back where the computed value is stored -/; eval_value (~int cur, ~{}Token data, ~VTrack tab, gsc, ~{}charp hsec, csec, dsec) [{}charp] - -;/ - # Compile a statement in a function /; compile_statement (~int cur, ~{}Token data, ~VTrack tab, gsc, ~{}charp hsec, csec, dsec) [bool] ;cur`++ @@ -339,14 +372,22 @@ ;; else if (token_is(cur, data, "raw")) ;cur`++ ;r = true - ;; else if (name_to_index(data`{cur`}.data`, tab) !< 0) - # set value - ;int i = name_to_index(data`{cur`}.data`, tab) - ;{}charp loc = index_to_loc(i) - ;eval_value(cur, data, tab, gsc, hsec, csec, dsec, loc) + ;; else if (token_is(cur, data, "return")) + ;cur`++ + ;eval_value(cur, data, tab, gsc, hsec, csec, dsec, 0) + ;tail_guard(csec) + ;add_strings(csec, ~(tnslc.COMMON_ASM{0})) + ;return true ;; else if (string_equate(data`{cur`+1}.data`, "(")) # Function call ;eval_call(cur, data, tab, gsc, hsec, csec, dsec) + ;; else if (name_to_index(data`{cur`}.data`, tab) !< 0) + # set value + ;int i = name_to_index(data`{cur`}.data`, tab) + ;{}charp tmp = index_to_loc(i) + ;eval_value(cur, data, tab, gsc, hsec, csec, dsec, 0) + ;tmp = mov_asm(get_reg(tab`.sym_types{i}._size, "ax"), tmp) + ;add_strings(csec, ~tmp) ;; else #Definition ;VType def_t = get_vtype(cur, data) @@ -369,11 +410,6 @@ ;/ ;; if (token_is(cur, data, "return")) - /; if (!r) - ;cur`++ - ;eval_value(cur, data, tab, gsc, hsec, csec, dsec, "ax") - ;tail_guard(csec) - ;/ ;add_strings(csec, ~(tnslc.COMMON_ASM{0})) ;return true ;/ diff --git a/tnslc/compile/isa_x86.tnsl b/tnslc/compile/isa_x86.tnsl index e11311a..ee5bf27 100644 --- a/tnslc/compile/isa_x86.tnsl +++ b/tnslc/compile/isa_x86.tnsl @@ -52,10 +52,18 @@ ;return construct_statement("\tcmp ", {a, b}) ;/ +/; mov_asm ({}charp a, b) [{}charp] + ;return construct_statement("\tmov ", {a, b}) +;/ + /; jmp_asm ({}charp pos) [{}charp] ;return construct_statement("\tjmp ", {pos}) ;/ +/; call_asm ({}charp pos) [{}charp] + ;return construct_statement("\tcall ", {pos}) +;/ + /; cjmp_asm ({}charp suffix, pos) [{}charp] ;{}charp p = "\tj" ;add_strings(~p, ~suffix) |