From 94e88e887cf2ee4c6b445924d26e134a90bcbd50 Mon Sep 17 00:00:00 2001 From: Alex AUVOLAT Date: Tue, 5 Nov 2013 10:18:00 +0100 Subject: Reorganized folders. --- sched/test/clock_div.mj | 4 ---- sched/test/clock_div.net | 9 --------- sched/test/cm2.mj | 4 ---- sched/test/cm2.net | 9 --------- sched/test/fulladder.mj | 4 ---- sched/test/fulladder.net | 12 ------------ sched/test/nadder.mj | 19 ------------------- sched/test/nadder.net | 17 ----------------- sched/test/ram.mj | 15 --------------- sched/test/ram.net | 32 -------------------------------- 10 files changed, 125 deletions(-) delete mode 100644 sched/test/clock_div.mj delete mode 100644 sched/test/clock_div.net delete mode 100644 sched/test/cm2.mj delete mode 100644 sched/test/cm2.net delete mode 100644 sched/test/fulladder.mj delete mode 100644 sched/test/fulladder.net delete mode 100644 sched/test/nadder.mj delete mode 100644 sched/test/nadder.net delete mode 100644 sched/test/ram.mj delete mode 100644 sched/test/ram.net (limited to 'sched/test') diff --git a/sched/test/clock_div.mj b/sched/test/clock_div.mj deleted file mode 100644 index ad1e919..0000000 --- a/sched/test/clock_div.mj +++ /dev/null @@ -1,4 +0,0 @@ -main() = (o) where - o = reg(c); - c = not (reg (o)) -end where \ No newline at end of file diff --git a/sched/test/clock_div.net b/sched/test/clock_div.net deleted file mode 100644 index 9a17fc7..0000000 --- a/sched/test/clock_div.net +++ /dev/null @@ -1,9 +0,0 @@ -INPUT -OUTPUT o -VAR - _l_2, c, o -IN -c = NOT _l_2 -o = REG c -_l_2 = REG o - diff --git a/sched/test/cm2.mj b/sched/test/cm2.mj deleted file mode 100644 index 8863bf1..0000000 --- a/sched/test/cm2.mj +++ /dev/null @@ -1,4 +0,0 @@ -main(x) = (s, r) where - s = reg (x xor s); - r = x and s -end where \ No newline at end of file diff --git a/sched/test/cm2.net b/sched/test/cm2.net deleted file mode 100644 index e296b96..0000000 --- a/sched/test/cm2.net +++ /dev/null @@ -1,9 +0,0 @@ -INPUT x -OUTPUT s, r -VAR - _l_1, r, s, x -IN -r = AND x s -s = REG _l_1 -_l_1 = XOR x s - diff --git a/sched/test/fulladder.mj b/sched/test/fulladder.mj deleted file mode 100644 index c4b6b0e..0000000 --- a/sched/test/fulladder.mj +++ /dev/null @@ -1,4 +0,0 @@ -main(a,b,c) = (s, r) where - s = (a xor b) xor c; - r = (a and b) or ((a xor b) and c); -end where \ No newline at end of file diff --git a/sched/test/fulladder.net b/sched/test/fulladder.net deleted file mode 100644 index b2271c2..0000000 --- a/sched/test/fulladder.net +++ /dev/null @@ -1,12 +0,0 @@ -INPUT a, b, c -OUTPUT s, r -VAR - _l_1, _l_3, _l_4, _l_5, a, b, c, r, s -IN -r = OR _l_3 _l_5 -s = XOR _l_1 c -_l_1 = XOR a b -_l_3 = AND a b -_l_4 = XOR a b -_l_5 = AND _l_4 c - diff --git a/sched/test/nadder.mj b/sched/test/nadder.mj deleted file mode 100644 index 0c95386..0000000 --- a/sched/test/nadder.mj +++ /dev/null @@ -1,19 +0,0 @@ -fulladder(a,b,c) = (s, r) where - s = (a ^ b) ^ c; - r = (a & b) + ((a ^ b) & c); -end where - -adder(a:[n], b:[n], c_in) = (o:[n], c_out) where - if n = 0 then - o = []; - c_out = 0 - else - (s_n1, c_n1) = adder(a[1..], b[1..], c_in); - (s_n, c_out) = fulladder(a[0], b[0], c_n1); - o = s_n . s_n1 - end if -end where - -main(a, b) = (o, c) where - (o, c) = adder<1>(a,b,0) -end where \ No newline at end of file diff --git a/sched/test/nadder.net b/sched/test/nadder.net deleted file mode 100644 index bf87051..0000000 --- a/sched/test/nadder.net +++ /dev/null @@ -1,17 +0,0 @@ -INPUT a, b -OUTPUT o, c -VAR - _l_10_50, _l_11_49, _l_16_22, _l_17_21, _l_7_52, _l_9_51, a, b, c, - c_n1_27, o, s_n_26 -IN -o = s_n_26 -c = OR _l_9_51 _l_11_49 -s_n_26 = XOR _l_7_52 c_n1_27 -_l_7_52 = XOR _l_16_22 _l_17_21 -_l_9_51 = AND _l_16_22 _l_17_21 -_l_10_50 = XOR _l_16_22 _l_17_21 -_l_11_49 = AND _l_10_50 c_n1_27 -c_n1_27 = 0 -_l_16_22 = SELECT 0 a -_l_17_21 = SELECT 0 b - diff --git a/sched/test/ram.mj b/sched/test/ram.mj deleted file mode 100644 index 5bd4f29..0000000 --- a/sched/test/ram.mj +++ /dev/null @@ -1,15 +0,0 @@ -const addr = 2 -const word = 4 - -or_n(a:[n],b:[n]) = (o:[n]) where - if n = 0 then - o = [] - else - o = (a[0] or b[0]).(or_n(a[1..], b[1..])) - end if -end where - -main(ra:[addr], we, wa:[addr], c:[word]) = (o:[word]) where - o = ram(ra, we, wa, or_n(o, c)) -end where - diff --git a/sched/test/ram.net b/sched/test/ram.net deleted file mode 100644 index 56f2fc6..0000000 --- a/sched/test/ram.net +++ /dev/null @@ -1,32 +0,0 @@ -INPUT ra, we, wa, c -OUTPUT o -VAR - _l_10_22, _l_10_35, _l_10_48, _l_10_61, _l_11_21, _l_11_34, _l_11_47, - _l_11_60, _l_12_20 : 3, _l_12_33 : 2, _l_12_46 : 1, _l_13_19 : 3, _l_13_32 : 2, - _l_13_45 : 1, _l_14_18 : 3, _l_14_31 : 2, _l_14_44 : 1, _l_16 : 4, - _l_9_23, _l_9_36, _l_9_49, _l_9_62, c : 4, o : 4, ra : 2, wa : 2, we -IN -o = RAM 2 4 ra we wa _l_16 -_l_16 = CONCAT _l_11_21 _l_14_18 -_l_9_23 = SELECT 0 o -_l_10_22 = SELECT 0 c -_l_11_21 = OR _l_9_23 _l_10_22 -_l_12_20 = SLICE 1 3 o -_l_13_19 = SLICE 1 3 c -_l_14_18 = CONCAT _l_11_34 _l_14_31 -_l_9_36 = SELECT 0 _l_12_20 -_l_10_35 = SELECT 0 _l_13_19 -_l_11_34 = OR _l_9_36 _l_10_35 -_l_12_33 = SLICE 1 2 _l_12_20 -_l_13_32 = SLICE 1 2 _l_13_19 -_l_14_31 = CONCAT _l_11_47 _l_14_44 -_l_9_49 = SELECT 0 _l_12_33 -_l_10_48 = SELECT 0 _l_13_32 -_l_11_47 = OR _l_9_49 _l_10_48 -_l_12_46 = SLICE 1 1 _l_12_33 -_l_13_45 = SLICE 1 1 _l_13_32 -_l_14_44 = _l_11_60 -_l_9_62 = SELECT 0 _l_12_46 -_l_10_61 = SELECT 0 _l_13_45 -_l_11_60 = OR _l_9_62 _l_10_61 - -- cgit v1.2.3