st/lama_byterun
1
0
Fork 0
mirror of https://github.com/ProgramSnail/Lama.git synced 2025-12-07 23:38:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Stack machine for functions

Browse source
This commit is contained in:
Dmitry Boulytchev 2018-04-03 11:06:38 +03:00
parent 784cc6510d
commit 73ad0dd515
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
regression/Makefile
View file

@ -9,7 +9,7 @@ check: $(TESTS)
$(TESTS): %: %.expr $(TESTS): %: %.expr
# @$(RC) $< && cat $@.input | ./$@ > $@.log && diff $@.log orig/$@.log # @$(RC) $< && cat $@.input | ./$@ > $@.log && diff $@.log orig/$@.log
@cat $@.input | $(RC) -i $< > $@.log && diff $@.log orig/$@.log @cat $@.input | $(RC) -i $< > $@.log && diff $@.log orig/$@.log
# @cat $@.input | $(RC) -s $< > $@.log && diff $@.log orig/$@.log @cat $@.input | $(RC) -s $< > $@.log && diff $@.log orig/$@.log
clean: clean:
rm -f test*.log *.s *~ $(TESTS) rm -f test*.log *.s *~ $(TESTS)

16
src/SM.ml
View file

@ -19,6 +19,8 @@ open Language
(* The type for the stack machine program *) (* The type for the stack machine program *)
type prg = insn list type prg = insn list
let print_prg p = List.iter (fun i -> Printf.printf "%s\n" (show(insn) i)) p
(* The type for the stack machine configuration: control stack, stack and configuration from statement (* The type for the stack machine configuration: control stack, stack and configuration from statement
interpreter interpreter
*) *)
@ -43,7 +45,7 @@ let rec eval env ((cstack, stack, ((st, i, o) as c)) as conf) = function
| ST x -> let z::stack' = stack in eval env (cstack, stack', (State.update x z st, i, o)) prg' | ST x -> let z::stack' = stack in eval env (cstack, stack', (State.update x z st, i, o)) prg'
| LABEL _ -> eval env conf prg' | LABEL _ -> eval env conf prg'
| JMP l -> eval env conf (env#labeled l) | JMP l -> eval env conf (env#labeled l)
| CJMP (c, l) -> let x::stack' = stack in eval env conf (if (c = "z" && x = 0) || (c = "nz" && x <> 0) then env#labeled l else prg') | CJMP (c, l) -> let x::stack' = stack in eval env (cstack, stack', (st, i, o)) (if (c = "z" && x = 0) || (c = "nz" && x <> 0) then env#labeled l else prg')
| CALL f -> eval env ((prg', st)::cstack, stack, c) (env#labeled f) | CALL f -> eval env ((prg', st)::cstack, stack, c) (env#labeled f)
| BEGIN (args, locals) -> let rec combine acc args stack = | BEGIN (args, locals) -> let rec combine acc args stack =
match args, stack with match args, stack with
@ -65,6 +67,7 @@ let rec eval env ((cstack, stack, ((st, i, o) as c)) as conf) = function
Takes a program, an input stream, and returns an output stream this program calculates Takes a program, an input stream, and returns an output stream this program calculates
*) *)
let run p i = let run p i =
(*print_prg p;*)
let module M = Map.Make (String) in let module M = Map.Make (String) in
let rec make_map m = function let rec make_map m = function
| [] -> m | [] -> m
@ -83,10 +86,14 @@ let run p i =
*) *)
let compile (defs, p) = let compile (defs, p) =
let label s = "L" ^ s in let label s = "L" ^ s in
let rec expr = function let rec call f args =
let args_code = List.concat @@ List.map expr (List.rev args) in
args_code @ [CALL (label f)]
and expr = function
| Expr.Var x -> [LD x] | Expr.Var x -> [LD x]
| Expr.Const n -> [CONST n] | Expr.Const n -> [CONST n]
| Expr.Binop (op, x, y) -> expr x @ expr y @ [BINOP op] | Expr.Binop (op, x, y) -> expr x @ expr y @ [BINOP op]
| Expr.Call (f, args) -> call f args
in in
let rec compile_stmt l env = function let rec compile_stmt l env = function
| Stmt.Read x -> env, false, [READ; ST x] | Stmt.Read x -> env, false, [READ; ST x]
@ -114,8 +121,9 @@ let compile (defs, p) =
let env , flag, body = compile_stmt check env s in let env , flag, body = compile_stmt check env s in
env, false, [LABEL loop] @ body @ (if flag then [LABEL check] else []) @ (expr c) @ [CJMP ("z", loop)] env, false, [LABEL loop] @ body @ (if flag then [LABEL check] else []) @ (expr c) @ [CJMP ("z", loop)]
| Stmt.Call (f, args) -> let args_code = List.concat @@ List.map expr (List.rev args) in | Stmt.Call (f, args) -> env, false, call f args
env, false, args_code @ [CALL (label f)]
| Stmt.Return e -> env, false, (match e with Some e -> expr e | None -> []) @ [END]
in in
let compile_def env (name, (args, locals, stmt)) = let compile_def env (name, (args, locals, stmt)) =
let lend, env = env#get_label in let lend, env = env#get_label in