summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex AUVOLAT <alex.auvolat@ens.fr>2013-11-04 22:09:27 +0100
committerAlex AUVOLAT <alex.auvolat@ens.fr>2013-11-04 22:09:27 +0100
commit9063ce38f51e652f7995e173ef9173ed10bb308c (patch)
tree10673163f62a120460f0ef8015b016bc4c6ed876
parentcebd07b64f1f537c5ecf00ec21ff4b7c4032f0a3 (diff)
downloadSystDigit-Projet-9063ce38f51e652f7995e173ef9173ed10bb308c.tar.gz
SystDigit-Projet-9063ce38f51e652f7995e173ef9173ed10bb308c.zip
Cleanup unused files.
-rw-r--r--.gitignore6
-rwxr-xr-xnetlist_simulator.byte (renamed from sched/netlist_simulator.byte)bin190274 -> 190274 bytes
l---------sched/graph_test.byte1
l---------sched/main.byte1
-rw-r--r--sched/test/clock_div.dumb11
-rw-r--r--sched/test/clock_div_sch.net9
-rw-r--r--sched/test/cm2.dumb9
-rw-r--r--sched/test/cm2_sch.net9
-rw-r--r--sched/test/fulladder.dumb20
-rw-r--r--sched/test/fulladder_sch.net12
-rw-r--r--sched/test/nadder.dumb27
-rw-r--r--sched/test/nadder_sch.net17
-rw-r--r--sched/test/ram.dumb55
-rw-r--r--sched/test/ram_sch.net32
14 files changed, 3 insertions, 206 deletions
diff --git a/.gitignore b/.gitignore
index c90ad14..9c555fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
*/_build/*
-tp1/*test.byte
-tp1/test/*_sch.net
-camlsim/*.byte
+*/*.byte
+sched/test/*_sch.net
+sched/test/*.dumb
*.swp
csim/csim
*.o
diff --git a/sched/netlist_simulator.byte b/netlist_simulator.byte
index 155d39a..155d39a 100755
--- a/sched/netlist_simulator.byte
+++ b/netlist_simulator.byte
Binary files differ
diff --git a/sched/graph_test.byte b/sched/graph_test.byte
deleted file mode 120000
index 1ec2e64..0000000
--- a/sched/graph_test.byte
+++ /dev/null
@@ -1 +0,0 @@
-/home/katchup/Core/ENS/Info/SystDigit-Projet/tp1/_build/graph_test.byte \ No newline at end of file
diff --git a/sched/main.byte b/sched/main.byte
deleted file mode 120000
index 0571503..0000000
--- a/sched/main.byte
+++ /dev/null
@@ -1 +0,0 @@
-/home/katchup/Core/ENS/Info/SystDigit-Projet/sched/_build/main.byte \ No newline at end of file
diff --git a/sched/test/clock_div.dumb b/sched/test/clock_div.dumb
deleted file mode 100644
index bcb07d0..0000000
--- a/sched/test/clock_div.dumb
+++ /dev/null
@@ -1,11 +0,0 @@
-3
-1 _l_2
-1 c
-1 o
-0
-1 2
-3
-0 1 2
-2 1 1
-1 2 0
-
diff --git a/sched/test/clock_div_sch.net b/sched/test/clock_div_sch.net
deleted file mode 100644
index 0ae5cd9..0000000
--- a/sched/test/clock_div_sch.net
+++ /dev/null
@@ -1,9 +0,0 @@
-INPUT
-OUTPUT o
-VAR
- _l_2, c, o
-IN
-_l_2 = REG o
-o = REG c
-c = NOT _l_2
-
diff --git a/sched/test/cm2.dumb b/sched/test/cm2.dumb
deleted file mode 100644
index 632c6ea..0000000
--- a/sched/test/cm2.dumb
+++ /dev/null
@@ -1,9 +0,0 @@
-4
-1 _l_1
-1 r
-1 s
-1 x
-1 3
-2 2 1
-3
-
diff --git a/sched/test/cm2_sch.net b/sched/test/cm2_sch.net
deleted file mode 100644
index e9900d5..0000000
--- a/sched/test/cm2_sch.net
+++ /dev/null
@@ -1,9 +0,0 @@
-INPUT x
-OUTPUT s, r
-VAR
- _l_1, r, s, x
-IN
-s = REG _l_1
-_l_1 = XOR x s
-r = AND x s
-
diff --git a/sched/test/fulladder.dumb b/sched/test/fulladder.dumb
deleted file mode 100644
index 480d04d..0000000
--- a/sched/test/fulladder.dumb
+++ /dev/null
@@ -1,20 +0,0 @@
-9
-1 _l_1
-1 _l_3
-1 _l_4
-1 _l_5
-1 a
-1 b
-1 c
-1 r
-1 s
-3 4 5 6
-2 8 7
-6
-2 3 1 4 5
-3 3 2 2 6
-1 3 2 4 5
-0 3 1 4 5
-8 3 1 0 6
-7 3 0 1 3
-
diff --git a/sched/test/fulladder_sch.net b/sched/test/fulladder_sch.net
deleted file mode 100644
index 96fc154..0000000
--- a/sched/test/fulladder_sch.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
-_l_4 = XOR a b
-_l_5 = AND _l_4 c
-_l_3 = AND a b
-_l_1 = XOR a b
-s = XOR _l_1 c
-r = OR _l_3 _l_5
-
diff --git a/sched/test/nadder.dumb b/sched/test/nadder.dumb
deleted file mode 100644
index 469984d..0000000
--- a/sched/test/nadder.dumb
+++ /dev/null
@@ -1,27 +0,0 @@
-12
-1 _l_10_50
-1 _l_11_49
-1 _l_16_22
-1 _l_17_21
-1 _l_7_52
-1 _l_9_51
-1 a
-1 b
-1 c
-1 c_n1_27
-1 o
-1 s_n_26
-2 6 7
-2 10 8
-10
-3 9 0 7
-2 9 0 6
-9 0 $0
-0 3 1 2 3
-1 3 2 0 9
-5 3 2 2 3
-4 3 1 2 3
-11 3 1 4 9
-8 3 0 5 1
-10 0 11
-
diff --git a/sched/test/nadder_sch.net b/sched/test/nadder_sch.net
deleted file mode 100644
index 5602eb4..0000000
--- a/sched/test/nadder_sch.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
-_l_17_21 = SELECT 0 b
-_l_16_22 = SELECT 0 a
-c_n1_27 = 0
-_l_10_50 = XOR _l_16_22 _l_17_21
-_l_11_49 = AND _l_10_50 c_n1_27
-_l_9_51 = AND _l_16_22 _l_17_21
-_l_7_52 = XOR _l_16_22 _l_17_21
-s_n_26 = XOR _l_7_52 c_n1_27
-c = OR _l_9_51 _l_11_49
-o = s_n_26
-
diff --git a/sched/test/ram.dumb b/sched/test/ram.dumb
deleted file mode 100644
index 74cf168..0000000
--- a/sched/test/ram.dumb
+++ /dev/null
@@ -1,55 +0,0 @@
-27
-1 _l_10_22
-1 _l_10_35
-1 _l_10_48
-1 _l_10_61
-1 _l_11_21
-1 _l_11_34
-1 _l_11_47
-1 _l_11_60
-3 _l_12_20
-2 _l_12_33
-1 _l_12_46
-3 _l_13_19
-2 _l_13_32
-1 _l_13_45
-3 _l_14_18
-2 _l_14_31
-1 _l_14_44
-4 _l_16
-1 _l_9_23
-1 _l_9_36
-1 _l_9_49
-1 _l_9_62
-4 c
-4 o
-2 ra
-2 wa
-1 we
-4 24 26 25 22
-1 23
-23
-11 8 1 3 22
-12 8 1 2 11
-13 8 1 1 12
-3 9 0 13
-23 6 2 4 24 26 25 17
-8 8 1 3 23
-9 8 1 2 8
-10 8 1 1 9
-21 9 0 10
-7 3 2 21 3
-16 0 7
-2 9 0 12
-20 9 0 9
-6 3 2 20 2
-15 7 6 16
-1 9 0 11
-19 9 0 8
-5 3 2 19 1
-14 7 5 15
-0 9 0 22
-18 9 0 23
-4 3 2 18 0
-17 7 4 14
-
diff --git a/sched/test/ram_sch.net b/sched/test/ram_sch.net
deleted file mode 100644
index 56dda0e..0000000
--- a/sched/test/ram_sch.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
-_l_13_19 = SLICE 1 3 c
-_l_13_32 = SLICE 1 2 _l_13_19
-_l_13_45 = SLICE 1 1 _l_13_32
-_l_10_61 = SELECT 0 _l_13_45
-o = RAM 2 4 ra we wa _l_16
-_l_12_20 = SLICE 1 3 o
-_l_12_33 = SLICE 1 2 _l_12_20
-_l_12_46 = SLICE 1 1 _l_12_33
-_l_9_62 = SELECT 0 _l_12_46
-_l_11_60 = AND _l_9_62 _l_10_61
-_l_14_44 = _l_11_60
-_l_10_48 = SELECT 0 _l_13_32
-_l_9_49 = SELECT 0 _l_12_33
-_l_11_47 = AND _l_9_49 _l_10_48
-_l_14_31 = CONCAT _l_11_47 _l_14_44
-_l_10_35 = SELECT 0 _l_13_19
-_l_9_36 = SELECT 0 _l_12_20
-_l_11_34 = AND _l_9_36 _l_10_35
-_l_14_18 = CONCAT _l_11_34 _l_14_31
-_l_10_22 = SELECT 0 c
-_l_9_23 = SELECT 0 o
-_l_11_21 = AND _l_9_23 _l_10_22
-_l_16 = CONCAT _l_11_21 _l_14_18
-