Index: sources/test_regression/05042006/system.cpp
===================================================================
--- sources/test_regression/05042006/system.cpp	(revision 34)
+++ sources/test_regression/05042006/system.cpp	(revision 35)
@@ -1,17 +1,8 @@
 #include <systemc.h>
-
-#define ASSERT(x) \
-  { errnum++; \
-    if (!(x)) \
-    { \
-    cerr << "ASSERT : " #x "\n"; \
-    exit (errnum); \
-    } \
-  }
 
 using namespace std;
 
 struct test : sc_module {
-	sc_in_clk                       clk;
+  sc_in_clk                       clk;
   sc_in<int>                      i1;
   sc_out<int>                     o1;
@@ -36,5 +27,5 @@
 
   SC_HAS_PROCESS(test);
-	test (sc_module_name n) : sc_module (n),
+  test (sc_module_name n) : sc_module (n),
     clk("clk"),
     i1("i1"), 
@@ -44,17 +35,16 @@
     reg2("reg2")
   {
-		SC_METHOD(trans);
-		sensitive << clk.pos();
+    SC_METHOD(trans);
+    sensitive << clk.pos();
     dont_initialize();
-		SC_METHOD(gen);
-		sensitive << clk.neg();
+    SC_METHOD(gen);
+    sensitive << clk.neg();
     dont_initialize();
-	};
+  };
 };
 
 int sc_main (int argc, char *argv[])
 {
-  int errnum = 0;
-	sc_clock        signal_clk("my_clock",1, 0.5);
+  sc_clock        signal_clk("my_clock",1, 0.5);
   sc_signal<int>     s01("s01");
   sc_signal<int>     s02("s02");
@@ -67,10 +57,10 @@
   test1.o2 (s03);
 
-	// Init & run
-	sc_start (0);
+  // Init & run
+  sc_start (0);
 
   sc_start (10);
 
-	return EXIT_SUCCESS;
+  return EXIT_SUCCESS;
 }
 
Index: sources/test_regression/07122006/system2.cpp
===================================================================
--- sources/test_regression/07122006/system2.cpp	(revision 34)
+++ sources/test_regression/07122006/system2.cpp	(revision 35)
@@ -34,5 +34,5 @@
   sc_signal<int>  reg;
 
-  void transition ();
+  virtual void transition ();
   void gen_moore  ();
   void gen_mealy  ();
@@ -89,4 +89,4 @@
 
   cout << "Test OK.\n";
-	return EXIT_SUCCESS;
+  return EXIT_SUCCESS;
 }
Index: sources/test_regression/16112005/system.cpp
===================================================================
--- sources/test_regression/16112005/system.cpp	(revision 34)
+++ sources/test_regression/16112005/system.cpp	(revision 35)
@@ -1,3 +1,3 @@
-#include "systemc.h"
+#include <systemc.h>
 #include <iostream>
 #include <string>
@@ -20,7 +20,7 @@
   sc_in<int>     i;
   sc_out<int>    o;
-	internal_model (sc_module_name n) : sc_module (n),
+  internal_model (sc_module_name n) : sc_module (n),
     i("i"),
-		o("o")
+    o("o")
   {
   }
@@ -31,10 +31,11 @@
   sc_in<int>     i1, i2, i3;
   sc_out<int>    o1, o2, o3;
-	sc_signal<int> r1, r2;
+  sc_signal<int> r1, r2;
   internal_model internal;
-	model (sc_module_name n) : sc_module (n),
+
+  model (sc_module_name n) : sc_module (n),
     i1("i1"), i2("i2"), i3("i3"),
-		o1("o1"), o2("o2"), o3("o3"),
-		r1("r1"), r2("r2"),
+    o1("o1"), o2("o2"), o3("o3"),
+    r1("r1"), r2("r2"),
     internal ("internal")
   {
Index: sources/test_regression/16122005/system.cpp
===================================================================
--- sources/test_regression/16122005/system.cpp	(revision 34)
+++ sources/test_regression/16122005/system.cpp	(revision 35)
@@ -1,3 +1,3 @@
-#include "systemc.h"
+#include <systemc.h>
 #include <iostream>
 #include <fstream>
Index: sources/test_regression/17032005/Makefile
===================================================================
--- sources/test_regression/17032005/Makefile	(revision 34)
+++ sources/test_regression/17032005/Makefile	(revision 35)
@@ -14,5 +14,5 @@
 
 system-23.vcd : system_systemcass.x
-	./system_systemcass.x system 23
+	./system_systemcass.x --nodynamiclink system 23
 	tail -n +8 system.vcd > system-23.vcd
 	rm system.vcd
Index: sources/test_regression/17032005/system.cpp
===================================================================
--- sources/test_regression/17032005/system.cpp	(revision 34)
+++ sources/test_regression/17032005/system.cpp	(revision 35)
@@ -20,8 +20,8 @@
   sc_in<bool>     clk;
   sc_in<bool>     resetn;
-	sc_signal<sc_uint<6>     > ui6;
-	sc_signal<sc_uint<16>    > ui16;
-	sc_signal<sc_uint<31>    > ui31;
-	sc_signal<sc_uint<32>    > ui32;
+  sc_signal<sc_uint<6>     > ui6;
+  sc_signal<sc_uint<16>    > ui16;
+  sc_signal<sc_uint<31>    > ui31;
+  sc_signal<sc_uint<32>    > ui32;
   sc_signal<sc_uint<64>    > ui64;
   sc_signal<sc_int<6>      > i6;
@@ -45,10 +45,10 @@
       ui31  = 0x100;
       ui32  = 0x211;
-      ui64  = 0xABCF1234;
+      ui64  = 0xABCF1234ULL;
       i6    = 0xF;
       i16   = 0x3F;
       i31   = 0x11112222;
       i32   = 0x43214321;
-      i64   = 0x4444abcd;
+      i64   = 0x4444abcdULL;
 //      bui64 = 0xFFFFFFFF;
 //      bui64b= 0xFFFFFFFF;
@@ -91,6 +91,6 @@
 int sc_main (int argc, char *argv[])
 {
-	int errnum = 1;
-	cout << "Tests ok\n";
+  int errnum = 1;
+  cout << "Tests ok\n";
   sc_clock        clk("clk");
   sc_signal<bool> resetn("resetn");
@@ -100,5 +100,5 @@
   test.resetn (resetn);
   
-	sc_trace_file *tf;
+  sc_trace_file *tf;
 
   if (argc != 3)
@@ -109,5 +109,5 @@
 
   string trace_filename = argv[1];
-	tf = sc_create_vcd_trace_file (trace_filename.c_str());
+  tf = sc_create_vcd_trace_file (trace_filename.c_str());
   sc_trace (tf, test.ui6  , "ui6"  );
   sc_trace (tf, test.ui16 , "ui16" );
@@ -139,6 +139,4 @@
   sc_start (20);
 
-  sc_close_vcd_trace_file (tf);
-
 #if 1
   cout << "0x3f"            << " 0x" << hex << (unsigned int) (sc_uint<6> )test.ui6   << endl;
@@ -148,8 +146,10 @@
 #endif
   cerr << test.ui6.read() << endl;
+
   union t {
     int v1:3;
     int v2;
   };
+
   t t1,t2;
   t1.v1 = 7;
@@ -161,7 +161,8 @@
   ASSERT(test.ui31.read() == 0x100fffff);
   ASSERT(test.ui32.read() == 0x211fffff);
-  long long unsigned int ui64_reference = 0xabcf1234;
+
+  long long unsigned int ui64_reference = 0xabcf1234ULL;
   ui64_reference <<= 20;
-  ui64_reference += 0xfffff;
+  ui64_reference += 0xfffffULL;
 #if 0
   cout << "0xffffffff"      << " 0x" << hex << (int) (sc_int<6>)test.i6    << endl;
@@ -170,14 +171,20 @@
   cout << "0x4444abcdfffff" << " 0x" << hex << (long long signed int) (sc_int<64>)test.i64   << endl;    
 #endif
+
   ASSERT(test.ui64.read() == ui64_reference);
   ASSERT(test.i6.read() == (sc_int<6>)~0);
   ASSERT(test.i31.read() == 0x222fffff);
   ASSERT(test.i32.read() == 0x321fffff)
-  long long signed int i64_reference = 0x4444abcd;
+
+  long long signed int i64_reference = 0x4444abcdULL;
   i64_reference <<= 20;
-  i64_reference += 0xfffff;
+  i64_reference += 0xfffffULL;
   ASSERT(test.i64.read() == i64_reference);
+
 //  cout << "0x4294967315" << " 0x" << hex << test.bui64 << endl;    
   cout << "Test OK.\n";
-	return EXIT_SUCCESS;
+
+  sc_close_vcd_trace_file (tf);
+
+  return EXIT_SUCCESS;
 }
Index: sources/test_regression/25032005/system.cpp
===================================================================
--- sources/test_regression/25032005/system.cpp	(revision 34)
+++ sources/test_regression/25032005/system.cpp	(revision 35)
@@ -4,121 +4,121 @@
 
 using namespace std;
-	
+  
 struct A : sc_module {
-	sc_in_clk                       clk;
-	sc_out<bool>                    o1;
+  sc_in_clk                       clk;
+  sc_out<bool>                    o1;
 
-	void eval () {
+  void eval () {
     o1 = (rand()%2) == 0;
-	}
+  }
 
-	SC_CTOR (A) : clk ("clk"), o1("o1") {
-		SC_METHOD(eval);
-		sensitive << clk.neg();
+  SC_CTOR (A) : clk ("clk"), o1("o1") {
+    SC_METHOD(eval);
+    sensitive << clk.neg();
 #ifdef SYSTEMCASS_SPECIFIC
-//		s1();
+//    s1();
 #endif
-	};
+  };
 };
 
 struct B : sc_module {
-	sc_in_clk                       clk;
-	sc_in<bool>                     i1;
-	sc_in<bool>                     i2;
-	sc_out<bool>                    o1;
-	sc_out<bool>                    o2;
+  sc_in_clk                       clk;
+  sc_in<bool>                     i1;
+  sc_in<bool>                     i2;
+  sc_out<bool>                    o1;
+  sc_out<bool>                    o2;
 
-	void eval1 () {
+  void eval1 () {
     o1 = ~i1;
-	}
-	void eval2 () {
+  }
+  void eval2 () {
     o2 = ~i2;
-	}
+  }
 
-	SC_CTOR (B) : clk ("clk"), i1 ("i1"), o1("o1"), i2 ("i2"), o2 ("o2") {
-		SC_METHOD(eval1);
-		sensitive << clk.neg();
-		sensitive << i1;
+  SC_CTOR (B) : clk ("clk"), i1 ("i1"), o1("o1"), i2 ("i2"), o2 ("o2") {
+    SC_METHOD(eval1);
+    sensitive << clk.neg();
+    sensitive << i1;
 #ifdef SYSTEMCASS_SPECIFIC
-		o1(i1);
+    o1(i1);
 #endif
-		SC_METHOD(eval2);
-		sensitive << clk.neg();
-		sensitive << i2;
+    SC_METHOD(eval2);
+    sensitive << clk.neg();
+    sensitive << i2;
 #ifdef SYSTEMCASS_SPECIFIC
-		o2(i2);
+    o2(i2);
 #endif
-	};
+  };
 };
 
 struct C : sc_module {
-	sc_in_clk                       clk;
-	sc_in<bool>                     i1;
-	sc_in<bool>                     i2;
-	sc_out<bool>                    o1;
+  sc_in_clk                       clk;
+  sc_in<bool>                     i1;
+  sc_in<bool>                     i2;
+  sc_out<bool>                    o1;
 
-	void eval1 () {
+  void eval1 () {
     o1 = i1 ^ i2;
-	}
+  }
 
-	SC_CTOR (C) : clk ("clk"), i1 ("i1"), o1("o1"), i2 ("i2") {
-		SC_METHOD(eval1);
-		sensitive << clk.neg();
-		sensitive << i1 << i2;
+  SC_CTOR (C) : clk ("clk"), i1 ("i1"), o1("o1"), i2 ("i2") {
+    SC_METHOD(eval1);
+    sensitive << clk.neg();
+    sensitive << i1 << i2;
 #ifdef SYSTEMCASS_SPECIFIC
-		o1(i1);
-		o1(i2);
+    o1(i1);
+    o1(i2);
 #endif
-	};
+  };
 };
 
 struct D : sc_module {
-	sc_in_clk                       clk;
-	sc_out<bool>                    o1;
+  sc_in_clk                       clk;
+  sc_out<bool>                    o1;
 
-	void eval () {
+  void eval () {
     o1 = (rand()%2) == 0;
-	}
+  }
 
-	SC_CTOR (D) : clk ("clk"), o1("o1") {
-		SC_METHOD(eval);
-		sensitive << clk.neg();
+  SC_CTOR (D) : clk ("clk"), o1("o1") {
+    SC_METHOD(eval);
+    sensitive << clk.neg();
 #ifdef SYSTEMCASS_SPECIFIC
-//		s1();
+//    s1();
 #endif
-	};
+  };
 };
 
 int sc_main (int argc, char *argv[])
 {
-	sc_clock                     signal_clk("my_clock",1, 0.5);
-	sc_signal<bool>              s1("s1"),s2("s2"),s3("s3"),s4("s4"),s5("s5");
+  sc_clock                     signal_clk("my_clock",1, 0.5);
+  sc_signal<bool>              s1("s1"),s2("s2"),s3("s3"),s4("s4"),s5("s5");
 
-	A      a("a");
-	B      b("b");
-	C      c("c");
-	D      d("d");
-	
-	a.clk         (signal_clk);
-	b.clk         (signal_clk);
-	c.clk         (signal_clk);
-	d.clk         (signal_clk);
-	
-	a.o1          (s1);
-	b.i1          (s1);
-		
-	d.o1          (s2);
-	c.i2          (s2);
+  A      a("a");
+  B      b("b");
+  C      c("c");
+  D      d("d");
+  
+  a.clk         (signal_clk);
+  b.clk         (signal_clk);
+  c.clk         (signal_clk);
+  d.clk         (signal_clk);
+  
+  a.o1          (s1);
+  b.i1          (s1);
+    
+  d.o1          (s2);
+  c.i2          (s2);
 
-	b.o1          (s3);
-	c.i1          (s3);
-	
-	c.o1          (s4);
-	b.i2          (s4);
-	
-	b.o2          (s5);
-	
-	// Init & run
-	sc_initialize ();
+  b.o1          (s3);
+  c.i1          (s3);
+  
+  c.o1          (s4);
+  b.i2          (s4);
+  
+  b.o2          (s5);
+  
+  // Init & run
+  sc_initialize ();
 
   if (argc == 1)
@@ -128,17 +128,17 @@
   }
 
-	chrono_t chrono;
-	chrono.start ();
+  chrono_t chrono;
+  chrono.start ();
 
   sc_start (atoi(argv[1]));
 
-	chrono.stop ();
-	unsigned int t = chrono;
-	cout << "Time elapsed (sec) : " << t << endl;
-	cout << "Cycles done        : " << sc_simulation_time () << endl;
-	cout << "Performance        : " << sc_simulation_time () / t << endl;
-	printf("\nPress <RETURN> to exit simulation.");
-	char buf_ret[2];
-	cin.getline(buf_ret,1);
-	return EXIT_SUCCESS;
+  chrono.stop ();
+  unsigned int t = chrono;
+  cout << "Time elapsed (sec) : " << t << endl;
+  cout << "Cycles done        : " << sc_simulation_time () << endl;
+  cout << "Performance        : " << sc_simulation_time () / t << endl;
+  printf("\nPress <RETURN> to exit simulation.");
+  char buf_ret[2];
+  cin.getline(buf_ret,1);
+  return EXIT_SUCCESS;
 }
Index: sources/test_regression/28102005/system.cpp
===================================================================
--- sources/test_regression/28102005/system.cpp	(revision 34)
+++ sources/test_regression/28102005/system.cpp	(revision 35)
@@ -1,3 +1,3 @@
-#include "systemc.h"
+#include <systemc.h>
 #include <iostream>
 #include <cstring>
Index: sources/test_regression/Makefile
===================================================================
--- sources/test_regression/Makefile	(revision 34)
+++ sources/test_regression/Makefile	(revision 35)
@@ -30,4 +30,5 @@
 # 05042006  : check number of writings into each out port
 #             check reading from an sc_out port
+#             (test check_multiwriting2port option)
 # 02052006  : check sc_uint, sc_int, sc_signal<X> when X is double, char, 
 #             signed int, unsigned int and so on. (little/big endianness test)
@@ -38,5 +39,5 @@
 # 07122006  : check if we can declare an undefined external function as 
 #             a sc_method.
-#             check a virtual method as a sc_method => segmentation fault
+#             check a virtual method as a sc_method
 #             (Unable to check if sc_method is a virtual one)
 # 20122006  : check Petrot's scheduling (CASS, quasi static)
@@ -46,4 +47,6 @@
 # 23032007  : check multiple execution on the same computer
 # 15042009  : check sc_uint operators (==, =, <<=, +=)
+#             in some cases, such as a compairison, the developper has to use
+#             sc_signal<T>::read() method to explicitly read a sc_signal.
 
 ## Uncomment the following variable if you want to compile and run the 
