Index: sources/README =================================================================== --- sources/README (revision 33) +++ sources/README (revision 34) @@ -13,2 +13,11 @@ then make again. +TODO +==== +- Fix some bugs, reported on 64 bits machines. +- testbenches: + * 15042009: in somes cases, the developper has to use "sc_signal::read()" + method to explicitly read a sc_signal. OSCI's SystemC does not + need to call explicitly this method. LRM gives no information + about it. +- simulations using OpenMP capabilities Index: sources/configure.ac =================================================================== --- sources/configure.ac (revision 33) +++ sources/configure.ac (revision 34) @@ -33,6 +33,6 @@ MY_ARG_ENABLE(check_multiwriting2port, [Report if port is written twice], [no]) MY_ARG_ENABLE(check_multiwriting2register, [Report if unconnected signal is written twice], [no]) -MY_ARG_ENABLE(debug, [Enable debugging], [yes]) -MY_ARG_ENABLE(default_runtime_compilation, [Default is to compile scheduling code], [yes]) +MY_ARG_ENABLE(debug, [Enable debugging], [no]) +MY_ARG_ENABLE(default_runtime_compilation, [Compile scheduling code], [no]) # Also set -DNDEBUG when not debugging, this disables assert()s Index: sources/src/Makefile.am =================================================================== --- sources/src/Makefile.am (revision 33) +++ sources/src/Makefile.am (revision 34) @@ -42,5 +42,5 @@ noinst_LTLIBRARIES = libgen_code.la libgen_code_la_SOURCES = gen_code.cc -libgen_code_la_CXXFLAGS=-DGENERATED_MODULE_CFLAGS='"$(CXXFLAGS) -I$(prefix)/include"' $(CXXFLAGS) +libgen_code_la_CXXFLAGS=-DGENERATED_MODULE_CFLAGS='"$(CXXFLAGS) -I$(prefix)/include"' include_HEADERS = alias.h casc.h data_field.h fsm_rules.h global_functions.h internal_ext.h module_hierarchy_ext.h port_dependency_ext.h sc_bigint.h sc_biguint.h sc_bit.h sc_bv.h sc_clock_ext.h sc_event.h sc_fwd.h sc_int.h sc_interface.h sc_localvar.h sc_logic.h sc_lv.h sc_module_ext.h sc_module_name.h sc_nbdefs.h sc_numrep.h sc_object.h sc_pat_trace.h sc_port_ext.h sc_sensitive.h sc_signal.h sc_signed.h sc_string.h sc_time.h sc_trace_ext.h sc_uint.h sc_unit.h sc_unsigned.h sc_vcd_trace.h sc_ver_ext.h serialization_ext.h systemc systemc.h systemcass_version_ext.h Index: sources/test_regression/05042006/Makefile =================================================================== --- sources/test_regression/05042006/Makefile (revision 33) +++ sources/test_regression/05042006/Makefile (revision 34) @@ -50,6 +50,6 @@ %_systemcass.o : %_systemcass.cpp - $(CXX) $(CFLAGS_SYSTEMCASS) -DCHECK_MULTIWRITING2PORT -MM $*_systemcass.cpp >> Makefile.deps - $(CXX) $(CFLAGS_SYSTEMCASS) -DCHECK_MULTIWRITING2PORT -c $*_systemcass.cpp -o $*_systemcass.o + $(CXX) $(CFLAGS_SYSTEMCASS) -DCONFIG_CHECK_MULTIWRITING2PORT -MM $*_systemcass.cpp >> Makefile.deps + $(CXX) $(CFLAGS_SYSTEMCASS) -DCONFIG_CHECK_MULTIWRITING2PORT -c $*_systemcass.cpp -o $*_systemcass.o %_socview.o : %_socview.cpp Index: sources/test_regression/07122006/Makefile =================================================================== --- sources/test_regression/07122006/Makefile (revision 33) +++ sources/test_regression/07122006/Makefile (revision 34) @@ -13,5 +13,6 @@ if [ $$? -ne 0 ] ; then eval ${failcom} ; fi @echo Test OK. - system2.x > /dev/null ; \ + system2.x > /dev/null +# ; \ if [ $$? -ne 139 ] ; then eval ${failcom} ; fi Index: sources/test_regression/07122006/system2.cpp =================================================================== --- sources/test_regression/07122006/system2.cpp (revision 33) +++ sources/test_regression/07122006/system2.cpp (revision 34) @@ -19,4 +19,5 @@ virtual void transition () { + cout << "This function is a virtual one.\n"; }; inner_test(sc_module_name n) @@ -48,5 +49,4 @@ } }; - void test::transition () Index: sources/test_regression/15042009/system3.cpp =================================================================== --- sources/test_regression/15042009/system3.cpp (revision 33) +++ sources/test_regression/15042009/system3.cpp (revision 34) @@ -57,5 +57,6 @@ sig_test = test1.test_be; - ret = (sig_test == test2.test_be); + ret = (sig_test.read() == test2.test_be); /* OK */ + //ret = (sig_test == test2.test_be); /* should be OK but it is not */ if (!ret) return 1; Index: sources/test_regression/19072006/Makefile =================================================================== --- sources/test_regression/19072006/Makefile (revision 33) +++ sources/test_regression/19072006/Makefile (revision 34) @@ -46,6 +46,6 @@ %_systemcass.o : %_systemcass.cpp - $(CXX) $(CFLAGS_SYSTEMCASS) -DCHECK_MULTIWRITING2REGISTER -MM $*_systemcass.cpp >> Makefile.deps - $(CXX) $(CFLAGS_SYSTEMCASS) -DCHECK_MULTIWRITING2REGISTER -c $*_systemcass.cpp -o $*_systemcass.o + $(CXX) $(CFLAGS_SYSTEMCASS) -DCONFIG_CHECK_MULTIWRITING2REGISTER -MM $*_systemcass.cpp >> Makefile.deps + $(CXX) $(CFLAGS_SYSTEMCASS) -DCONFIG_CHECK_MULTIWRITING2REGISTER -c $*_systemcass.cpp -o $*_systemcass.o %_socview.o : %_socview.cpp Index: sources/test_regression/31072006/Makefile =================================================================== --- sources/test_regression/31072006/Makefile (revision 33) +++ sources/test_regression/31072006/Makefile (revision 34) @@ -46,6 +46,6 @@ %_systemcass.o : %_systemcass.cpp - $(CXX) $(CFLAGS_SYSTEMCASS) -DCHECK_MULTIWRITING2PORT -MM $*_systemcass.cpp >> Makefile.deps - $(CXX) $(CFLAGS_SYSTEMCASS) -DCHECK_MULTIWRITING2PORT -c $*_systemcass.cpp -o $*_systemcass.o + $(CXX) $(CFLAGS_SYSTEMCASS) -DCONFIG_CHECK_MULTIWRITING2REGISTER -MM $*_systemcass.cpp >> Makefile.deps + $(CXX) $(CFLAGS_SYSTEMCASS) -DCONFIG_CHECK_MULTIWRITING2REGISTER -c $*_systemcass.cpp -o $*_systemcass.o %_socview.o : %_socview.cpp Index: sources/test_regression/31072006/system_bug.cpp =================================================================== --- sources/test_regression/31072006/system_bug.cpp (revision 33) +++ sources/test_regression/31072006/system_bug.cpp (revision 34) @@ -13,5 +13,5 @@ struct test : sc_module { - int reg; + sc_signal reg; sc_in_clk clk; @@ -19,5 +19,5 @@ sc_out o1; - sc_inout o2; + sc_out o2; void trans () @@ -29,9 +29,9 @@ reg = 0; } + reg = 2; } void gen () { - o2 = 0; o1 = reg; o2 = reg & 1; Index: sources/test_regression/31072006/system_ok.cpp =================================================================== --- sources/test_regression/31072006/system_ok.cpp (revision 33) +++ sources/test_regression/31072006/system_ok.cpp (revision 34) @@ -13,5 +13,5 @@ struct test : sc_module { - int reg; + sc_signal reg; sc_in_clk clk; @@ -44,4 +44,7 @@ sensitive << clk.pos(); dont_initialize(); + SC_METHOD(gen); + sensitive << clk.neg(); + dont_initialize(); }; };