From a3477f94f061c9d6363ac27d23ff2ac46e0169e1 Mon Sep 17 00:00:00 2001 From: Laurent Maillet-Contoz Date: Wed, 29 Nov 2023 17:09:30 +0100 Subject: [PATCH] update autogenerated files for 3.0.0 public review release --- .gitignore | 83 ----- Makefile.in | 44 +-- aclocal.m4 | 110 +------ config/libtool.m4 | 6 +- configure | 505 +++++++++---------------------- docs/Makefile.in | 17 +- examples/Makefile.in | 4 +- examples/sysc/Makefile.in | 284 ++++++++++------- examples/tlm/Makefile.in | 4 +- examples/tlm/common/Makefile.in | 4 +- src/Makefile.in | 19 +- src/sysc/Makefile.in | 266 ++++++++++------ src/sysc/packages/qt/Makefile.in | 23 +- src/tlm_core/Makefile.in | 15 +- src/tlm_utils/Makefile.in | 15 +- 15 files changed, 559 insertions(+), 840 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 20366a47a..000000000 --- a/.gitignore +++ /dev/null @@ -1,83 +0,0 @@ -# ignore common patterns -.*.sw? -.#* -.DS_Store -*~ -*.exe -*.l[oa] -*.[oa] -*.Plo -*.so - -# ignore autoconf files -/aclocal.m4 -/autom4te.cache/ -/config/compile -# config.guess is patched locally to detect properly -# ppc, ppc64, i386, and x86_64 on Mac OS X -#/config/config.guess -#/config/config.sub -/config/ar-lib -/config/depcomp -/config/distclean -/config/install-sh -/config/libtool.m4 -/config/ltmain.sh -/config/lt~obsolete.m4 -/config/ltoptions.m4 -/config/ltsugar.m4 -/config/ltversion.m4 -/config/missing -/config/mkinstalldirs -/config/test-driver -/configure - -Makefile -Makefile.in - -# ignore recommended build directory and variants -/build*/ -/objdir*/ - -# ignore in-tree installation -/include/ -/lib-*/ - -# ignore MSVC build files -*.suo -*.ncb -*.vcproj.* -*.vcxproj.* -*.old -*.tmp -*.sdf -*.XML -*.opensdf -*.db - -# exception vcsproj filters -!*.vcxproj.filters - -.vs/ -.vscode/ -Release/ -Debug/ -DebugDLL/ -ReleaseDLL/ -_UpgradeReport_Files/ - -#/msvc*/SystemC/SystemC.suo -#/msvc*/SystemC/SystemC.ncb -#/msvc*/SystemC/SystemC.vcproj.* -#/msvc*/SystemC/Release/ -#/msvc*/SystemC/Debug/ -#/msvc*/SystemC/ReleaseDLL/ -#/msvc*/SystemC/DebugDLL/ -#/msvc*/SystemC/_UpgradeReport_Files/ - -.clang-format - -# ignore Doxygen documentation -/docs/*/doxygen/html/ -/docs/*/doxygen/*.tag -/.project diff --git a/Makefile.in b/Makefile.in index 4cf42de1f..644543e6b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -83,11 +83,10 @@ subdir = . DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ $(top_srcdir)/docs/sysc/doxygen/Doxyfile.in \ - $(top_srcdir)/docs/tlm/doxygen/Doxyfile.in AUTHORS ChangeLog \ - INSTALL NEWS README config/ar-lib config/compile \ - config/config.guess config/config.sub config/depcomp \ - config/install-sh config/missing config/ltmain.sh \ - $(top_srcdir)/config/ar-lib $(top_srcdir)/config/compile \ + $(top_srcdir)/docs/tlm/doxygen/Doxyfile.in config/ar-lib \ + config/compile config/config.guess config/config.sub \ + config/depcomp config/install-sh config/missing \ + config/ltmain.sh $(top_srcdir)/config/ar-lib \ $(top_srcdir)/config/config.guess \ $(top_srcdir)/config/config.sub \ $(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \ @@ -388,19 +387,17 @@ top_srcdir = @top_srcdir@ # support local addition of automake macros ACLOCAL_AMFLAGS = -I config SUBDIRS = \ - docs \ src \ examples DOC_FILES = \ - AUTHORS \ + AUTHORS.md \ NOTICE \ - ChangeLog \ - INSTALL \ + CONTRIBUTING.md \ + INSTALL.md \ LICENSE \ - NEWS \ - README \ - RELEASENOTES \ + README.md \ + RELEASENOTES.md \ cmake/INSTALL_USING_CMAKE EXTRA_DIST = \ @@ -414,12 +411,12 @@ EXTRA_DIST = \ cmake/SystemCTLMConfig.cmake.in \ cmake/run_test.cmake \ \ - msvc10/SystemC/SystemC.sln \ - msvc10/SystemC/SystemC.props \ - msvc10/SystemC/SystemC.vcxproj \ - msvc10/SystemC/SystemC.vcxproj.filters \ - msvc10/SystemC/SystemC-core.vcxproj \ - msvc10/SystemC/SystemC-core.vcxproj.filters + msvc16/SystemC/SystemC.sln \ + msvc16/SystemC/SystemC.props \ + msvc16/SystemC/SystemC.vcxproj \ + msvc16/SystemC/SystemC.vcxproj.filters \ + msvc16/SystemC/SystemC-core.vcxproj \ + msvc16/SystemC/SystemC-core.vcxproj.filters @SEPARATE_INSTALL_TREE_TRUE@rootdoc_DATA = \ @SEPARATE_INSTALL_TREE_TRUE@ $(DOC_FILES) @@ -683,16 +680,10 @@ dist-xz: distdir $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 - @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 - @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -923,9 +914,6 @@ uninstall-am: uninstall-rootdocDATA @SEPARATE_INSTALL_TREE_TRUE@ test ! -d "$(docdir)" || rmdir --ignore-fail-on-non-empty "$(docdir)" @SEPARATE_INSTALL_TREE_TRUE@ test ! -d "$(prefix)" || rmdir --ignore-fail-on-non-empty "$(prefix)" -doxygen: - @(cd docs && $(MAKE) $@) - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/aclocal.m4 b/aclocal.m4 index 760325b99..ecf8cd770 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.14 -*- Autoconf -*- +# generated automatically by aclocal 1.13.4 -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. @@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.14' +[am__api_version='1.13' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.14], [], +m4_if([$1], [1.13.4], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.14])dnl +[AM_AUTOMAKE_VERSION([1.13.4])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -76,8 +76,7 @@ AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false]) : ${AR=ar} AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface], - [AC_LANG_PUSH([C]) - am_cv_ar_interface=ar + [am_cv_ar_interface=ar AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])], [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD' AC_TRY_EVAL([am_ar_try]) @@ -94,7 +93,7 @@ AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface], fi rm -f conftest.lib libconftest.a ]) - AC_LANG_POP([C])]) + ]) case $am_cv_ar_interface in ar) @@ -498,12 +497,6 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. -dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. -m4_define([AC_PROG_CC], -m4_defn([AC_PROG_CC]) -[_AM_PROG_CC_C_O -]) - # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -612,48 +605,7 @@ dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl - -# POSIX will say in a future version that running "rm -f" with no argument -# is OK; and we want to be able to make that assumption in our Makefile -# recipes. So use an aggressive probe to check that the usage we want is -# actually supported "in the wild" to an acceptable degree. -# See automake bug#10828. -# To make any issue more visible, cause the running configure to be aborted -# by default if the 'rm' program in use doesn't match our expectations; the -# user can still override this though. -if rm -f && rm -fr && rm -rf; then : OK; else - cat >&2 <<'END' -Oops! - -Your 'rm' program seems unable to run without file operands specified -on the command line, even when the '-f' option is present. This is contrary -to the behaviour of most rm programs out there, and not conforming with -the upcoming POSIX standard: - -Please tell bug-automake@gnu.org about your system, including the value -of your $PATH and any error possibly output before this message. This -can help us improve future automake versions. - -END - if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then - echo 'Configuration will proceed anyway, since you have set the' >&2 - echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 - echo >&2 - else - cat >&2 <<'END' -Aborting the configuration process, to ensure you take notice of the issue. - -You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . - -If you want to complete the configuration process using your problematic -'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM -to "yes", and re-run configure. - -END - AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) - fi -fi]) +]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -661,6 +613,7 @@ dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -842,53 +795,6 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# _AM_PROG_CC_C_O -# --------------- -# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC -# to automatically call this. -AC_DEFUN([_AM_PROG_CC_C_O], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -AC_LANG_PUSH([C])dnl -AC_CACHE_CHECK( - [whether $CC understands -c and -o together], - [am_cv_prog_cc_c_o], - [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) - # Make sure it works both with $CC and with simple cc. - # Following AC_PROG_CC_C_O, we do the test twice because some - # compilers refuse to overwrite an existing .o file with -o, - # though they will create one. - am_cv_prog_cc_c_o=yes - for am_i in 1 2; do - if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ - && test -f conftest2.$ac_objext; then - : OK - else - am_cv_prog_cc_c_o=no - break - fi - done - rm -f core conftest* - unset am_i]) -if test "$am_cv_prog_cc_c_o" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -AC_LANG_POP([C])]) - -# For backward compatibility. -AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) - # Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff --git a/config/libtool.m4 b/config/libtool.m4 index 44e0ecff1..56666f0ec 100644 --- a/config/libtool.m4 +++ b/config/libtool.m4 @@ -2669,10 +2669,14 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on diff --git a/configure b/configure index 28e70df67..0e08db5f0 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for SystemC 2.4.0. +# Generated by GNU Autoconf 2.69 for SystemC 3.0.0. # # Report bugs to . # @@ -590,12 +590,12 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='SystemC' PACKAGE_TARNAME='systemc' -PACKAGE_VERSION='2.4.0' -PACKAGE_STRING='SystemC 2.4.0' +PACKAGE_VERSION='3.0.0' +PACKAGE_STRING='SystemC 3.0.0' PACKAGE_BUGREPORT='http://forums.accellera.org/forum/9-systemc/' PACKAGE_URL='http://accellera.org/' -ac_unique_file="NEWS" +ac_unique_file="README.md" # Factoring default headers for most tests. ac_includes_default="\ #include @@ -663,20 +663,16 @@ QT_ARCH_AARCH64_FALSE QT_ARCH_AARCH64_TRUE QT_ARCH_X86_FALSE QT_ARCH_X86_TRUE +ENABLE_LEGACY_MEM_MGMT_FALSE +ENABLE_LEGACY_MEM_MGMT_TRUE DISABLE_VCD_SCOPES_FALSE DISABLE_VCD_SCOPES_TRUE -ENABLE_CALLBACKS_TRACING_FALSE -ENABLE_CALLBACKS_TRACING_TRUE -ENABLE_CALLBACKS_FALSE -ENABLE_CALLBACKS_TRUE USES_PTHREADS_LIB_FALSE USES_PTHREADS_LIB_TRUE WANT_QT_THREADS_FALSE WANT_QT_THREADS_TRUE WANT_PTHREADS_THREADS_FALSE WANT_PTHREADS_THREADS_TRUE -DISABLE_ASYNC_UPDATES_FALSE -DISABLE_ASYNC_UPDATES_TRUE WANT_OPTIMIZE_FALSE WANT_OPTIMIZE_TRUE WANT_DEBUG_FALSE @@ -837,10 +833,9 @@ with_unix_layout with_arch_suffix enable_debug enable_optimize -enable_async_updates enable_pthreads -enable_phase_callbacks enable_vcd_scopes +enable_legacy_mem_mgmt ' ac_precious_vars='build_alias host_alias @@ -1397,7 +1392,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures SystemC 2.4.0 to adapt to many kinds of systems. +\`configure' configures SystemC 3.0.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1468,7 +1463,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of SystemC 2.4.0:";; + short | recursive ) echo "Configuration of SystemC 3.0.0:";; esac cat <<\_ACEOF @@ -1489,12 +1484,11 @@ Optional Features: --disable-libtool-lock avoid locking (might break parallel builds) --enable-debug include debugging symbols --disable-optimize disable compiler optimization - --disable-async-updates disable request_async_update support --enable-pthreads use POSIX threads for SystemC processes - --enable-phase-callbacks - enable simulation phase callbacks (experimental) - [yes|tracing|no(=default)] --enable-vcd-scopes enable vcd scopes [yes(=default)|no] + --enable-legacy-mem-mgmt + enable legacy memory management for coroutine stack + [yes|no(=default)] Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1591,7 +1585,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -SystemC configure 2.4.0 +SystemC configure 3.0.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1727,6 +1721,73 @@ fi } # ac_fn_c_try_link +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_func + # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES # ------------------------------------------------------- # Tests whether HEADER exists and can be compiled using the include files in @@ -1837,73 +1898,6 @@ fi } # ac_fn_c_try_run -# ac_fn_c_check_func LINENO FUNC VAR -# ---------------------------------- -# Tests whether FUNC exists, setting the cache variable VAR accordingly -ac_fn_c_check_func () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Define $2 to an innocuous variant, in case declares $2. - For example, HP-UX 11i declares gettimeofday. */ -#define $2 innocuous_$2 - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $2 - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $2 (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$2 || defined __stub___$2 -choke me -#endif - -int -main () -{ -return $2 (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_func - # ac_fn_cxx_try_cpp LINENO # ------------------------ # Try to preprocess conftest.$ac_ext, and return whether this succeeded. @@ -1990,7 +1984,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by SystemC $as_me 2.4.0, which was +It was created by SystemC $as_me 3.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2484,7 +2478,7 @@ test -n "$target_alias" && NONENONEs,x,x, && program_prefix=${target_alias}- -am__api_version='1.14' +am__api_version='1.13' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2970,7 +2964,7 @@ fi # Define the identity of the package. PACKAGE='systemc' - VERSION='2.4.0' + VERSION='3.0.0' # Some tools Automake needs. @@ -3097,47 +3091,6 @@ $as_echo "$am_cv_prog_tar_pax" >&6; } -# POSIX will say in a future version that running "rm -f" with no argument -# is OK; and we want to be able to make that assumption in our Makefile -# recipes. So use an aggressive probe to check that the usage we want is -# actually supported "in the wild" to an acceptable degree. -# See automake bug#10828. -# To make any issue more visible, cause the running configure to be aborted -# by default if the 'rm' program in use doesn't match our expectations; the -# user can still override this though. -if rm -f && rm -fr && rm -rf; then : OK; else - cat >&2 <<'END' -Oops! - -Your 'rm' program seems unable to run without file operands specified -on the command line, even when the '-f' option is present. This is contrary -to the behaviour of most rm programs out there, and not conforming with -the upcoming POSIX standard: - -Please tell bug-automake@gnu.org about your system, including the value -of your $PATH and any error possibly output before this message. This -can help us improve future automake versions. - -END - if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then - echo 'Configuration will proceed anyway, since you have set the' >&2 - echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 - echo >&2 - else - cat >&2 <<'END' -Aborting the configuration process, to ensure you take notice of the issue. - -You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . - -If you want to complete the configuration process using your problematic -'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM -to "yes", and re-run configure. - -END - as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 - fi -fi # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : @@ -4467,65 +4420,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 -$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } -if ${am_cv_prog_cc_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF - # Make sure it works both with $CC and with simple cc. - # Following AC_PROG_CC_C_O, we do the test twice because some - # compilers refuse to overwrite an existing .o file with -o, - # though they will create one. - am_cv_prog_cc_c_o=yes - for am_i in 1 2; do - if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 - ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } \ - && test -f conftest2.$ac_objext; then - : OK - else - am_cv_prog_cc_c_o=no - break - fi - done - rm -f core conftest* - unset am_i -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 -$as_echo "$am_cv_prog_cc_c_o" >&6; } -if test "$am_cv_prog_cc_c_o" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -4805,13 +4699,7 @@ $as_echo_n "checking the archiver ($AR) interface... " >&6; } if ${am_cv_ar_interface+:} false; then : $as_echo_n "(cached) " >&6 else - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - am_cv_ar_interface=ar + am_cv_ar_interface=ar cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int some_variable = 0; @@ -4842,11 +4730,6 @@ if ac_fn_c_try_compile "$LINENO"; then : fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5 @@ -5028,9 +4911,13 @@ OPT_CXXFLAGS="-O3" EXPLICIT_LPTHREAD="-lpthread" LDFLAG_RPATH="-Wl,-rpath=" +if test "x$GXX" = xyes; then : + EXTRA_ASFLAGS="-xassembler-with-cpp" +fi + case $target in #( *-apple-*) : - TARGET_ARCH=macosx ;; #( + TARGET_ARCH=macos ;; #( *linux*) : TARGET_ARCH=linux ;; #( *bsd*|*dragonfly*) : @@ -5091,14 +4978,18 @@ fi ;; esac ;; #( - macosx) : + macos) : LDFLAG_RPATH="-Wl,-rpath -Wl," # check CPU architecture case ${target_cpu} in #( x86_64|amd64) : - TARGET_ARCH="${TARGET_ARCH}64" + TARGET_ARCH="${TARGET_ARCH}x64" CPU_ARCH="x86_64" QT_ARCH="x86_64" ;; #( + aarch64|arm64) : + TARGET_ARCH="${TARGET_ARCH}arm64" + CPU_ARCH="arm64" + QT_ARCH="aarch64" ;; #( x*86|i*86) : CPU_ARCH="i386" QT_ARCH="iX86" ;; #( @@ -5109,7 +5000,7 @@ esac powerpc) : TARGET_ARCH="${TARGET_ARCH}ppc" CPU_ARCH="ppc" - QT_ARCH="powerpc-apple-macosx" ;; #( + QT_ARCH="pthreads" ;; #( *) : as_fn_error $? "\"sorry...architecture not supported\"" "$LINENO" 5 ;; esac @@ -5117,7 +5008,7 @@ esac # check compiler if test "x$GXX" = xyes; then : EXTRA_CXXFLAGS="${EXTRA_CXXFLAGS} -arch ${CPU_ARCH}" - EXTRA_ASFLAGS="${EXTRA_ASFLAGS} -arch ${CPU_ARCH} -x assembler" + EXTRA_ASFLAGS="${EXTRA_ASFLAGS} -arch ${CPU_ARCH}" else as_fn_error $? "\"sorry...compiler not supported\"" "$LINENO" 5 fi @@ -5557,6 +5448,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_fn_c_check_func "$LINENO" "posix_memalign" "ac_cv_func_posix_memalign" +if test "x$ac_cv_func_posix_memalign" = xyes; then : + $as_echo "#define SC_HAVE_POSIX_MEMALIGN 1" >>confdefs.h + +fi + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -12090,10 +11987,14 @@ fi # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -15921,10 +15822,14 @@ fi # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -16421,53 +16326,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_optimize" >&5 $as_echo "$enable_optimize" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to add support for asynchronous update requests" >&5 -$as_echo_n "checking whether to add support for asynchronous update requests... " >&6; } -support_async_updates=no -if test x$ax_pthread_ok = xyes; then : - support_async_updates=pthread -elif test x$ax_pthread_ok = xno; then : - case "${TARGET_ARCH}" in #( - mingw*|msvc*) : - support_async_updates=native ;; #( - *) : - ;; -esac -fi -# Check whether --enable-async-updates was given. -if test "${enable_async_updates+set}" = set; then : - enableval=$enable_async_updates; case "${enableval}" in #( - yes) : - if test $support_async_updates = no; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no native/pthread support found, disabled" >&5 -$as_echo "$as_me: WARNING: no native/pthread support found, disabled" >&2;} - enable_async_updates=no - support_async_updates=disabled -fi ;; #( - no) : - support_async_updates=disabled ;; #( - *) : - as_fn_error $? "bad value ${enableval} for --enable-async-updates" "$LINENO" 5 ;; -esac -else - if test ${support_async_updates} != no; then : - enable_async_updates=yes -else - enable_async_updates=no -fi -fi - - if test x"$enable_async_updates" = xno; then - DISABLE_ASYNC_UPDATES_TRUE= - DISABLE_ASYNC_UPDATES_FALSE='#' -else - DISABLE_ASYNC_UPDATES_TRUE='#' - DISABLE_ASYNC_UPDATES_FALSE= -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_async_updates" >&5 -$as_echo "$enable_async_updates" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use POSIX threads for SystemC processes" >&5 $as_echo_n "checking whether to use POSIX threads for SystemC processes... " >&6; } # Check whether --enable-pthreads was given. @@ -16526,7 +16384,7 @@ else fi - if test x"$enable_pthreads" = xyes -o x"$support_async_updates" = xpthread ; then + if test x"$enable_pthreads" = xyes; then USES_PTHREADS_LIB_TRUE= USES_PTHREADS_LIB_FALSE='#' else @@ -16537,43 +16395,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_pthreads" >&5 $as_echo "$enable_pthreads" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable simulation phase callbacks (experimental)" >&5 -$as_echo_n "checking whether to enable simulation phase callbacks (experimental)... " >&6; } -# Check whether --enable-phase-callbacks was given. -if test "${enable_phase_callbacks+set}" = set; then : - enableval=$enable_phase_callbacks; case "${enableval}" in #( - yes) : - enable_phase_callbacks=yes ;; #( - tracing) : - enable_phase_callbacks=tracing ;; #( - no|default) : - enable_phase_callbacks=no ;; #( - *) : - as_fn_error $? "bad value ${enableval} for --enable-phase-callbacks" "$LINENO" 5 ;; -esac -else - enable_phase_callbacks=no -fi - - if test x"$enable_phase_callbacks" = xyes; then - ENABLE_CALLBACKS_TRUE= - ENABLE_CALLBACKS_FALSE='#' -else - ENABLE_CALLBACKS_TRUE='#' - ENABLE_CALLBACKS_FALSE= -fi - - if test x"$enable_phase_callbacks" = xtracing; then - ENABLE_CALLBACKS_TRACING_TRUE= - ENABLE_CALLBACKS_TRACING_FALSE='#' -else - ENABLE_CALLBACKS_TRACING_TRUE='#' - ENABLE_CALLBACKS_TRACING_FALSE= -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_phase_callbacks" >&5 -$as_echo "$enable_phase_callbacks" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable VCD scopes by default" >&5 $as_echo_n "checking whether to enable VCD scopes by default... " >&6; } # Check whether --enable-vcd-scopes was given. @@ -16601,6 +16422,33 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_vcd_scopes" >&5 $as_echo "$enable_vcd_scopes" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable legacy memory managment for allocating coroutine stack" >&5 +$as_echo_n "checking whether to enable legacy memory managment for allocating coroutine stack... " >&6; } +# Check whether --enable-legacy_mem_mgmt was given. +if test "${enable_legacy_mem_mgmt+set}" = set; then : + enableval=$enable_legacy_mem_mgmt; case "${enableval}" in #( + yes) : + enable_legacy_mem_mgmt=yes ;; #( + no|default) : + enable_legacy_mem_mgmt=no ;; #( + *) : + as_fn_error $? "bad value ${enableval} for --enable-legacy-mem-mgmt" "$LINENO" 5 ;; +esac +else + enable_legacy_mem_mgmt=no +fi + + if test x"$enable_legacy_mem_mgmt" = xyes; then + ENABLE_LEGACY_MEM_MGMT_TRUE= + ENABLE_LEGACY_MEM_MGMT_FALSE='#' +else + ENABLE_LEGACY_MEM_MGMT_TRUE='#' + ENABLE_LEGACY_MEM_MGMT_FALSE= +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_legacy_mem_mgmt" >&5 +$as_echo "$enable_legacy_mem_mgmt" >&6; } + if test "${QT_ARCH}" = "iX86" ; then QT_ARCH_X86_TRUE= QT_ARCH_X86_FALSE='#' @@ -16738,41 +16586,6 @@ if test $ac_cv_defined_SC_ENABLE_IMMEDIATE_SELF_NOTIFICATION != "no"; then : sysc_non_1666=yes fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SC_ENABLE_EARLY_MAXTIME_CREATION defined" >&5 -$as_echo_n "checking for SC_ENABLE_EARLY_MAXTIME_CREATION defined... " >&6; } -if ${ac_cv_defined_SC_ENABLE_EARLY_MAXTIME_CREATION+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - #ifdef SC_ENABLE_EARLY_MAXTIME_CREATION - int ok; - #else - choke me - #endif - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_defined_SC_ENABLE_EARLY_MAXTIME_CREATION=yes -else - ac_cv_defined_SC_ENABLE_EARLY_MAXTIME_CREATION=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_defined_SC_ENABLE_EARLY_MAXTIME_CREATION" >&5 -$as_echo "$ac_cv_defined_SC_ENABLE_EARLY_MAXTIME_CREATION" >&6; } -if test $ac_cv_defined_SC_ENABLE_EARLY_MAXTIME_CREATION != "no"; then : - LIBCONFIG_DEFINES="${LIBCONFIG_DEFINES} -DSC_ENABLE_EARLY_MAXTIME_CREATION" - sysc_non_1666=yes -fi @@ -16789,8 +16602,7 @@ fi - -ac_config_files="$ac_config_files Makefile src/Makefile src/systemc.pc src/tlm.pc src/sysc/Makefile src/sysc/packages/boost/Makefile src/sysc/packages/qt/Makefile src/tlm_core/Makefile src/tlm_utils/Makefile examples/Makefile examples/sysc/Makefile examples/tlm/Makefile examples/tlm/common/Makefile docs/Makefile docs/sysc/doxygen/Doxyfile docs/tlm/doxygen/Doxyfile" +ac_config_files="$ac_config_files Makefile src/Makefile src/systemc.pc src/tlm.pc src/sysc/Makefile src/sysc/packages/qt/Makefile src/tlm_core/Makefile src/tlm_utils/Makefile examples/Makefile examples/sysc/Makefile examples/tlm/Makefile examples/tlm/common/Makefile docs/Makefile docs/sysc/doxygen/Doxyfile docs/tlm/doxygen/Doxyfile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -16985,10 +16797,6 @@ if test -z "${WANT_OPTIMIZE_TRUE}" && test -z "${WANT_OPTIMIZE_FALSE}"; then as_fn_error $? "conditional \"WANT_OPTIMIZE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${DISABLE_ASYNC_UPDATES_TRUE}" && test -z "${DISABLE_ASYNC_UPDATES_FALSE}"; then - as_fn_error $? "conditional \"DISABLE_ASYNC_UPDATES\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${WANT_PTHREADS_THREADS_TRUE}" && test -z "${WANT_PTHREADS_THREADS_FALSE}"; then as_fn_error $? "conditional \"WANT_PTHREADS_THREADS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -17001,18 +16809,14 @@ if test -z "${USES_PTHREADS_LIB_TRUE}" && test -z "${USES_PTHREADS_LIB_FALSE}"; as_fn_error $? "conditional \"USES_PTHREADS_LIB\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${ENABLE_CALLBACKS_TRUE}" && test -z "${ENABLE_CALLBACKS_FALSE}"; then - as_fn_error $? "conditional \"ENABLE_CALLBACKS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${ENABLE_CALLBACKS_TRACING_TRUE}" && test -z "${ENABLE_CALLBACKS_TRACING_FALSE}"; then - as_fn_error $? "conditional \"ENABLE_CALLBACKS_TRACING\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${DISABLE_VCD_SCOPES_TRUE}" && test -z "${DISABLE_VCD_SCOPES_FALSE}"; then as_fn_error $? "conditional \"DISABLE_VCD_SCOPES\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_LEGACY_MEM_MGMT_TRUE}" && test -z "${ENABLE_LEGACY_MEM_MGMT_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_LEGACY_MEM_MGMT\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${QT_ARCH_X86_TRUE}" && test -z "${QT_ARCH_X86_FALSE}"; then as_fn_error $? "conditional \"QT_ARCH_X86\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -17434,7 +17238,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by SystemC $as_me 2.4.0, which was +This file was extended by SystemC $as_me 3.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17492,7 +17296,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -SystemC config.status 2.4.0 +SystemC config.status 3.0.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -17992,7 +17796,6 @@ do "src/systemc.pc") CONFIG_FILES="$CONFIG_FILES src/systemc.pc" ;; "src/tlm.pc") CONFIG_FILES="$CONFIG_FILES src/tlm.pc" ;; "src/sysc/Makefile") CONFIG_FILES="$CONFIG_FILES src/sysc/Makefile" ;; - "src/sysc/packages/boost/Makefile") CONFIG_FILES="$CONFIG_FILES src/sysc/packages/boost/Makefile" ;; "src/sysc/packages/qt/Makefile") CONFIG_FILES="$CONFIG_FILES src/sysc/packages/qt/Makefile" ;; "src/tlm_core/Makefile") CONFIG_FILES="$CONFIG_FILES src/tlm_core/Makefile" ;; "src/tlm_utils/Makefile") CONFIG_FILES="$CONFIG_FILES src/tlm_utils/Makefile" ;; @@ -19362,13 +19165,6 @@ fi -if test "x$enable_async_updates" = xyes; then : - disable_async_updates=no -else - disable_async_updates=yes - sysc_non_1666=yes -fi - if test -z "${WANT_QT_THREADS_TRUE}"; then : sysc_coroutine="QuickThreads" elif test -z "${WANT_PTHREADS_THREADS_TRUE}"; then : @@ -19451,15 +19247,14 @@ Configuration summary of $PACKAGE_STRING for $target Include debugging symbols : $enable_debug Coroutine package for processes: $sysc_coroutine Enable VCD scopes by default : $enable_vcd_scopes - Disable async_request_update : $disable_async_updates - Phase callbacks (experimental) : $enable_phase_callbacks + Enable legacy mem. mangement : $enable_legacy_mem_mgmt ${sysc_additional} --------------------------------------------------------------------- EOF if ${sysc_non_1666+:} false; then : cat < async_suspend/$(am__dirstamp) +async_suspend/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) async_suspend/$(DEPDIR) + @: > async_suspend/$(DEPDIR)/$(am__dirstamp) +async_suspend/async_suspend_test-async_suspend.$(OBJEXT): \ + async_suspend/$(am__dirstamp) \ + async_suspend/$(DEPDIR)/$(am__dirstamp) + +async_suspend/test$(EXEEXT): $(async_suspend_test_OBJECTS) $(async_suspend_test_DEPENDENCIES) $(EXTRA_async_suspend_test_DEPENDENCIES) async_suspend/$(am__dirstamp) + @rm -f async_suspend/test$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(async_suspend_test_OBJECTS) $(async_suspend_test_LDADD) $(LIBS) fft/fft_flpt/$(am__dirstamp): @$(MKDIR_P) fft/fft_flpt @: > fft/fft_flpt/$(am__dirstamp) @@ -1984,6 +2014,7 @@ mostlyclean-compile: -rm -f 2.3/sc_rvd/*.$(OBJEXT) -rm -f 2.3/sc_ttd/*.$(OBJEXT) -rm -f 2.3/simple_async/*.$(OBJEXT) + -rm -f async_suspend/*.$(OBJEXT) -rm -f fft/fft_flpt/*.$(OBJEXT) -rm -f fft/fft_fxpt/*.$(OBJEXT) -rm -f fir/*.$(OBJEXT) @@ -2013,6 +2044,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@2.3/sc_rvd/$(DEPDIR)/2_3_sc_rvd_test-main.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@2.3/sc_ttd/$(DEPDIR)/2_3_sc_ttd_test-main.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@2.3/simple_async/$(DEPDIR)/2_3_simple_async_test-main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@async_suspend/$(DEPDIR)/async_suspend_test-async_suspend.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@fft/fft_flpt/$(DEPDIR)/fft_fft_flpt_test-fft.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@fft/fft_flpt/$(DEPDIR)/fft_fft_flpt_test-main.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@fft/fft_flpt/$(DEPDIR)/fft_fft_flpt_test-sink.Po@am__quote@ @@ -2299,6 +2331,20 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(2_3_simple_async_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o 2.3/simple_async/2_3_simple_async_test-main.obj `if test -f '2.3/simple_async/main.cpp'; then $(CYGPATH_W) '2.3/simple_async/main.cpp'; else $(CYGPATH_W) '$(srcdir)/2.3/simple_async/main.cpp'; fi` +async_suspend/async_suspend_test-async_suspend.o: async_suspend/async_suspend.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(async_suspend_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT async_suspend/async_suspend_test-async_suspend.o -MD -MP -MF async_suspend/$(DEPDIR)/async_suspend_test-async_suspend.Tpo -c -o async_suspend/async_suspend_test-async_suspend.o `test -f 'async_suspend/async_suspend.cpp' || echo '$(srcdir)/'`async_suspend/async_suspend.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) async_suspend/$(DEPDIR)/async_suspend_test-async_suspend.Tpo async_suspend/$(DEPDIR)/async_suspend_test-async_suspend.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='async_suspend/async_suspend.cpp' object='async_suspend/async_suspend_test-async_suspend.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(async_suspend_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o async_suspend/async_suspend_test-async_suspend.o `test -f 'async_suspend/async_suspend.cpp' || echo '$(srcdir)/'`async_suspend/async_suspend.cpp + +async_suspend/async_suspend_test-async_suspend.obj: async_suspend/async_suspend.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(async_suspend_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT async_suspend/async_suspend_test-async_suspend.obj -MD -MP -MF async_suspend/$(DEPDIR)/async_suspend_test-async_suspend.Tpo -c -o async_suspend/async_suspend_test-async_suspend.obj `if test -f 'async_suspend/async_suspend.cpp'; then $(CYGPATH_W) 'async_suspend/async_suspend.cpp'; else $(CYGPATH_W) '$(srcdir)/async_suspend/async_suspend.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) async_suspend/$(DEPDIR)/async_suspend_test-async_suspend.Tpo async_suspend/$(DEPDIR)/async_suspend_test-async_suspend.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='async_suspend/async_suspend.cpp' object='async_suspend/async_suspend_test-async_suspend.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(async_suspend_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o async_suspend/async_suspend_test-async_suspend.obj `if test -f 'async_suspend/async_suspend.cpp'; then $(CYGPATH_W) 'async_suspend/async_suspend.cpp'; else $(CYGPATH_W) '$(srcdir)/async_suspend/async_suspend.cpp'; fi` + fft/fft_flpt/fft_fft_flpt_test-fft.o: fft/fft_flpt/fft.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fft_fft_flpt_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fft/fft_flpt/fft_fft_flpt_test-fft.o -MD -MP -MF fft/fft_flpt/$(DEPDIR)/fft_fft_flpt_test-fft.Tpo -c -o fft/fft_flpt/fft_fft_flpt_test-fft.o `test -f 'fft/fft_flpt/fft.cpp' || echo '$(srcdir)/'`fft/fft_flpt/fft.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) fft/fft_flpt/$(DEPDIR)/fft_fft_flpt_test-fft.Tpo fft/fft_flpt/$(DEPDIR)/fft_fft_flpt_test-fft.Po @@ -2959,6 +3005,7 @@ clean-libtool: -rm -rf 2.3/sc_rvd/.libs 2.3/sc_rvd/_libs -rm -rf 2.3/sc_ttd/.libs 2.3/sc_ttd/_libs -rm -rf 2.3/simple_async/.libs 2.3/simple_async/_libs + -rm -rf async_suspend/.libs async_suspend/_libs -rm -rf fft/fft_flpt/.libs fft/fft_flpt/_libs -rm -rf fft/fft_fxpt/.libs fft/fft_fxpt/_libs -rm -rf fir/.libs fir/_libs @@ -3264,6 +3311,13 @@ simple_perf/test.sh.log: simple_perf/test.sh --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +async_suspend/test.sh.log: async_suspend/test.sh + @p='async_suspend/test.sh'; \ + b='async_suspend/test.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) 2.1/dpipe/test.sh.log: 2.1/dpipe/test.sh @p='2.1/dpipe/test.sh'; \ b='2.1/dpipe/test.sh'; \ @@ -3448,6 +3502,8 @@ distclean-generic: -rm -f 2.3/sc_ttd/$(am__dirstamp) -rm -f 2.3/simple_async/$(DEPDIR)/$(am__dirstamp) -rm -f 2.3/simple_async/$(am__dirstamp) + -rm -f async_suspend/$(DEPDIR)/$(am__dirstamp) + -rm -f async_suspend/$(am__dirstamp) -rm -f fft/fft_flpt/$(DEPDIR)/$(am__dirstamp) -rm -f fft/fft_flpt/$(am__dirstamp) -rm -f fft/fft_fxpt/$(DEPDIR)/$(am__dirstamp) @@ -3479,7 +3535,7 @@ clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ mostlyclean-am distclean: distclean-am - -rm -rf 2.1/dpipe/$(DEPDIR) 2.1/forkjoin/$(DEPDIR) 2.1/reset_signal_is/$(DEPDIR) 2.1/sc_export/$(DEPDIR) 2.1/sc_report/$(DEPDIR) 2.1/scx_barrier/$(DEPDIR) 2.1/scx_mutex_w_policy/$(DEPDIR) 2.1/specialized_signals/$(DEPDIR) 2.3/sc_rvd/$(DEPDIR) 2.3/sc_ttd/$(DEPDIR) 2.3/simple_async/$(DEPDIR) fft/fft_flpt/$(DEPDIR) fft/fft_fxpt/$(DEPDIR) fir/$(DEPDIR) pipe/$(DEPDIR) pkt_switch/$(DEPDIR) risc_cpu/$(DEPDIR) rsa/$(DEPDIR) simple_bus/$(DEPDIR) simple_fifo/$(DEPDIR) simple_perf/$(DEPDIR) + -rm -rf 2.1/dpipe/$(DEPDIR) 2.1/forkjoin/$(DEPDIR) 2.1/reset_signal_is/$(DEPDIR) 2.1/sc_export/$(DEPDIR) 2.1/sc_report/$(DEPDIR) 2.1/scx_barrier/$(DEPDIR) 2.1/scx_mutex_w_policy/$(DEPDIR) 2.1/specialized_signals/$(DEPDIR) 2.3/sc_rvd/$(DEPDIR) 2.3/sc_ttd/$(DEPDIR) 2.3/simple_async/$(DEPDIR) async_suspend/$(DEPDIR) fft/fft_flpt/$(DEPDIR) fft/fft_fxpt/$(DEPDIR) fir/$(DEPDIR) pipe/$(DEPDIR) pkt_switch/$(DEPDIR) risc_cpu/$(DEPDIR) rsa/$(DEPDIR) simple_bus/$(DEPDIR) simple_fifo/$(DEPDIR) simple_perf/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -3525,7 +3581,7 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf 2.1/dpipe/$(DEPDIR) 2.1/forkjoin/$(DEPDIR) 2.1/reset_signal_is/$(DEPDIR) 2.1/sc_export/$(DEPDIR) 2.1/sc_report/$(DEPDIR) 2.1/scx_barrier/$(DEPDIR) 2.1/scx_mutex_w_policy/$(DEPDIR) 2.1/specialized_signals/$(DEPDIR) 2.3/sc_rvd/$(DEPDIR) 2.3/sc_ttd/$(DEPDIR) 2.3/simple_async/$(DEPDIR) fft/fft_flpt/$(DEPDIR) fft/fft_fxpt/$(DEPDIR) fir/$(DEPDIR) pipe/$(DEPDIR) pkt_switch/$(DEPDIR) risc_cpu/$(DEPDIR) rsa/$(DEPDIR) simple_bus/$(DEPDIR) simple_fifo/$(DEPDIR) simple_perf/$(DEPDIR) + -rm -rf 2.1/dpipe/$(DEPDIR) 2.1/forkjoin/$(DEPDIR) 2.1/reset_signal_is/$(DEPDIR) 2.1/sc_export/$(DEPDIR) 2.1/sc_report/$(DEPDIR) 2.1/scx_barrier/$(DEPDIR) 2.1/scx_mutex_w_policy/$(DEPDIR) 2.1/specialized_signals/$(DEPDIR) 2.3/sc_rvd/$(DEPDIR) 2.3/sc_ttd/$(DEPDIR) 2.3/simple_async/$(DEPDIR) async_suspend/$(DEPDIR) fft/fft_flpt/$(DEPDIR) fft/fft_fxpt/$(DEPDIR) fir/$(DEPDIR) pipe/$(DEPDIR) pkt_switch/$(DEPDIR) risc_cpu/$(DEPDIR) rsa/$(DEPDIR) simple_bus/$(DEPDIR) simple_fifo/$(DEPDIR) simple_perf/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -3609,6 +3665,8 @@ all: #simple_perf_FILTER = +#async_suspend_FILTER = + #2_1_dpipe_FILTER = #2_1_forkjoin_FILTER = diff --git a/examples/tlm/Makefile.in b/examples/tlm/Makefile.in index f5f8b72d0..aa624b08d 100644 --- a/examples/tlm/Makefile.in +++ b/examples/tlm/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -101,7 +101,7 @@ DIST_COMMON = $(top_srcdir)/config/Make-rules.examples \ @WANT_OPTIMIZE_TRUE@am__append_4 = $(OPT_CXXFLAGS) @WANT_OPTIMIZE_TRUE@am__append_5 = $(OPT_CXXFLAGS) -# either for async_update locking or pthread processes +# for pthread processes @USES_PTHREADS_LIB_TRUE@am__append_6 = $(PTHREAD_CFLAGS) @USES_PTHREADS_LIB_TRUE@am__append_7 = $(PTHREAD_CFLAGS) @USES_PTHREADS_LIB_TRUE@am__append_8 = $(PTHREAD_LIBS) diff --git a/examples/tlm/common/Makefile.in b/examples/tlm/common/Makefile.in index 58ce35444..bc87278c9 100644 --- a/examples/tlm/common/Makefile.in +++ b/examples/tlm/common/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -93,7 +93,7 @@ DIST_COMMON = $(top_srcdir)/config/Make-rules.examples \ @WANT_OPTIMIZE_TRUE@am__append_4 = $(OPT_CXXFLAGS) @WANT_OPTIMIZE_TRUE@am__append_5 = $(OPT_CXXFLAGS) -# either for async_update locking or pthread processes +# for pthread processes @USES_PTHREADS_LIB_TRUE@am__append_6 = $(PTHREAD_CFLAGS) @USES_PTHREADS_LIB_TRUE@am__append_7 = $(PTHREAD_CFLAGS) @USES_PTHREADS_LIB_TRUE@am__append_8 = $(PTHREAD_LIBS) diff --git a/src/Makefile.in b/src/Makefile.in index f69e32223..e4c7362be 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -96,21 +96,19 @@ DIST_COMMON = $(top_srcdir)/config/Make-rules.sysc \ @WANT_OPTIMIZE_TRUE@am__append_4 = $(OPT_CXXFLAGS) @WANT_OPTIMIZE_TRUE@am__append_5 = $(OPT_CXXFLAGS) -# either for async_update locking or pthread processes +# for pthread processes @USES_PTHREADS_LIB_TRUE@am__append_6 = $(PTHREAD_CFLAGS) @USES_PTHREADS_LIB_TRUE@am__append_7 = $(PTHREAD_CFLAGS) @USES_PTHREADS_LIB_TRUE@am__append_8 = $(PTHREAD_LIBS) -@DISABLE_ASYNC_UPDATES_TRUE@am__append_9 = -DSC_DISABLE_ASYNC_UPDATES -@ENABLE_CALLBACKS_TRUE@am__append_10 = -DSC_ENABLE_SIMULATION_PHASE_CALLBACKS -@ENABLE_CALLBACKS_TRACING_TRUE@am__append_11 = -DSC_ENABLE_SIMULATION_PHASE_CALLBACKS_TRACING -@WANT_PTHREADS_THREADS_TRUE@am__append_12 = -DSC_USE_PTHREADS -@DISABLE_VCD_SCOPES_TRUE@am__append_13 = -DSC_DISABLE_VCD_SCOPES +@WANT_PTHREADS_THREADS_TRUE@am__append_9 = -DSC_USE_PTHREADS +@DISABLE_VCD_SCOPES_TRUE@am__append_10 = -DSC_DISABLE_VCD_SCOPES +@ENABLE_LEGACY_MEM_MGMT_TRUE@am__append_11 = -DSC_LEGACY_MEM_MGMT # either for async_update locking or pthread processes # Libtool/GCC do not play well together on some platforms # with C++ libraries and libpthread dependency, see e.g. # http://lists.gnu.org/archive/html/libtool/2012-02/msg00003.html -@USES_PTHREADS_LIB_TRUE@am__append_14 = $(EXPLICIT_LPTHREAD) +@USES_PTHREADS_LIB_TRUE@am__append_12 = $(EXPLICIT_LPTHREAD) subdir = src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_define.m4 \ @@ -434,8 +432,7 @@ AM_LDFLAGS = $(EXTRA_LDFLAGS) $(am__append_8) # always add fix-point support EXTRA_DEFINES = -DSC_INCLUDE_FX -DSC_BUILD $(am__append_9) \ - $(am__append_10) $(am__append_11) $(am__append_12) \ - $(am__append_13) + $(am__append_10) $(am__append_11) # initialize some useful variables (filled later) CLEANFILES = @@ -470,7 +467,7 @@ nodist_EXTRA_libsystemc_la_SOURCES = sc_nonexistent.cpp # add main libraries libsystemc_la_LIBADD = tlm_utils/libtlm_utils.la \ - tlm_core/libtlm_core.la sysc/libsysc.la $(am__append_14) + tlm_core/libtlm_core.la sysc/libsysc.la $(am__append_12) libsystemc_la_LDFLAGS = $(EXTRA_LDFLAGS) -release $(VERSION) all: all-recursive diff --git a/src/sysc/Makefile.in b/src/sysc/Makefile.in index 04c24ee9b..0ec6a4a32 100644 --- a/src/sysc/Makefile.in +++ b/src/sysc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -88,7 +88,8 @@ DIST_COMMON = $(top_srcdir)/config/Make-rules.sysc \ $(top_srcdir)/config/Make-rules.common \ $(srcdir)/kernel/files.am $(srcdir)/communication/files.am \ $(srcdir)/datatypes/files.am $(srcdir)/tracing/files.am \ - $(srcdir)/utils/files.am $(srcdir)/Makefile.in \ + $(srcdir)/utils/files.am $(srcdir)/packages/boost.am \ + $(srcdir)/packages/qt.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \ $(nobase_localinclude_HEADERS) @WANT_DEBUG_TRUE@am__append_1 = $(DEBUG_CXXFLAGS) @@ -97,15 +98,17 @@ DIST_COMMON = $(top_srcdir)/config/Make-rules.sysc \ @WANT_OPTIMIZE_TRUE@am__append_4 = $(OPT_CXXFLAGS) @WANT_OPTIMIZE_TRUE@am__append_5 = $(OPT_CXXFLAGS) -# either for async_update locking or pthread processes +# for pthread processes @USES_PTHREADS_LIB_TRUE@am__append_6 = $(PTHREAD_CFLAGS) @USES_PTHREADS_LIB_TRUE@am__append_7 = $(PTHREAD_CFLAGS) @USES_PTHREADS_LIB_TRUE@am__append_8 = $(PTHREAD_LIBS) -@DISABLE_ASYNC_UPDATES_TRUE@am__append_9 = -DSC_DISABLE_ASYNC_UPDATES -@ENABLE_CALLBACKS_TRUE@am__append_10 = -DSC_ENABLE_SIMULATION_PHASE_CALLBACKS -@ENABLE_CALLBACKS_TRACING_TRUE@am__append_11 = -DSC_ENABLE_SIMULATION_PHASE_CALLBACKS_TRACING -@WANT_PTHREADS_THREADS_TRUE@am__append_12 = -DSC_USE_PTHREADS -@DISABLE_VCD_SCOPES_TRUE@am__append_13 = -DSC_DISABLE_VCD_SCOPES +@WANT_PTHREADS_THREADS_TRUE@am__append_9 = -DSC_USE_PTHREADS +@DISABLE_VCD_SCOPES_TRUE@am__append_10 = -DSC_DISABLE_VCD_SCOPES +@ENABLE_LEGACY_MEM_MGMT_TRUE@am__append_11 = -DSC_LEGACY_MEM_MGMT + +# build external QT package separately +@WANT_QT_THREADS_TRUE@am__append_12 = $(QT_SUBDIR) +@WANT_QT_THREADS_TRUE@am__append_13 = $(QT_LIB) subdir = src/sysc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_define.m4 \ @@ -121,20 +124,15 @@ mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) -libsysc_la_DEPENDENCIES = $(QT_LIB) +libsysc_la_DEPENDENCIES = $(LIBADD) am__libsysc_la_SOURCES_DIST = kernel/sc_cor_fiber.h \ kernel/sc_cor_pthread.h kernel/sc_cor_qt.h \ kernel/sc_cthread_process.h kernel/sc_method_process.h \ kernel/sc_module_registry.h kernel/sc_name_gen.h \ kernel/sc_object_int.h kernel/sc_object_manager.h \ - kernel/sc_phase_callback_registry.h kernel/sc_reset.h \ + kernel/sc_stage_callback_registry.h kernel/sc_reset.h \ kernel/sc_runnable_int.h kernel/sc_simcontext_int.h \ - kernel/sc_thread_process.h datatypes/int/sc_nbcommon.inc \ - datatypes/int/sc_nbfriends.inc \ - datatypes/int/sc_signed_bitref.inc \ - datatypes/int/sc_signed_subref.inc \ - datatypes/int/sc_unsigned_bitref.inc \ - datatypes/int/sc_unsigned_subref.inc datatypes/fx/scfx_pow10.h \ + kernel/sc_thread_process.h datatypes/fx/scfx_pow10.h \ tracing/sc_trace_file_base.h tracing/sc_vcd_trace.h \ tracing/sc_wif_trace.h utils/sc_stop_here.h \ kernel/sc_attribute.cpp kernel/sc_cor_fiber.cpp \ @@ -145,7 +143,7 @@ am__libsysc_la_SOURCES_DIST = kernel/sc_cor_fiber.h \ kernel/sc_module.cpp kernel/sc_module_name.cpp \ kernel/sc_module_registry.cpp kernel/sc_name_gen.cpp \ kernel/sc_object.cpp kernel/sc_object_manager.cpp \ - kernel/sc_phase_callback_registry.cpp kernel/sc_process.cpp \ + kernel/sc_stage_callback_registry.cpp kernel/sc_process.cpp \ kernel/sc_reset.cpp kernel/sc_sensitive.cpp \ kernel/sc_simcontext.cpp kernel/sc_spawn_options.cpp \ kernel/sc_thread_process.cpp kernel/sc_time.cpp \ @@ -166,16 +164,16 @@ am__libsysc_la_SOURCES_DIST = kernel/sc_cor_fiber.h \ datatypes/fx/sc_fxtype_params.cpp datatypes/fx/sc_fxval.cpp \ datatypes/fx/sc_fxval_observer.cpp datatypes/fx/scfx_mant.cpp \ datatypes/fx/scfx_pow10.cpp datatypes/fx/scfx_rep.cpp \ - datatypes/fx/scfx_utils.cpp datatypes/int/sc_int_base.cpp \ - datatypes/int/sc_int_mask.cpp \ - datatypes/int/sc_length_param.cpp \ - datatypes/int/sc_nbexterns.cpp datatypes/int/sc_nbutils.cpp \ + datatypes/fx/scfx_utils.cpp datatypes/int/sc_int32_mask.cpp \ + datatypes/int/sc_int64_io.cpp datatypes/int/sc_int64_mask.cpp \ + datatypes/int/sc_int_base.cpp \ + datatypes/int/sc_length_param.cpp datatypes/int/sc_nbutils.cpp \ datatypes/int/sc_signed.cpp datatypes/int/sc_uint_base.cpp \ - datatypes/int/sc_unsigned.cpp datatypes/misc/sc_concatref.cpp \ - datatypes/misc/sc_value_base.cpp tracing/sc_trace.cpp \ - tracing/sc_trace_file_base.cpp tracing/sc_vcd_trace.cpp \ - tracing/sc_wif_trace.cpp utils/sc_hash.cpp utils/sc_list.cpp \ - utils/sc_mempool.cpp utils/sc_pq.cpp utils/sc_report.cpp \ + datatypes/int/sc_unsigned.cpp datatypes/misc/sc_value_base.cpp \ + tracing/sc_trace.cpp tracing/sc_trace_file_base.cpp \ + tracing/sc_vcd_trace.cpp tracing/sc_wif_trace.cpp \ + utils/sc_hash.cpp utils/sc_list.cpp utils/sc_mempool.cpp \ + utils/sc_pq.cpp utils/sc_report.cpp \ utils/sc_report_handler.cpp utils/sc_stop_here.cpp \ utils/sc_string.cpp utils/sc_utils_ids.cpp utils/sc_vector.cpp am__objects_1 = @@ -190,7 +188,7 @@ am__objects_3 = kernel/sc_attribute.lo $(am__objects_2) \ kernel/sc_module.lo kernel/sc_module_name.lo \ kernel/sc_module_registry.lo kernel/sc_name_gen.lo \ kernel/sc_object.lo kernel/sc_object_manager.lo \ - kernel/sc_phase_callback_registry.lo kernel/sc_process.lo \ + kernel/sc_stage_callback_registry.lo kernel/sc_process.lo \ kernel/sc_reset.lo kernel/sc_sensitive.lo \ kernel/sc_simcontext.lo kernel/sc_spawn_options.lo \ kernel/sc_thread_process.lo kernel/sc_time.lo kernel/sc_ver.lo \ @@ -210,11 +208,11 @@ am__objects_3 = kernel/sc_attribute.lo $(am__objects_2) \ datatypes/fx/sc_fxtype_params.lo datatypes/fx/sc_fxval.lo \ datatypes/fx/sc_fxval_observer.lo datatypes/fx/scfx_mant.lo \ datatypes/fx/scfx_pow10.lo datatypes/fx/scfx_rep.lo \ - datatypes/fx/scfx_utils.lo datatypes/int/sc_int_base.lo \ - datatypes/int/sc_int_mask.lo datatypes/int/sc_length_param.lo \ - datatypes/int/sc_nbexterns.lo datatypes/int/sc_nbutils.lo \ - datatypes/int/sc_signed.lo datatypes/int/sc_uint_base.lo \ - datatypes/int/sc_unsigned.lo datatypes/misc/sc_concatref.lo \ + datatypes/fx/scfx_utils.lo datatypes/int/sc_int32_mask.lo \ + datatypes/int/sc_int64_io.lo datatypes/int/sc_int64_mask.lo \ + datatypes/int/sc_int_base.lo datatypes/int/sc_length_param.lo \ + datatypes/int/sc_nbutils.lo datatypes/int/sc_signed.lo \ + datatypes/int/sc_uint_base.lo datatypes/int/sc_unsigned.lo \ datatypes/misc/sc_value_base.lo tracing/sc_trace.lo \ tracing/sc_trace_file_base.lo tracing/sc_vcd_trace.lo \ tracing/sc_wif_trace.lo utils/sc_hash.lo utils/sc_list.lo \ @@ -350,7 +348,7 @@ am__define_uniq_tagged_files = \ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = packages/boost packages/qt +DIST_SUBDIRS = packages/qt DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -528,37 +526,29 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/src AM_CFLAGS = $(EXTRA_CFLAGS) $(am__append_2) $(am__append_5) \ - $(am__append_7) + $(am__append_7) @DEFS@ AM_CXXFLAGS = $(EXTRA_CXXFLAGS) $(am__append_1) $(am__append_4) \ - $(am__append_6) + $(am__append_6) @DEFS@ AM_CCASFLAGS = $(EXTRA_ASFLAGS) $(am__append_3) AM_LDFLAGS = $(EXTRA_LDFLAGS) $(am__append_8) # always add fix-point support EXTRA_DEFINES = -DSC_INCLUDE_FX -DSC_BUILD $(am__append_9) \ - $(am__append_10) $(am__append_11) $(am__append_12) \ - $(am__append_13) + $(am__append_10) $(am__append_11) # initialize some useful variables (filled later) CLEANFILES = -EXTRA_DIST = -@WANT_QT_THREADS_TRUE@QT_LIB = packages/qt/libqt.la -@WANT_QT_THREADS_TRUE@QT_SUBDIR = packages/qt - -# only build external packages separately -SUBDIRS = \ - packages/boost \ - $(QT_SUBDIR) - +EXTRA_DIST = packages/boost/LICENSE_1_0.txt +SUBDIRS = $(am__append_12) H_FILES = kernel/sc_attribute.h kernel/sc_cmnhdr.h \ kernel/sc_constants.h kernel/sc_cor.h \ kernel/sc_dynamic_processes.h kernel/sc_event.h \ kernel/sc_except.h kernel/sc_externs.h kernel/sc_join.h \ kernel/sc_kernel_ids.h kernel/sc_macros.h kernel/sc_module.h \ kernel/sc_module_name.h kernel/sc_initializer_function.h \ - kernel/sc_object.h kernel/sc_process.h \ - kernel/sc_process_handle.h kernel/sc_runnable.h \ - kernel/sc_sensitive.h kernel/sc_spawn.h \ + kernel/sc_object.h kernel/sc_stage_callback_if.h \ + kernel/sc_process.h kernel/sc_process_handle.h \ + kernel/sc_runnable.h kernel/sc_sensitive.h kernel/sc_spawn.h \ kernel/sc_spawn_options.h kernel/sc_status.h \ kernel/sc_simcontext.h kernel/sc_time.h kernel/sc_ver.h \ kernel/sc_wait.h kernel/sc_wait_cthread.h \ @@ -578,7 +568,7 @@ H_FILES = kernel/sc_attribute.h kernel/sc_cmnhdr.h \ communication/sc_signal_resolved.h \ communication/sc_signal_resolved_ports.h \ communication/sc_signal_rv.h \ - communication/sc_signal_rv_ports.h \ + communication/sc_signal_rv_ports.h communication/sc_stub.h \ communication/sc_writer_policy.h datatypes/bit/sc_bit.h \ datatypes/bit/sc_bit_ids.h datatypes/bit/sc_bit_proxies.h \ datatypes/bit/sc_bv.h datatypes/bit/sc_bv_base.h \ @@ -595,33 +585,108 @@ H_FILES = kernel/sc_attribute.h kernel/sc_cmnhdr.h \ datatypes/fx/scfx_mant.h datatypes/fx/scfx_other_defs.h \ datatypes/fx/scfx_params.h datatypes/fx/scfx_rep.h \ datatypes/fx/scfx_string.h datatypes/fx/scfx_utils.h \ - datatypes/int/sc_bigint.h datatypes/int/sc_biguint.h \ - datatypes/int/sc_int.h datatypes/int/sc_int_base.h \ - datatypes/int/sc_int_ids.h datatypes/int/sc_length_param.h \ - datatypes/int/sc_nbdefs.h datatypes/int/sc_nbexterns.h \ - datatypes/int/sc_nbutils.h datatypes/int/sc_signed.h \ - datatypes/int/sc_uint.h datatypes/int/sc_uint_base.h \ - datatypes/int/sc_unsigned.h datatypes/misc/sc_concatref.h \ + datatypes/int/sc_big_ops.h datatypes/int/sc_bigint.h \ + datatypes/int/sc_bigint_inlines.h datatypes/int/sc_biguint.h \ + datatypes/int/sc_biguint_inlines.h datatypes/int/sc_int.h \ + datatypes/int/sc_int_base.h datatypes/int/sc_int_ids.h \ + datatypes/int/sc_int_inlines.h datatypes/int/sc_length_param.h \ + datatypes/int/sc_nbdefs.h datatypes/int/sc_nbutils.h \ + datatypes/int/sc_signed.h datatypes/int/sc_signed_friends.h \ + datatypes/int/sc_signed_inlines.h \ + datatypes/int/sc_signed_ops.h datatypes/int/sc_uint.h \ + datatypes/int/sc_uint_base.h datatypes/int/sc_uint_inlines.h \ + datatypes/int/sc_unsigned.h \ + datatypes/int/sc_unsigned_friends.h \ + datatypes/int/sc_unsigned_inlines.h \ + datatypes/int/sc_vector_utils.h datatypes/misc/sc_concatref.h \ datatypes/misc/sc_value_base.h tracing/sc_trace.h \ - tracing/sc_tracing_ids.h utils/sc_hash.h utils/sc_list.h \ - utils/sc_machine.h utils/sc_mempool.h utils/sc_pq.h \ + tracing/sc_tracing_ids.h utils/sc_hash.h utils/sc_iostream.h \ + utils/sc_list.h utils/sc_machine.h utils/sc_mempool.h \ + utils/sc_meta.h utils/sc_pq.h utils/sc_ptr_flag.h \ utils/sc_pvector.h utils/sc_report.h utils/sc_report_handler.h \ - utils/sc_string.h utils/sc_string_view.h utils/sc_temporary.h \ - utils/sc_typeindex.h utils/sc_utils_ids.h utils/sc_vector.h + utils/sc_stop_here.h utils/sc_string.h utils/sc_string_view.h \ + utils/sc_temporary.h utils/sc_typeindex.h utils/sc_utils_ids.h \ + utils/sc_vector.h packages/boost/bind.hpp \ + packages/boost/config.hpp packages/boost/get_pointer.hpp \ + packages/boost/mem_fn.hpp packages/boost/non_type.hpp \ + packages/boost/ref.hpp packages/boost/type.hpp \ + packages/boost/bind/apply.hpp packages/boost/bind/arg.hpp \ + packages/boost/bind/bind_cc.hpp \ + packages/boost/bind/bind_mf_cc.hpp \ + packages/boost/bind/bind_template.hpp \ + packages/boost/bind/make_adaptable.hpp \ + packages/boost/bind/mem_fn_cc.hpp \ + packages/boost/bind/mem_fn_template.hpp \ + packages/boost/bind/mem_fn_vw.hpp \ + packages/boost/bind/placeholders.hpp \ + packages/boost/bind/protect.hpp \ + packages/boost/config/compiler/borland.hpp \ + packages/boost/config/compiler/comeau.hpp \ + packages/boost/config/compiler/common_edg.hpp \ + packages/boost/config/compiler/compaq_cxx.hpp \ + packages/boost/config/compiler/digitalmars.hpp \ + packages/boost/config/compiler/gcc.hpp \ + packages/boost/config/compiler/greenhills.hpp \ + packages/boost/config/compiler/hp_acc.hpp \ + packages/boost/config/compiler/intel.hpp \ + packages/boost/config/compiler/kai.hpp \ + packages/boost/config/compiler/metrowerks.hpp \ + packages/boost/config/compiler/mpw.hpp \ + packages/boost/config/compiler/sgi_mipspro.hpp \ + packages/boost/config/compiler/sunpro_cc.hpp \ + packages/boost/config/compiler/vacpp.hpp \ + packages/boost/config/compiler/visualc.hpp \ + packages/boost/config/platform/aix.hpp \ + packages/boost/config/platform/amigaos.hpp \ + packages/boost/config/platform/beos.hpp \ + packages/boost/config/platform/bsd.hpp \ + packages/boost/config/platform/cygwin.hpp \ + packages/boost/config/platform/hpux.hpp \ + packages/boost/config/platform/irix.hpp \ + packages/boost/config/platform/linux.hpp \ + packages/boost/config/platform/macos.hpp \ + packages/boost/config/platform/solaris.hpp \ + packages/boost/config/platform/win32.hpp \ + packages/boost/config/posix_features.hpp \ + packages/boost/config/select_compiler_config.hpp \ + packages/boost/config/select_platform_config.hpp \ + packages/boost/config/select_stdlib_config.hpp \ + packages/boost/config/stdlib/dinkumware.hpp \ + packages/boost/config/stdlib/libcomo.hpp \ + packages/boost/config/stdlib/libstdcpp3.hpp \ + packages/boost/config/stdlib/modena.hpp \ + packages/boost/config/stdlib/msl.hpp \ + packages/boost/config/stdlib/roguewave.hpp \ + packages/boost/config/stdlib/sgi.hpp \ + packages/boost/config/stdlib/stlport.hpp \ + packages/boost/config/stdlib/vacpp.hpp \ + packages/boost/config/suffix.hpp \ + packages/boost/config/user.hpp \ + packages/boost/detail/endian.hpp \ + packages/boost/detail/workaround.hpp \ + packages/boost/mpl/aux_/adl_barrier.hpp \ + packages/boost/mpl/aux_/config/adl.hpp \ + packages/boost/mpl/aux_/config/gcc.hpp \ + packages/boost/mpl/aux_/config/intel.hpp \ + packages/boost/mpl/aux_/config/msvc.hpp \ + packages/boost/mpl/aux_/config/static_constant.hpp \ + packages/boost/mpl/aux_/config/workaround.hpp \ + packages/boost/mpl/bool.hpp packages/boost/mpl/bool_fwd.hpp \ + packages/boost/mpl/integral_c_tag.hpp \ + packages/boost/utility/addressof.hpp \ + packages/boost/utility/enable_if.hpp \ + packages/boost/utility/string_view.hpp \ + packages/boost/utility/string_view_fwd.hpp NO_H_FILES = kernel/sc_cor_fiber.h kernel/sc_cor_pthread.h \ kernel/sc_cor_qt.h kernel/sc_cthread_process.h \ kernel/sc_method_process.h kernel/sc_module_registry.h \ kernel/sc_name_gen.h kernel/sc_object_int.h \ - kernel/sc_object_manager.h kernel/sc_phase_callback_registry.h \ + kernel/sc_object_manager.h kernel/sc_stage_callback_registry.h \ kernel/sc_reset.h kernel/sc_runnable_int.h \ kernel/sc_simcontext_int.h kernel/sc_thread_process.h \ - datatypes/int/sc_nbcommon.inc datatypes/int/sc_nbfriends.inc \ - datatypes/int/sc_signed_bitref.inc \ - datatypes/int/sc_signed_subref.inc \ - datatypes/int/sc_unsigned_bitref.inc \ - datatypes/int/sc_unsigned_subref.inc datatypes/fx/scfx_pow10.h \ - tracing/sc_trace_file_base.h tracing/sc_vcd_trace.h \ - tracing/sc_wif_trace.h utils/sc_stop_here.h + datatypes/fx/scfx_pow10.h tracing/sc_trace_file_base.h \ + tracing/sc_vcd_trace.h tracing/sc_wif_trace.h \ + utils/sc_stop_here.h CXX_FILES = kernel/sc_attribute.cpp $(CXX_COR_FILES) \ kernel/sc_cthread_process.cpp kernel/sc_event.cpp \ kernel/sc_except.cpp kernel/sc_join.cpp kernel/sc_main.cpp \ @@ -629,7 +694,7 @@ CXX_FILES = kernel/sc_attribute.cpp $(CXX_COR_FILES) \ kernel/sc_module.cpp kernel/sc_module_name.cpp \ kernel/sc_module_registry.cpp kernel/sc_name_gen.cpp \ kernel/sc_object.cpp kernel/sc_object_manager.cpp \ - kernel/sc_phase_callback_registry.cpp kernel/sc_process.cpp \ + kernel/sc_stage_callback_registry.cpp kernel/sc_process.cpp \ kernel/sc_reset.cpp kernel/sc_sensitive.cpp \ kernel/sc_simcontext.cpp kernel/sc_spawn_options.cpp \ kernel/sc_thread_process.cpp kernel/sc_time.cpp \ @@ -650,41 +715,50 @@ CXX_FILES = kernel/sc_attribute.cpp $(CXX_COR_FILES) \ datatypes/fx/sc_fxtype_params.cpp datatypes/fx/sc_fxval.cpp \ datatypes/fx/sc_fxval_observer.cpp datatypes/fx/scfx_mant.cpp \ datatypes/fx/scfx_pow10.cpp datatypes/fx/scfx_rep.cpp \ - datatypes/fx/scfx_utils.cpp datatypes/int/sc_int_base.cpp \ - datatypes/int/sc_int_mask.cpp \ - datatypes/int/sc_length_param.cpp \ - datatypes/int/sc_nbexterns.cpp datatypes/int/sc_nbutils.cpp \ + datatypes/fx/scfx_utils.cpp datatypes/int/sc_int32_mask.cpp \ + datatypes/int/sc_int64_io.cpp datatypes/int/sc_int64_mask.cpp \ + datatypes/int/sc_int_base.cpp \ + datatypes/int/sc_length_param.cpp datatypes/int/sc_nbutils.cpp \ datatypes/int/sc_signed.cpp datatypes/int/sc_uint_base.cpp \ - datatypes/int/sc_unsigned.cpp datatypes/misc/sc_concatref.cpp \ - datatypes/misc/sc_value_base.cpp tracing/sc_trace.cpp \ - tracing/sc_trace_file_base.cpp tracing/sc_vcd_trace.cpp \ - tracing/sc_wif_trace.cpp utils/sc_hash.cpp utils/sc_list.cpp \ - utils/sc_mempool.cpp utils/sc_pq.cpp utils/sc_report.cpp \ + datatypes/int/sc_unsigned.cpp datatypes/misc/sc_value_base.cpp \ + tracing/sc_trace.cpp tracing/sc_trace_file_base.cpp \ + tracing/sc_vcd_trace.cpp tracing/sc_wif_trace.cpp \ + utils/sc_hash.cpp utils/sc_list.cpp utils/sc_mempool.cpp \ + utils/sc_pq.cpp utils/sc_report.cpp \ utils/sc_report_handler.cpp utils/sc_stop_here.cpp \ utils/sc_string.cpp utils/sc_utils_ids.cpp utils/sc_vector.cpp INCDIRS = kernel communication datatypes/bit datatypes/fx \ - datatypes/int datatypes/misc datatypes tracing utils packages + datatypes/int datatypes/misc datatypes/any datatypes tracing \ + utils packages/boost/bind packages/boost/config/compiler \ + packages/boost/config/platform packages/boost/config/stdlib \ + packages/boost/config packages/boost/detail \ + packages/boost/mpl/aux_/config packages/boost/mpl/aux_ \ + packages/boost/mpl packages/boost/utility packages/boost \ + packages +LIBADD = $(am__append_13) @WANT_PTHREADS_THREADS_FALSE@@WANT_QT_THREADS_FALSE@CXX_COR_FILES = kernel/sc_cor_fiber.cpp @WANT_PTHREADS_THREADS_TRUE@@WANT_QT_THREADS_FALSE@CXX_COR_FILES = kernel/sc_cor_pthread.cpp # co-routine implementation @WANT_QT_THREADS_TRUE@CXX_COR_FILES = kernel/sc_cor_qt.cpp +@WANT_QT_THREADS_TRUE@QT_LIB = packages/qt/libqt.la +@WANT_QT_THREADS_TRUE@QT_SUBDIR = packages/qt # include file lists for sub-directories + +# include individual third-party packages localincludedir = $(includedir)/sysc nobase_localinclude_HEADERS = $(H_FILES) noinst_LTLIBRARIES = libsysc.la libsysc_la_SOURCES = $(NO_H_FILES) $(CXX_FILES) # add dependent (package) libraries -libsysc_la_LIBADD = \ - $(QT_LIB) - +libsysc_la_LIBADD = $(LIBADD) all: all-recursive .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/config/Make-rules.sysc $(top_srcdir)/config/Make-rules.common $(srcdir)/kernel/files.am $(srcdir)/communication/files.am $(srcdir)/datatypes/files.am $(srcdir)/tracing/files.am $(srcdir)/utils/files.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/config/Make-rules.sysc $(top_srcdir)/config/Make-rules.common $(srcdir)/kernel/files.am $(srcdir)/communication/files.am $(srcdir)/datatypes/files.am $(srcdir)/tracing/files.am $(srcdir)/utils/files.am $(srcdir)/packages/boost.am $(srcdir)/packages/qt.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -705,7 +779,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/config/Make-rules.sysc $(top_srcdir)/config/Make-rules.common $(srcdir)/kernel/files.am $(srcdir)/communication/files.am $(srcdir)/datatypes/files.am $(srcdir)/tracing/files.am $(srcdir)/utils/files.am: +$(top_srcdir)/config/Make-rules.sysc $(top_srcdir)/config/Make-rules.common $(srcdir)/kernel/files.am $(srcdir)/communication/files.am $(srcdir)/datatypes/files.am $(srcdir)/tracing/files.am $(srcdir)/utils/files.am $(srcdir)/packages/boost.am $(srcdir)/packages/qt.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -766,7 +840,7 @@ kernel/sc_object.lo: kernel/$(am__dirstamp) \ kernel/$(DEPDIR)/$(am__dirstamp) kernel/sc_object_manager.lo: kernel/$(am__dirstamp) \ kernel/$(DEPDIR)/$(am__dirstamp) -kernel/sc_phase_callback_registry.lo: kernel/$(am__dirstamp) \ +kernel/sc_stage_callback_registry.lo: kernel/$(am__dirstamp) \ kernel/$(DEPDIR)/$(am__dirstamp) kernel/sc_process.lo: kernel/$(am__dirstamp) \ kernel/$(DEPDIR)/$(am__dirstamp) @@ -869,13 +943,15 @@ datatypes/int/$(am__dirstamp): datatypes/int/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) datatypes/int/$(DEPDIR) @: > datatypes/int/$(DEPDIR)/$(am__dirstamp) -datatypes/int/sc_int_base.lo: datatypes/int/$(am__dirstamp) \ +datatypes/int/sc_int32_mask.lo: datatypes/int/$(am__dirstamp) \ datatypes/int/$(DEPDIR)/$(am__dirstamp) -datatypes/int/sc_int_mask.lo: datatypes/int/$(am__dirstamp) \ +datatypes/int/sc_int64_io.lo: datatypes/int/$(am__dirstamp) \ datatypes/int/$(DEPDIR)/$(am__dirstamp) -datatypes/int/sc_length_param.lo: datatypes/int/$(am__dirstamp) \ +datatypes/int/sc_int64_mask.lo: datatypes/int/$(am__dirstamp) \ datatypes/int/$(DEPDIR)/$(am__dirstamp) -datatypes/int/sc_nbexterns.lo: datatypes/int/$(am__dirstamp) \ +datatypes/int/sc_int_base.lo: datatypes/int/$(am__dirstamp) \ + datatypes/int/$(DEPDIR)/$(am__dirstamp) +datatypes/int/sc_length_param.lo: datatypes/int/$(am__dirstamp) \ datatypes/int/$(DEPDIR)/$(am__dirstamp) datatypes/int/sc_nbutils.lo: datatypes/int/$(am__dirstamp) \ datatypes/int/$(DEPDIR)/$(am__dirstamp) @@ -891,8 +967,6 @@ datatypes/misc/$(am__dirstamp): datatypes/misc/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) datatypes/misc/$(DEPDIR) @: > datatypes/misc/$(DEPDIR)/$(am__dirstamp) -datatypes/misc/sc_concatref.lo: datatypes/misc/$(am__dirstamp) \ - datatypes/misc/$(DEPDIR)/$(am__dirstamp) datatypes/misc/sc_value_base.lo: datatypes/misc/$(am__dirstamp) \ datatypes/misc/$(DEPDIR)/$(am__dirstamp) tracing/$(am__dirstamp): @@ -988,15 +1062,15 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@datatypes/fx/$(DEPDIR)/scfx_pow10.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@datatypes/fx/$(DEPDIR)/scfx_rep.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@datatypes/fx/$(DEPDIR)/scfx_utils.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@datatypes/int/$(DEPDIR)/sc_int32_mask.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@datatypes/int/$(DEPDIR)/sc_int64_io.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@datatypes/int/$(DEPDIR)/sc_int64_mask.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@datatypes/int/$(DEPDIR)/sc_int_base.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@datatypes/int/$(DEPDIR)/sc_int_mask.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@datatypes/int/$(DEPDIR)/sc_length_param.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@datatypes/int/$(DEPDIR)/sc_nbexterns.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@datatypes/int/$(DEPDIR)/sc_nbutils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@datatypes/int/$(DEPDIR)/sc_signed.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@datatypes/int/$(DEPDIR)/sc_uint_base.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@datatypes/int/$(DEPDIR)/sc_unsigned.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@datatypes/misc/$(DEPDIR)/sc_concatref.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@datatypes/misc/$(DEPDIR)/sc_value_base.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@kernel/$(DEPDIR)/sc_attribute.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@kernel/$(DEPDIR)/sc_cor_fiber.Plo@am__quote@ @@ -1015,12 +1089,12 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@kernel/$(DEPDIR)/sc_name_gen.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@kernel/$(DEPDIR)/sc_object.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@kernel/$(DEPDIR)/sc_object_manager.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@kernel/$(DEPDIR)/sc_phase_callback_registry.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@kernel/$(DEPDIR)/sc_process.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@kernel/$(DEPDIR)/sc_reset.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@kernel/$(DEPDIR)/sc_sensitive.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@kernel/$(DEPDIR)/sc_simcontext.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@kernel/$(DEPDIR)/sc_spawn_options.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@kernel/$(DEPDIR)/sc_stage_callback_registry.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@kernel/$(DEPDIR)/sc_thread_process.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@kernel/$(DEPDIR)/sc_time.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@kernel/$(DEPDIR)/sc_ver.Plo@am__quote@ diff --git a/src/sysc/packages/qt/Makefile.in b/src/sysc/packages/qt/Makefile.in index 2fbe29661..520e5bada 100644 --- a/src/sysc/packages/qt/Makefile.in +++ b/src/sysc/packages/qt/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -94,17 +94,15 @@ DIST_COMMON = $(top_srcdir)/config/Make-rules.sysc \ @WANT_OPTIMIZE_TRUE@am__append_4 = $(OPT_CXXFLAGS) @WANT_OPTIMIZE_TRUE@am__append_5 = $(OPT_CXXFLAGS) -# either for async_update locking or pthread processes +# for pthread processes @USES_PTHREADS_LIB_TRUE@am__append_6 = $(PTHREAD_CFLAGS) @USES_PTHREADS_LIB_TRUE@am__append_7 = $(PTHREAD_CFLAGS) @USES_PTHREADS_LIB_TRUE@am__append_8 = $(PTHREAD_LIBS) -@DISABLE_ASYNC_UPDATES_TRUE@am__append_9 = -DSC_DISABLE_ASYNC_UPDATES -@ENABLE_CALLBACKS_TRUE@am__append_10 = -DSC_ENABLE_SIMULATION_PHASE_CALLBACKS -@ENABLE_CALLBACKS_TRACING_TRUE@am__append_11 = -DSC_ENABLE_SIMULATION_PHASE_CALLBACKS_TRACING -@WANT_PTHREADS_THREADS_TRUE@am__append_12 = -DSC_USE_PTHREADS -@DISABLE_VCD_SCOPES_TRUE@am__append_13 = -DSC_DISABLE_VCD_SCOPES -@QT_ARCH_POWERPC_MACOSX_TRUE@@WANT_QT_THREADS_TRUE@am__append_14 = qtmdc.c -@SEPARATE_BUILD_TREE_TRUE@@WANT_QT_THREADS_TRUE@am__append_15 = \ +@WANT_PTHREADS_THREADS_TRUE@am__append_9 = -DSC_USE_PTHREADS +@DISABLE_VCD_SCOPES_TRUE@am__append_10 = -DSC_DISABLE_VCD_SCOPES +@ENABLE_LEGACY_MEM_MGMT_TRUE@am__append_11 = -DSC_LEGACY_MEM_MGMT +@QT_ARCH_POWERPC_MACOSX_TRUE@@WANT_QT_THREADS_TRUE@am__append_12 = qtmdc.c +@SEPARATE_BUILD_TREE_TRUE@@WANT_QT_THREADS_TRUE@am__append_13 = \ @SEPARATE_BUILD_TREE_TRUE@@WANT_QT_THREADS_TRUE@ $(QT_ARCH_IMPL) subdir = src/sysc/packages/qt @@ -368,11 +366,10 @@ AM_LDFLAGS = $(EXTRA_LDFLAGS) $(am__append_8) # always add fix-point support EXTRA_DEFINES = -DSC_INCLUDE_FX -DSC_BUILD $(am__append_9) \ - $(am__append_10) $(am__append_11) $(am__append_12) \ - $(am__append_13) + $(am__append_10) $(am__append_11) # initialize some useful variables (filled later) -CLEANFILES = $(QT_ARCH_FILES) configuration $(am__append_15) +CLEANFILES = $(QT_ARCH_FILES) configuration $(am__append_13) EXTRA_DIST = CHANGES config INSTALL Makefile.base README README.MISC \ README.PORT b.h meas.c stp.c stp.h time/assim time/cswap \ time/go time/init time/prim time/raw time/README.time \ @@ -456,7 +453,7 @@ NO_S_FILES = \ # only add qtmdc.c to QT_ARCH_FILES, if needed for the platform (!=null.c) -@WANT_QT_THREADS_TRUE@QT_ARCH_FILES = qtmds.s $(am__append_14) +@WANT_QT_THREADS_TRUE@QT_ARCH_FILES = qtmds.s $(am__append_12) @QT_ARCH_AARCH64_TRUE@@WANT_QT_THREADS_TRUE@QT_ARCH_IMPL = md/aarch64.s @QT_ARCH_HPPA_TRUE@@WANT_QT_THREADS_TRUE@QT_ARCH_IMPL = md/hppa.s @QT_ARCH_POWERPC_MACOSX_TRUE@@WANT_QT_THREADS_TRUE@QT_ARCH_IMPL = md/powerpc_mach.s md/powerpc.c diff --git a/src/tlm_core/Makefile.in b/src/tlm_core/Makefile.in index 814a7efd2..71a5e938f 100644 --- a/src/tlm_core/Makefile.in +++ b/src/tlm_core/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -94,15 +94,13 @@ DIST_COMMON = $(top_srcdir)/config/Make-rules.sysc \ @WANT_OPTIMIZE_TRUE@am__append_4 = $(OPT_CXXFLAGS) @WANT_OPTIMIZE_TRUE@am__append_5 = $(OPT_CXXFLAGS) -# either for async_update locking or pthread processes +# for pthread processes @USES_PTHREADS_LIB_TRUE@am__append_6 = $(PTHREAD_CFLAGS) @USES_PTHREADS_LIB_TRUE@am__append_7 = $(PTHREAD_CFLAGS) @USES_PTHREADS_LIB_TRUE@am__append_8 = $(PTHREAD_LIBS) -@DISABLE_ASYNC_UPDATES_TRUE@am__append_9 = -DSC_DISABLE_ASYNC_UPDATES -@ENABLE_CALLBACKS_TRUE@am__append_10 = -DSC_ENABLE_SIMULATION_PHASE_CALLBACKS -@ENABLE_CALLBACKS_TRACING_TRUE@am__append_11 = -DSC_ENABLE_SIMULATION_PHASE_CALLBACKS_TRACING -@WANT_PTHREADS_THREADS_TRUE@am__append_12 = -DSC_USE_PTHREADS -@DISABLE_VCD_SCOPES_TRUE@am__append_13 = -DSC_DISABLE_VCD_SCOPES +@WANT_PTHREADS_THREADS_TRUE@am__append_9 = -DSC_USE_PTHREADS +@DISABLE_VCD_SCOPES_TRUE@am__append_10 = -DSC_DISABLE_VCD_SCOPES +@ENABLE_LEGACY_MEM_MGMT_TRUE@am__append_11 = -DSC_LEGACY_MEM_MGMT subdir = src/tlm_core ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_define.m4 \ @@ -378,8 +376,7 @@ AM_LDFLAGS = $(EXTRA_LDFLAGS) $(am__append_8) # always add fix-point support EXTRA_DEFINES = -DSC_INCLUDE_FX -DSC_BUILD $(am__append_9) \ - $(am__append_10) $(am__append_11) $(am__append_12) \ - $(am__append_13) + $(am__append_10) $(am__append_11) # initialize some useful variables (filled later) CLEANFILES = diff --git a/src/tlm_utils/Makefile.in b/src/tlm_utils/Makefile.in index 71fa9a073..3054a8b57 100644 --- a/src/tlm_utils/Makefile.in +++ b/src/tlm_utils/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -94,15 +94,13 @@ DIST_COMMON = $(top_srcdir)/config/Make-rules.sysc \ @WANT_OPTIMIZE_TRUE@am__append_4 = $(OPT_CXXFLAGS) @WANT_OPTIMIZE_TRUE@am__append_5 = $(OPT_CXXFLAGS) -# either for async_update locking or pthread processes +# for pthread processes @USES_PTHREADS_LIB_TRUE@am__append_6 = $(PTHREAD_CFLAGS) @USES_PTHREADS_LIB_TRUE@am__append_7 = $(PTHREAD_CFLAGS) @USES_PTHREADS_LIB_TRUE@am__append_8 = $(PTHREAD_LIBS) -@DISABLE_ASYNC_UPDATES_TRUE@am__append_9 = -DSC_DISABLE_ASYNC_UPDATES -@ENABLE_CALLBACKS_TRUE@am__append_10 = -DSC_ENABLE_SIMULATION_PHASE_CALLBACKS -@ENABLE_CALLBACKS_TRACING_TRUE@am__append_11 = -DSC_ENABLE_SIMULATION_PHASE_CALLBACKS_TRACING -@WANT_PTHREADS_THREADS_TRUE@am__append_12 = -DSC_USE_PTHREADS -@DISABLE_VCD_SCOPES_TRUE@am__append_13 = -DSC_DISABLE_VCD_SCOPES +@WANT_PTHREADS_THREADS_TRUE@am__append_9 = -DSC_USE_PTHREADS +@DISABLE_VCD_SCOPES_TRUE@am__append_10 = -DSC_DISABLE_VCD_SCOPES +@ENABLE_LEGACY_MEM_MGMT_TRUE@am__append_11 = -DSC_LEGACY_MEM_MGMT subdir = src/tlm_utils ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_define.m4 \ @@ -376,8 +374,7 @@ AM_LDFLAGS = $(EXTRA_LDFLAGS) $(am__append_8) # always add fix-point support EXTRA_DEFINES = -DSC_INCLUDE_FX -DSC_BUILD $(am__append_9) \ - $(am__append_10) $(am__append_11) $(am__append_12) \ - $(am__append_13) + $(am__append_10) $(am__append_11) # initialize some useful variables (filled later) CLEANFILES =