Changeset 55 for sources/test_regression/09092005b

Timestamp:

May 28, 2013, 11:17:14 AM (11 years ago)

Author:

meunier

Message:

Tried to clean the test_regression directory:

• Code formatting
• Supressed warnings
• Made comprehensible outputs
• Factorized Makefiles

There's still a lot to do (many tests don't pass for either good or bad reasons)

Location:

sources/test_regression/09092005b

Files:

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

sources/test_regression/09092005b/Makefile

@@ -1 +1 @@
 include ../env.mk
-
-SYSTEM    = system.cpp
-EXE_SCASS = $(SYSTEM:.cpp=_systemcass.x)
-EXE_SC    = $(SYSTEM:.cpp=_systemc.x)
-EXE       = ${EXE_SCASS} ${EXE_SC}
-LOG       = $(SYSTEM:.cpp=.log)
-OBJECTS   = $(EXE:.x=.o)
-LINKS     = $(OBJECTS:.o=.cpp)
-
-.SECONDARY:
-
-main : $(EXE) 
+include ../Makefile.common
 
 test : $(EXE_SCASS)
-        ./system_systemcass.x || eval ${failcom} ; \
-        tail -n +8 trace_file.vcd | diff trace_file_reference.vcd - || eval ${failcom}
+        @echo -ne "| Testing $$(basename $$(pwd)): " ; \
+        ./$(EXE_SCASS) 2> /dev/null ;
+        @if tail -n +8 trace_file.vcd | diff trace_file_reference.vcd - ; then \
+                echo "OK" ; \
+        else \
+                echo "KO" ; \
+        fi ;
 
-%.gif : %.dot
-        dot -Tgif -o $*.gif $*.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 ${LOG}
-        -rm -f signal_order.txt module_order.dot signal_graph.dot
-        -rm -f module_order.gif signal_graph.gif
-        -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 trace_file.vcd
-        

sources/test_regression/09092005b/system.cpp

@@ +1 @@
+
 #include "systemc.h"
 
-#define ASSERT(x) \
-  { errnum++; \
-    if (!(x)) \
-    { \
-    cerr << "ASSERT : " #x "\n"; \
-    exit (errnum); \
-    } \
-  }
+#include "test.h"
 
 using namespace std;
 
-struct hard : sc_module
-{
-  sc_in_clk    clk;
-  sc_in <int>  i1, i2;
-  sc_out<int>  o1, o2;
+struct hard : sc_module {
+    sc_in_clk clk;
+    sc_in <int> i1, i2;
+    sc_out<int> o1, o2;
 
-  void f ()
-  {
-    o1 = i1;
-    o2 = i2;
-  }
+    void f() {
+        o1 = i1;
+        o2 = i2;
+    }
 
-  SC_HAS_PROCESS(hard);
-  hard(sc_module_name)
-  {
-    SC_METHOD(f);
-    dont_initialize();
-    sensitive << i1 << i2;
+    SC_HAS_PROCESS(hard);
+
+    hard(sc_module_name) {
+        SC_METHOD(f);
+        sensitive << i1 << i2;
+        dont_initialize();
+
 #ifdef SYSTEMCASS_SPECIFIC
-    o1 (i1);
-    o2 (i2);
+        o1 (i1);
+        o2 (i2);
 #endif
-  }
+    }
+
 };
 
-int
-sc_main (int argc, char ** argv)
-{
-  sc_clock        clk1("clk1");
-  sc_clock        clk2("clk2", 1, 0.5, 0, false);
-  sc_signal<int>  s[10];
-  hard a("a");
-  hard b("b");
-  hard c("c");
 
-  a.clk (clk1);
-  b.clk (clk2);
-  c.clk (clk2);
+int sc_main (int argc, char ** argv) {
+    sc_clock clk1("clk1");
+    sc_clock clk2("clk2", 1, 0.5, 0, false);
+    sc_signal<int> s[10];
+    hard a("a");
+    hard b("b");
+    hard c("c");
 
-  a.i1 (s[0]);
+    a.clk(clk1);
+    b.clk(clk2);
+    c.clk(clk2);
 
-  a.o1 (s[1]);
-  b.i1 (s[1]);
+    a.i1(s[0]);
 
-  b.o1 (s[2]);
+    a.o1(s[1]);
+    b.i1(s[1]);
 
-  b.i2 (s[3]);
+    b.o1(s[2]);
 
-  b.o2 (s[4]);
-  a.i2 (s[4]);
+    b.i2(s[3]);
 
-  a.o2 (s[5]);
+    b.o2(s[4]);
+    a.i2(s[4]);
 
-  c.i1 (s[6]);
-  c.o1 (s[7]);
-  c.i2 (s[8]);
-  c.o2 (s[9]);
+    a.o2(s[5]);
 
-        /* Open trace file */
-        sc_trace_file *system_trace_file;
-        system_trace_file = sc_create_vcd_trace_file ("trace_file");
-        
-        /* clks waveforms are always useful */
-        sc_trace(system_trace_file, clk1, "clk1");
-        sc_trace(system_trace_file, clk2, "clk2");
+    c.i1(s[6]);
+    c.o1(s[7]);
+    c.i2(s[8]);
+    c.o2(s[9]);
 
-  /* others signals */ 
-  for (int i = 0; i < 10; ++i)
-    sc_trace(system_trace_file, s[i], sc_gen_unique_name ("s"));
- 
-  /* initilization */
-  sc_initialize ();
+    /* Open trace file */
+    sc_trace_file *system_trace_file;
+    system_trace_file = sc_create_vcd_trace_file("trace_file");
 
-  s[0] = 1;
-  s[3] = 1;
+    /* clks waveforms are always useful */
+    sc_trace(system_trace_file, clk1, "clk1");
+    sc_trace(system_trace_file, clk2, "clk2");
 
-  sc_start (1);
+    /* others signals */ 
+    for (int i = 0; i < 10; ++i) {
+        sc_trace(system_trace_file, s[i], sc_gen_unique_name ("s"));
+    }
 
-  s[0] = 123;
-  s[3] = 321;
+    /* initilization */
+    sc_start(sc_time(0, sc_core::SC_NS));
 
-  sc_start (1);
+    s[0] = 1;
+    s[3] = 1;
 
-  return 0;
+    sc_start(sc_time(1, sc_core::SC_NS));
+
+    s[0] = 123;
+    s[3] = 321;
+
+    sc_start(sc_time(1, sc_core::SC_NS));
+
+    return 0;
 }
 
+
+/*
+# 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
+*/
+