aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpacien2018-04-29 20:19:28 +0200
committerpacien2018-04-29 20:19:28 +0200
commit55f5d164762fc37fc53e6e94da2aa92d84e8c145 (patch)
treea4ffc86a7d22f893f4b0bf50fdc1677d816c017a
parent7d05d97c8e51e77f117fc14f060bb0c54b86a135 (diff)
parente828fbc45672ed2b6d9e78e6b667905d3c68267c (diff)
downloadurm-55f5d164762fc37fc53e6e94da2aa92d84e8c145.tar.gz
Merge branch 'eurm'
-rw-r--r--common.mli27
-rw-r--r--eurm.ml22
-rw-r--r--eurml.mli25
-rw-r--r--eurml_test.ml75
-rw-r--r--makefile1
5 files changed, 148 insertions, 2 deletions
diff --git a/common.mli b/common.mli
index a62b083..4fa838d 100644
--- a/common.mli
+++ b/common.mli
@@ -4,15 +4,35 @@
4 *) 4 *)
5 5
6type line = int 6type line = int
7type label = string
7type regidx = int 8type regidx = int
8type regval = int 9type regval = int
9type reg = Reg of regidx * regval 10type reg = Reg of regidx * regval
10 11
11type urmcmd = 12type urmcmd =
13 | URMCopy of regidx * regidx
14 | URMJump of regidx * regidx * line
15 | URMSucc of regidx
16 | URMZero of regidx
17
18type eurmcmd =
19 | Add of regidx * regidx
20 | Comment of string
12 | Copy of regidx * regidx 21 | Copy of regidx * regidx
13 | Jump of regidx * regidx * line 22 | Dec of regidx
14 | Succ of regidx 23 | EqPredicate of regidx * regidx * label
24 | GEqPredicate of regidx * regidx * label
25 | GTPredicate of regidx * regidx * label
26 | Goto of label
27 | Inc of regidx
28 | Label of label
29 | LEqPredicate of regidx * regidx * label
30 | LTPredicate of regidx * regidx * label
31 | Mult of regidx * regidx
32 | Quit
33 | Sub of regidx * regidx
15 | Zero of regidx 34 | Zero of regidx
35 | ZeroPredicate of regidx * label
16 36
17type instptr = InstPtr of (line * urmcmd) list * (line * urmcmd) list 37type instptr = InstPtr of (line * urmcmd) list * (line * urmcmd) list
18 38
@@ -21,4 +41,7 @@ type urm = {
21 regs : reg list 41 regs : reg list
22} 42}
23 43
44type state = { todo : int }
45
24exception Syntax_error 46exception Syntax_error
47
diff --git a/eurm.ml b/eurm.ml
new file mode 100644
index 0000000..c571384
--- /dev/null
+++ b/eurm.ml
@@ -0,0 +1,22 @@
1(*
2 * UPEM / L3 / Functional programming / Project: URM
3 * Pacien TRAN-GIRARD, Adam NAILI
4 *)
5
6open Common
7
8let compile_preprocess eurmcmds = eurmcmds
9let compile_stage1 eurmcmds state = eurmcmds, state
10let compile_stage2 eurmcmds state = eurmcmds, state
11let compile_stage3 eurmcmds state = eurmcmds, state
12let compile_stage4 eurmcmds state = [URMZero(0)], state
13
14let urm_from_eurm =
15 let chain transform (eurmcmds, compile_state) = transform eurmcmds compile_state
16 and initial_state = 0
17 in (compile_preprocess, initial_state)
18 |> chain compile_stage1
19 |> chain compile_stage2
20 |> chain compile_stage3
21 |> chain compile_stage4
22
diff --git a/eurml.mli b/eurml.mli
new file mode 100644
index 0000000..8fd8ef1
--- /dev/null
+++ b/eurml.mli
@@ -0,0 +1,25 @@
1(*
2 * UPEM / L3 / Functional programming / Project: URM
3 * Pacien TRAN-GIRARD, Adam NAILI
4 *)
5
6open Common
7
8(* Strips out comments and rewrite/enumerate labels *)
9val compile_preprocess : eurmcmd list -> eurmcmd list
10
11(* Rewrites Dec, GEqPredicate, LEqPredicate, LTPredicate, Mult and ZeroPredicate *)
12val compile_stage1 : eurmcmd list -> state -> eurmcmd list * state
13
14(* Rewrites Add, GTPredicate and Sub *)
15val compile_stage2 : eurmcmd list -> state -> eurmcmd list * state
16
17(* Rewrites Goto *)
18val compile_stage3 : eurmcmd list -> state -> eurmcmd list * state
19
20(* Rewrites Inc, EqPredicate, Label and Zero *)
21val compile_stage4 : eurmcmd list -> state -> urmcmd list * state
22
23(* Transcompiles an EURM instruction sequence into URM *)
24val urm_from_eurm : eurmcmd list -> urmcmd list
25
diff --git a/eurml_test.ml b/eurml_test.ml
new file mode 100644
index 0000000..7dc6e5e
--- /dev/null
+++ b/eurml_test.ml
@@ -0,0 +1,75 @@
1(*
2 * UPEM / L3 / Functional programming / Project: URM
3 * Pacien TRAN-GIRARD, Adam NAILI
4 *)
5
6open Common
7open Urm
8open Eurm
9open Kaputt.Abbreviations
10
11let () =
12 Test.add_simple_test
13 ~title:"example_eurm_factorial_conversion"
14 (fun () ->
15 let input_eurm = [
16 Comment "Compute r1! and place the result in r1";
17 ZeroPredicate (1, "r1=0");
18 Goto "r1>0";
19 Comment "r1 holds 0";
20 Label "r1=0";
21 Inc 1;
22 Goto "done";
23 Comment "r1 holds a positive integer";
24 Label "r1>0";
25 Copy (2, 1);
26 Zero 1;
27 Inc 1;
28 Zero 3;
29 Inc 3;
30 Comment "main loop";
31 Label "loop";
32 Mult (1, 3);
33 EqPredicate (2, 3, "done");
34 Inc 3;
35 Goto "loop";
36 Label "done";
37 Quit]
38 and expected_urm = [
39 URMZero 4;
40 URMJump (1, 4, 4);
41 URMZero 8;
42 URMJump (8, 8, 7);
43 URMSucc 1;
44 URMZero 9;
45 URMJump (9, 9, 29);
46 URMCopy (2, 1);
47 URMZero 1;
48 URMSucc 1;
49 URMZero 3;
50 URMSucc 3;
51 URMCopy (5, 1);
52 URMZero 1;
53 URMZero 6;
54 URMJump (3, 6, 25);
55 URMZero 7;
56 URMJump (5, 7, 22);
57 URMSucc 1;
58 URMSucc 7;
59 URMZero 10;
60 URMJump (10, 10, 17);
61 URMSucc 6;
62 URMZero 11;
63 URMJump (11, 11, 15);
64 URMJump (2, 3, 29);
65 URMSucc 3;
66 URMZero 12;
67 URMJump (12, 12, 12);
68 URMZero 13;
69 URMJump (13, 13, 38)]
70 in let output_urm = urm_from_eurm input_eurm
71 in
72 Assert.is_true (output_urm = expected_urm))
73
74let () = if Array.mem "run-tests" Sys.argv then Test.launch_tests ()
75
diff --git a/makefile b/makefile
index 6345a40..6aceab8 100644
--- a/makefile
+++ b/makefile
@@ -7,6 +7,7 @@ SOURCES = \
7 instptr.mli instptr.ml \ 7 instptr.mli instptr.ml \
8 reg.mli reg.ml \ 8 reg.mli reg.ml \
9 urm.mli urm.ml urm_test.ml \ 9 urm.mli urm.ml urm_test.ml \
10 eurm.mli eurm.ml eurm_test.ml \
10 main.ml 11 main.ml
11 12
12OCAMLMAKEFILE = /usr/share/ocamlmakefile/OCamlMakefile 13OCAMLMAKEFILE = /usr/share/ocamlmakefile/OCamlMakefile