Changeset 35 for sources/test_regression/17032005

Timestamp:

Jun 29, 2009, 6:03:59 PM (15 years ago)

Author:

buchmann

Message:

Code cleanup.

Add --dynamiclink option to systemcass executable.

Location:

sources/test_regression/17032005

Files:

• Makefile (modified) (1 diff)
• system.cpp (modified) (9 diffs)

sources/test_regression/17032005/Makefile

@@ -14 +14 @@
 
 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

sources/test_regression/17032005/system.cpp

@@ -20 +20 @@
   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 +45 @@
       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 +91 @@
 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 +100 @@
   test.resetn (resetn);
   
-        sc_trace_file *tf;
+  sc_trace_file *tf;
 
   if (argc != 3)
@@ -109 +109 @@
 
   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 +139 @@
   sc_start (20);
 
-  sc_close_vcd_trace_file (tf);
-
 #if 1
   cout << "0x3f"            << " 0x" << hex << (unsigned int) (sc_uint<6> )test.ui6   << endl;
@@ -148 +146 @@
 #endif
   cerr << test.ui6.read() << endl;
+
   union t {
     int v1:3;
     int v2;
   };
+
   t t1,t2;
   t1.v1 = 7;
@@ -161 +161 @@
   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 +171 @@
   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;
 }