From 7950298bf80fd1d1f311e7bd4f75b442df7c679c Mon Sep 17 00:00:00 2001
From: Alex AUVOLAT <alex.auvolat@ens.fr>
Date: Mon, 4 Nov 2013 23:47:56 +0100
Subject: C simulator quite completed.

---
 sched/test/ram.mj  | 2 +-
 sched/test/ram.net | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'sched/test')

diff --git a/sched/test/ram.mj b/sched/test/ram.mj
index 7c4d1ed..5bd4f29 100644
--- a/sched/test/ram.mj
+++ b/sched/test/ram.mj
@@ -5,7 +5,7 @@ or_n<n>(a:[n],b:[n]) = (o:[n]) where
   if n = 0 then
     o = []
   else
-    o = (a[0] and b[0]).(or_n<n-1>(a[1..], b[1..]))
+    o = (a[0] or b[0]).(or_n<n-1>(a[1..], b[1..]))
   end if
 end where
 
diff --git a/sched/test/ram.net b/sched/test/ram.net
index ee4570a..56f2fc6 100644
--- a/sched/test/ram.net
+++ b/sched/test/ram.net
@@ -10,23 +10,23 @@ 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 = AND _l_9_23 _l_10_22
+_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 = AND _l_9_36 _l_10_35
+_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 = AND _l_9_49 _l_10_48
+_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 = AND _l_9_62 _l_10_61
+_l_11_60 = OR _l_9_62 _l_10_61
 
-- 
cgit v1.2.3