Index: sources/test_regression/16022007/Makefile
===================================================================
--- sources/test_regression/16022007/Makefile	(revision 15)
+++ sources/test_regression/16022007/Makefile	(revision 55)
@@ -1,54 +1,14 @@
+
 include ../env.mk
+include ../Makefile.common
 
-EXE_SCASS = system_systemcass.x
-EXE_SC    = system_systemc.x
-EXE       = ${EXE_SCASS} ${EXE_SC}
-OBJECTS   = $(EXE:.x=.o)
-LINKS     = $(OBJECTS:.o=.cpp)
 
-.SECONDARY:
+test : all
+	@echo -ne "| Testing $$(basename $$(pwd)): " ;
+	@./$(EXE_SCASS) > $(LOG_SCASS) 2> /dev/null
+	@./$(EXE_SC) > $(LOG_SC) 2> /dev/null
+	@if diff $(LOG_SC) $(LOG_SCASS) > /dev/null ; then \
+    echo "OK" ; \
+    else echo "KO" ; \
+    fi ;
 
-main : $(EXE) 
-
-test : ${EXE}
-	((./system_systemcass.x 3 ) 2>&1 | grep "Cycle Accurate System Simulator") || eval ${failcom}
-	(./system_systemcass.x --nobanner 3 ) 2>&1 | grep "Cycle Accurate System Simulator" ; \
-  if [ $$? -ne 1 ] ; then eval ${failcom} ; fi
-	@echo Test OK.
-
-%.png : %.dot
-	dot -Tpng -o $*.png $*.dot
-
-%_systemc.x : %_systemc.o $(SYSTEMC_LIB)
-	$(CXX) -o $@ $*_systemc.o $(LFLAGS_SYSTEMC) 2>&1 | $(CPPFILT)
-
-%_systemcass.x : %_systemcass.o  $(SYSTEMCASS_LIB)
-	$(CXX) -o $@ $*_systemcass.o $(LFLAGS_SYSTEMCASS) 2>&1 | $(CPPFILT)
-
--include Makefile.deps
-
-%_systemc.cpp : %.cpp 
-	ln -s $*.cpp $*_systemc.cpp
-
-%_systemcass.cpp : %.cpp 
-	ln -s $*.cpp $*_systemcass.cpp
-
-%_systemc.o : %_systemc.cpp 
-	$(CXX) $(CFLAGS_SYSTEMC) -MM $*_systemc.cpp >> Makefile.deps
-	$(CXX) $(CFLAGS_SYSTEMC) -c $*_systemc.cpp -o $*_systemc.o
-
-%_systemcass.o : %_systemcass.cpp
-	$(CXX) $(CFLAGS_SYSTEMCASS) -MM $*_systemcass.cpp >> Makefile.deps
-	$(CXX) $(CFLAGS_SYSTEMCASS) -c $*_systemcass.cpp -o $*_systemcass.o
-
-clean :
-	rm -f Makefile.deps
-	-rm -f *.o gmon.out
-	-rm -f signal_order.txt module_order.dot signal_graph.dot port_graph.dot
-	-rm -f module_graph.dot process_order.dot
-	-rm -f $(EXE) $(OBJECTS) 
-	-for i in $(LINKS) ; do unlink $$i ; done 2> /dev/null
-	-rm -f core*
-	-rm -rf generated_by_systemcass
-	-rm -rf tracesystem_systemcass.x.vcd tracesystem_systemc.x.vcd
-	
Index: sources/test_regression/16022007/system.cpp
===================================================================
--- sources/test_regression/16022007/system.cpp	(revision 15)
+++ sources/test_regression/16022007/system.cpp	(revision 55)
@@ -1,264 +1,305 @@
-#include <systemc.h>
+
 #include <signal.h>
 
+#include "systemc.h"
+#include "test.h"
+
+// QM : je pense que le test n'est pas bon : il est a priori normal que l'ordre et le nombre d'appels aux fonctions diffÚrent entre SC et SCASS
+
 using namespace std;
-	
+
+
 struct M_0i1o : sc_module {
-	sc_in_clk                       clk;
-	sc_out<bool>                    o1;
-
-	void eval () {
-    o1 = (rand()%2) == 0;
-    printf ("M_0i1o::eval ()\n");
-	}
-
-	SC_CTOR (M_0i1o) : clk ("clk"), o1("o1") {
-		SC_METHOD(eval);
-		sensitive << clk.neg();
-	};
+    sc_in_clk clk;
+    sc_out<bool> o1;
+
+    void eval() {
+        o1 = (rand() % 2) == 0;
+        printf("M_0i1o::eval ()\n");
+    }
+
+    SC_CTOR (M_0i1o) : clk("clk"), o1("o1") {
+        SC_METHOD(eval);
+        sensitive << clk.neg();
+        dont_initialize();
+    }
+
 };
 
 struct M_1i1o : sc_module {
-	sc_in_clk                       clk;
-	sc_in<bool>                     i1;
-	sc_out<bool>                    o1;
-
-	void eval1 () {
-    o1 = ~i1;
-    printf ("M_1i1o::eval1 ()\n");
-	}
-
-	SC_CTOR (M_1i1o) : clk ("clk"), i1 ("i1"), o1("o1") {
-		SC_METHOD(eval1);
-		sensitive << clk.neg();
-		sensitive << i1;
-	};
+    sc_in_clk clk;
+    sc_in<bool> i1;
+    sc_out<bool> o1;
+
+    void eval1() {
+        o1 = ~i1;
+        printf("M_1i1o::eval1 ()\n");
+    }
+
+    SC_CTOR (M_1i1o) : clk("clk"), i1("i1"), o1("o1") {
+        SC_METHOD(eval1);
+        sensitive << clk.neg();
+        sensitive << i1;
+        dont_initialize();
+    }
+
 };
 
 
 struct M_2i2o : sc_module {
-	sc_in_clk                       clk;
-	sc_in<bool>                     i1;
-	sc_in<bool>                     i2;
-	sc_out<bool>                    o1;
-	sc_out<bool>                    o2;
-
-	void eval1 () {
-    o1 = ~i1;
-    printf ("M_2i2o::eval1 ()\n");
-	}
-	void eval2 () {
-    o2 = ~i2;
-    printf ("M_2i2o::eval2 ()\n");
-	}
-
-	SC_CTOR (M_2i2o) : clk ("clk"), i1 ("i1"), o1("o1"), i2 ("i2"), o2 ("o2") {
-		SC_METHOD(eval1);
-		sensitive << clk.neg();
-		sensitive << i1;
-		SC_METHOD(eval2);
-		sensitive << clk.neg();
-		sensitive << i2;
-	};
-};
+    sc_in_clk clk;
+    sc_in<bool> i1;
+    sc_in<bool> i2;
+    sc_out<bool> o1;
+    sc_out<bool> o2;
+
+    void eval1() {
+        o1 = ~i1;
+        printf("M_2i2o::eval1 ()\n");
+    }
+
+    void eval2() {
+        o2 = ~i2;
+        printf("M_2i2o::eval2 ()\n");
+    }
+
+    SC_CTOR (M_2i2o) : clk("clk"), i1("i1"), i2("i2"), o1("o1"), o2("o2") {
+        SC_METHOD(eval1);
+        sensitive << clk.neg();
+        sensitive << i1;
+        dont_initialize();
+
+        SC_METHOD(eval2);
+        sensitive << clk.neg();
+        sensitive << i2;
+        dont_initialize();
+    }
+
+};
+
 
 struct M_4i2o : sc_module {
-	sc_in_clk                       clk;
-	sc_in<bool>                     i1;
-	sc_in<bool>                     i2;
-	sc_in<bool>                     i3;
-	sc_in<bool>                     i4;
-	sc_out<bool>                    o1;
-	sc_out<bool>                    o2;
-
-	void eval1 () {
-    o1 = ~i1;
-    printf ("M_4i2o::eval1 ()\n");
-	}
-	void eval2 () {
-    o2 = ~i2;
-    printf ("M_4i2o::eval2 ()\n");
-	}
-  void eval3 () {
-    cout << i3 << i4 << "\n";
-    printf ("M_4i2o::eval3 ()\n");
-  }
-
-	SC_CTOR (M_4i2o) : clk ("clk"), i1 ("i1"), o1("o1"), i2 ("i2"), o2 ("o2"),
-i3 ("i3"), i4 ("i4") {
-		SC_METHOD(eval1);
-		sensitive << clk.neg();
-		sensitive << i1;
-		SC_METHOD(eval2);
-		sensitive << clk.neg();
-		sensitive << i2;
-		SC_METHOD(eval3);
-		sensitive << clk.pos();
-	};
-};
+    sc_in_clk clk;
+    sc_in<bool> i1;
+    sc_in<bool> i2;
+    sc_in<bool> i3;
+    sc_in<bool> i4;
+    sc_out<bool> o1;
+    sc_out<bool> o2;
+
+    void eval1() {
+        o1 = ~i1;
+        printf("M_4i2o::eval1 ()\n");
+    }
+
+    void eval2() {
+        o2 = ~i2;
+        printf("M_4i2o::eval2 ()\n");
+    }
+
+    void eval3() {
+        cout << i3 << i4 << "\n";
+        printf("M_4i2o::eval3 ()\n");
+    }
+
+    SC_CTOR (M_4i2o) : clk ("clk"), i1("i1"), i2("i2"), i3("i3"), i4("i4"),
+    o1("o1"), o2("o2") {
+        SC_METHOD(eval1);
+        sensitive << clk.neg();
+        sensitive << i1;
+        dont_initialize();
+
+        SC_METHOD(eval2);
+        sensitive << clk.neg();
+        sensitive << i2;
+        dont_initialize();
+
+        SC_METHOD(eval3);
+        sensitive << clk.pos();
+        dont_initialize();
+    }
+
+};
+
 
 struct M_4i3o : sc_module {
-	sc_in_clk                       clk;
-	sc_in<bool>                     i1;
-	sc_in<bool>                     i2;
-	sc_in<bool>                     i3;
-	sc_in<bool>                     i4;
-	sc_out<bool>                    o1;
-	sc_out<bool>                    o2;
-	sc_out<bool>                    o3;
-
-	void eval1 () {
-    o1 = ~i1;
-    printf ("M_4i3o::eval1 ()\n");
-	}
-	void eval2 () {
-    o2 = ~i2;
-    printf ("M_4i3o::eval2 ()\n");
-	}
-  void eval3 () {
-    o3 = ~i3;
-    printf ("M_4i3o::eval3 ()\n");
-  }
-  void eval4 () {
-    cout << i4 << "\n";
-  }
-
-	SC_CTOR (M_4i3o) : clk ("clk"), i1 ("i1"), o1("o1"), i2 ("i2"), o2 ("o2"), i3 ("i3"), i4 ("i4"), o3 ("o3") {
-		SC_METHOD(eval1);
-		sensitive << clk.neg();
-		sensitive << i1;
-		SC_METHOD(eval4);
-		sensitive << clk.pos();
-		// sensitive << i4;
-		SC_METHOD(eval3);
-		sensitive << clk.neg();
-		sensitive << i3;
+    sc_in_clk clk;
+    sc_in<bool> i1;
+    sc_in<bool> i2;
+    sc_in<bool> i3;
+    sc_in<bool> i4;
+    sc_out<bool> o1;
+    sc_out<bool> o2;
+    sc_out<bool> o3;
+
+    void eval1() {
+        o1 = ~i1;
+        printf("M_4i3o::eval1 ()\n");
+    }
+
+    void eval2() {
+        o2 = ~i2;
+        printf("M_4i3o::eval2 ()\n");
+    }
+
+    void eval3() {
+        o3 = ~i3;
+        printf("M_4i3o::eval3 ()\n");
+    }
+
+    void eval4() {
+        cout << i4 << "\n";
+    }
+
+    SC_CTOR (M_4i3o) : clk("clk"), i1("i1"), i2("i2"), i3("i3"), i4("i4"), o1("o1"), o2("o2"), o3("o3") {
+        SC_METHOD(eval1);
+        sensitive << clk.neg();
+        sensitive << i1;
+        dont_initialize();
+
+        SC_METHOD(eval4);
+        sensitive << clk.pos();
+        dont_initialize();
+
+        SC_METHOD(eval3);
+        sensitive << clk.neg();
+        sensitive << i3;
+        dont_initialize();
 #ifdef SYSTEMCASS_SPECIFIC
-		o3(i3);
+        o3(i3);
 #endif
-		SC_METHOD(eval2);
-		sensitive << clk.neg();
-		sensitive << i2;
-	};
-};
+        SC_METHOD(eval2);
+        sensitive << clk.neg();
+        sensitive << i2;
+        dont_initialize();
+    }
+
+};
+
 
 struct M_1i0o : sc_module {
-	sc_in_clk                       clk;
-	sc_in<bool>                     i1;
-
-	void eval1 () {
-    cout << i1.read() << "\n";
-    printf ("M_1i0o::eval1 ()\n");
-	}
-
-	SC_CTOR (M_1i0o) : clk ("clk"), i1 ("i1") {
-		SC_METHOD(eval1);
-		sensitive << clk.pos();
-		// sensitive << i1;
-	};
-};
-
-int sc_main (int argc, char *argv[])
-{
-	sc_clock                     signal_clk("my_clock",1, 0.5);
-	sc_signal<bool>              s1 ("s01"),
-                               s2 ("s02"),
-                               s3 ("s03"),
-                               s4 ("s04"),
-                               s5 ("s05"),
-                               s6 ("s06"),
-                               s7 ("s07"),
-                               s8 ("s08"),
-                               s9 ("s09"),
-                               s10("s10"),
-                               s11("s11"),
-                               s12("s12"),
-                               s13("s13"),
-                               s14("s14"),
-                               s15("s15");
-                               
-
-	M_0i1o      a("a");
-	M_4i2o      b("b");
-	M_1i1o      c("c");
-	M_4i3o      d("d");
-	M_1i1o      e("e");
-	M_1i1o      f("f");
-	M_2i2o      g("g");
-	M_1i1o      h("h");
-	M_1i0o      i("i");
-	M_0i1o      j("j");
-	M_0i1o      k("k");
-	M_0i1o      l("l");
-	
-	a.clk         (signal_clk);
-	b.clk         (signal_clk);
-	c.clk         (signal_clk);
-	d.clk         (signal_clk);
-	e.clk         (signal_clk);
-	f.clk         (signal_clk);
-	g.clk         (signal_clk);
-	h.clk         (signal_clk);
-	i.clk         (signal_clk);
-	j.clk         (signal_clk);
-	k.clk         (signal_clk);
-	l.clk         (signal_clk);
-	
-	a.o1          (s1);
-	b.i1          (s1);
-		
-	b.o2          (s2);
-	c.i1          (s2);
-
-	c.o1          (s3);
-	d.i1          (s3);
-	
-	d.o1          (s4);
-	b.i3          (s4);
-	
-	d.o2          (s5);
-	b.i4          (s5);
-	
-	b.o1          (s6);
-	e.i1          (s6);
-	
-	e.o1          (s7);
-	f.i1          (s7);
-	
-	f.o1          (s8);
-	b.i2          (s8);
-	
-	d.o3          (s9);
-	g.i1          (s9);
-	
-	g.o1          (s10);
-	h.i1          (s10);
-	
-	h.o1          (s11);
-	d.i4          (s11);
-	
-	j.o1          (s12);
-	g.i2          (s12);
-	
-	g.o2          (s13);
-	i.i1          (s13);	
-	
-	l.o1          (s14);
-	d.i3          (s14);
-	
-	k.o1          (s15);
-	d.i2          (s15);
-
-	// Init & run
-	sc_initialize ();
-
-  if (argc == 1)
-  {
-    cout << "Usage :\n" << argv[0] << " [#cycles]\n";
-    return 1;
-  }
-
-  sc_start (atoi(argv[1]));
-
-	return EXIT_SUCCESS;
+    sc_in_clk clk;
+    sc_in<bool> i1;
+
+    void eval1() {
+        cout << i1.read() << "\n";
+        printf("M_1i0o::eval1 ()\n");
+    }
+
+    SC_CTOR (M_1i0o) : clk("clk"), i1("i1") {
+        SC_METHOD(eval1);
+        sensitive << clk.pos();
+        dont_initialize();
+    }
+};
+
+
+int sc_main (int argc, char * argv[]) {
+    sc_clock signal_clk("my_clock");
+    sc_signal<bool> s1("s01"),
+        s2 ("s02"),
+        s3 ("s03"),
+        s4 ("s04"),
+        s5 ("s05"),
+        s6 ("s06"),
+        s7 ("s07"),
+        s8 ("s08"),
+        s9 ("s09"),
+        s10("s10"),
+        s11("s11"),
+        s12("s12"),
+        s13("s13"),
+        s14("s14"),
+        s15("s15");
+
+
+    M_0i1o a("a");
+    M_4i2o b("b");
+    M_1i1o c("c");
+    M_4i3o d("d");
+    M_1i1o e("e");
+    M_1i1o f("f");
+    M_2i2o g("g");
+    M_1i1o h("h");
+    M_1i0o i("i");
+    M_0i1o j("j");
+    M_0i1o k("k");
+    M_0i1o l("l");
+
+    a.clk(signal_clk);
+    b.clk(signal_clk);
+    c.clk(signal_clk);
+    d.clk(signal_clk);
+    e.clk(signal_clk);
+    f.clk(signal_clk);
+    g.clk(signal_clk);
+    h.clk(signal_clk);
+    i.clk(signal_clk);
+    j.clk(signal_clk);
+    k.clk(signal_clk);
+    l.clk(signal_clk);
+
+    a.o1(s1);
+    b.i1(s1);
+
+    b.o2(s2);
+    c.i1(s2);
+
+    c.o1(s3);
+    d.i1(s3);
+
+    d.o1(s4);
+    b.i3(s4);
+
+    d.o2(s5);
+    b.i4(s5);
+
+    b.o1(s6);
+    e.i1(s6);
+
+    e.o1(s7);
+    f.i1(s7);
+
+    f.o1(s8);
+    b.i2(s8);
+
+    d.o3(s9);
+    g.i1(s9);
+
+    g.o1(s10);
+    h.i1(s10);
+
+    h.o1(s11);
+    d.i4(s11);
+
+    j.o1(s12);
+    g.i2(s12);
+
+    g.o2(s13);
+    i.i1(s13);	
+
+    l.o1(s14);
+    d.i3(s14);
+
+    k.o1(s15);
+    d.i2(s15);
+
+    // Init & run
+    sc_start(sc_time(0, sc_core::SC_NS));
+
+    sc_start(sc_time(3, sc_core::SC_NS));
+
+    return EXIT_SUCCESS;
 }
+
+/*
+# Local Variables:
+# tab-width: 4;
+# c-basic-offset: 4;
+# c-file-offsets:((innamespace . 0)(inline-open . 0));
+# indent-tabs-mode: nil;
+# End:
+#
+# vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=4:softtabstop=4
+*/
+