Index: trunk/IPs/systemC/Environment/Cache/include/Cache_OneLevel_Address.h =================================================================== --- trunk/IPs/systemC/Environment/Cache/include/Cache_OneLevel_Address.h (revision 142) +++ trunk/IPs/systemC/Environment/Cache/include/Cache_OneLevel_Address.h (revision 143) @@ -4,4 +4,5 @@ #include #include +#include namespace environment { Index: trunk/IPs/systemC/Environment/Cache/include/Cache_OneLevel_Parameters.h =================================================================== --- trunk/IPs/systemC/Environment/Cache/include/Cache_OneLevel_Parameters.h (revision 142) +++ trunk/IPs/systemC/Environment/Cache/include/Cache_OneLevel_Parameters.h (revision 143) @@ -5,4 +5,6 @@ #include #include +#include +#include namespace environment { Index: trunk/IPs/systemC/Environment/Common/include/Debug.h =================================================================== --- trunk/IPs/systemC/Environment/Common/include/Debug.h (revision 142) +++ trunk/IPs/systemC/Environment/Common/include/Debug.h (revision 143) @@ -1,4 +1,6 @@ #ifndef ENVIRONMENT_COMMON_DEBUG_H #define ENVIRONMENT_COMMON_DEBUG_H + +#include #define DEBUG_true true Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Common =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Common (revision 142) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Common (revision 143) @@ -36,5 +36,5 @@ INCDIR = $(SYSTEMC_INCDIR_$(SIMULATOR_SYSTEMC)) \ -I. \ - -I$(DIR_MORPHEO) + -I$(DIR_MORPHEO) LIBDIR = -L$(DIR_LIB) \ Index: trunk/IPs/systemC/processor/Morpheo/Common/include/ToString.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Common/include/ToString.h (revision 142) +++ trunk/IPs/systemC/processor/Morpheo/Common/include/ToString.h (revision 143) @@ -19,4 +19,5 @@ #include #include +#include namespace morpheo { Index: trunk/IPs/systemC/processor/Morpheo/Common/src/Basename.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Common/src/Basename.cpp (revision 142) +++ trunk/IPs/systemC/processor/Morpheo/Common/src/Basename.cpp (revision 143) @@ -7,4 +7,5 @@ #include "../include/Basename.h" +#include namespace morpheo { Index: trunk/Makefile.flags =================================================================== --- trunk/Makefile.flags (revision 142) +++ trunk/Makefile.flags (revision 143) @@ -4,4 +4,8 @@ # [ Description ] # + +ifeq ($(origin MORPHEO_TYPE), undefined) + $(error "variable MORPHEO_TYPE is undefined"); +endif #-----[ Simulator ]---------------------------------------- @@ -19,7 +23,6 @@ #-----[ Flags ]-------------------------------------------- -MORPHEO_TYPE ?= debug_systemc -MORPHEO_TYPE_LIST = "systemc" "vhdl" "cosim" "debug" "debug_systemc" +# If you add a MORPHEO_FLAGS, add name in array "type_list" in file "environment.sh" MORPHEO_systemc_FLAGS = -DSYSTEMC \ Index: trunk/Makefile.tools =================================================================== --- trunk/Makefile.tools (revision 142) +++ trunk/Makefile.tools (revision 143) @@ -59,8 +59,9 @@ #VALGRIND = valgrind --tool=memcheck --leak-check=yes --show-reachable=yes VALGRIND = valgrind --tool=memcheck --leak-check=full --show-reachable=yes --leak-resolution=high --partial-loads-ok=yes --undef-value-errors=yes -labs_network_CC_PREFIX = $(DISTCC) -labs_local_CC_PREFIX = -home_CC_PREFIX = -CC_PREFIX = $($(MORPHEO_LOCALIZATION)_CC_PREFIX) +ifeq ($(MORPHEO_DISTCC), 0) +CC_PREFIX = +else +CC_PREFIX = $(DISTCC) +endif CC_FLAGS_COMMON = -O3 -m32 -Wall -Wunused -g3 -pg # -static -march=i686 Index: trunk/Makefile.tools_path =================================================================== --- trunk/Makefile.tools_path (revision 142) +++ trunk/Makefile.tools_path (revision 143) @@ -10,41 +10,24 @@ # LABS #---------------------------------------------------------- - labs_network_ENV = export PATH=$${PATH}:/bin:/usr/bin:/users/chaos/kane/Softwares/distcc/bin - labs_network_SYSTEMC_systemc = /users/chaos/kane/Softwares/systemc - labs_network_SYSTEMC_systemcass = /users/chaos/kane/Softwares/systemcass - labs_network_SYSTEMC_systemcass_deps = $(labs_network_SYSTEMC_systemcass) - labs_network_XILINX = /users/chaos/kane/Softwares/Xilinx92i - labs_network_XILINX_CORELIB = /users/chaos/kane/Softwares/XilinxCoreLib - labs_network_MODELTECH = /users/chaos/kane/Softwares/modeltech - labs_network_MODELTECH_LICENCE = /users/soft/mentor/mgls_v8-5_0-5-0.ss5/etc/cust/mgc/license.anacad.2008 - labs_network_OR1K_GCC_BASENAME = or32-elf -#labs_network_OR1K_GCC_VERSION = 4.2.2 - labs_network_OR1K_GCC_VERSION = 3.4.4 - labs_network_OR1K = /users/chaos/kane/Softwares/$(labs_network_OR1K_GCC_BASENAME)-$(labs_network_OR1K_GCC_VERSION) - labs_network_NEWLIB = /users/chaos/kane/Softwares/newlib/$(labs_network_OR1K_GCC_BASENAME) - labs_network_QT = /users/chaos/kane/Softwares/qt-x11-opensource-4.2.3 - labs_network_EV67_GCC_BASENAME = alphaev67-unknown-linux-gnu - labs_network_EV67_GCC_VERSION = 4.3.2 -#labs_network_EV67_GCC_BASENAME = alpha-unknown-linux-gnu -#labs_network_EV67_GCC_VERSION = 4.0.2 - labs_network_EV67 = /users/chaos/kane/Softwares/$(labs_network_EV67_GCC_BASENAME) -#labs_network_EV67 = /users/chaos/kane/Softwares/gcc-4.0.2-glibc-2.3.6/$(labs_network_EV67_GCC_BASENAME) - - labs_local_ENV = $(labs_network_ENV) - labs_local_SYSTEMC_systemc = $(labs_network_SYSTEMC_systemc) - labs_local_SYSTEMC_systemcass = $(labs_network_SYSTEMC_systemcass) - labs_local_SYSTEMC_systemcass_deps = $(labs_network_SYSTEMC_systemcass_deps) - labs_local_XILINX = $(labs_network_XILINX) - labs_local_XILINX_CORELIB = $(labs_network_XILINX_CORELIB) - labs_local_MODELTECH = $(labs_network_MODELTECH) - labs_local_MODELTECH_LICENCE = $(labs_network_MODELTECH_LICENCE) - labs_local_OR1K_GCC_BASENAME = $(labs_network_OR1K_GCC_BASENAME) - labs_local_OR1K_GCC_VERSION = $(labs_network_OR1K_GCC_VERSION) - labs_local_OR1K = $(labs_network_OR1K) - labs_local_NEWLIB = $(labs_network_NEWLIB) - labs_local_QT = $(labs_network_QT) - labs_local_EV67_GCC_BASENAME = $(labs_network_EV67_GCC_BASENAME) - labs_local_EV67_GCC_VERSION = $(labs_network_EV67_GCC_VERSION) - labs_local_EV67 = $(labs_network_EV67) + labs_ENV = export PATH=$${PATH}:/bin:/usr/bin:/users/chaos/kane/Softwares/distcc/bin + labs_SYSTEMC_systemc = /users/chaos/kane/Softwares/systemc + labs_SYSTEMC_systemcass = /users/chaos/kane/Softwares/systemcass + labs_SYSTEMC_systemcass_deps = $(labs_SYSTEMC_systemcass) + labs_XILINX = /users/chaos/kane/Softwares/Xilinx92i + labs_XILINX_CORELIB = /users/chaos/kane/Softwares/XilinxCoreLib + labs_MODELTECH = /users/chaos/kane/Softwares/modeltech + labs_MODELTECH_LICENCE = /users/soft/mentor/mgls_v8-5_0-5-0.ss5/etc/cust/mgc/license.anacad.2008 + labs_OR1K_GCC_BASENAME = or32-elf +#labs_OR1K_GCC_VERSION = 4.2.2 + labs_OR1K_GCC_VERSION = 3.4.4 + labs_OR1K = /users/chaos/kane/Softwares/$(labs_OR1K_GCC_BASENAME)-$(labs_OR1K_GCC_VERSION) + labs_NEWLIB = /users/chaos/kane/Softwares/newlib/$(labs_OR1K_GCC_BASENAME) + labs_QT = /users/chaos/kane/Softwares/qt-x11-opensource-4.2.3 + labs_EV67_GCC_BASENAME = alphaev67-unknown-linux-gnu + labs_EV67_GCC_VERSION = 4.3.2 +#labs_EV67_GCC_BASENAME = alpha-unknown-linux-gnu +#labs_EV67_GCC_VERSION = 4.0.2 + labs_EV67 = /users/chaos/kane/Softwares/$(labs_EV67_GCC_BASENAME) +#labs_EV67 = /users/chaos/kane/Softwares/gcc-4.0.2-glibc-2.3.6/$(labs_EV67_GCC_BASENAME) #---------------------------------------------------------- @@ -69,4 +52,24 @@ #---------------------------------------------------------- +# NETTOP (mc-mishima) +#---------------------------------------------------------- + nettop_ENV = export PATH=$$PATH:/bin:/usr/bin + nettop_SYSTEMC_systemc = /media/disk/Software/systemc-2.2.0 + nettop_SYSTEMC_systemcass = /media/disk/Software/systemcass + nettop_SYSTEMC_systemcass_deps = $(nettop_SYSTEMC_systemcass) + nettop_XILINX = /media/disk/Software/Xilinx91i + nettop_XILINX_CORELIB = /media/disk/Software/XilinxCoreLib + nettop_MODELTECH = /media/disk/Software/modelsim/modeltech-6.2b + nettop_MODELTECH_LICENCE = /media/disk/Software/modelsim/license/license_modelsim-SE-6.2b + nettop_OR1K_GCC_BASENAME = or32-elf + nettop_OR1K_GCC_VERSION = 3.4.4 + nettop_OR1K = /media/disk/Software/$(nettop_OR1K_GCC_BASENAME) + nettop_NEWLIB = /media/disk/Software/newlib/$(nettop_OR1K_GCC_BASENAME) + nettop_QT = /media/disk/Software/qt + nettop_EV67_GCC_BASENAME = + nettop_EV67_GCC_VERSION = + nettop_EV67 = + +#---------------------------------------------------------- # Path #---------------------------------------------------------- Index: trunk/Version =================================================================== --- trunk/Version (revision 142) +++ trunk/Version (revision 143) @@ -1,1 +1,1 @@ -0 2 142 Castor 04 08 2010 +0 2 143 Castor 02 09 2010 Index: trunk/environment.sh =================================================================== --- trunk/environment.sh (revision 142) +++ trunk/environment.sh (revision 143) @@ -1,11 +1,15 @@ #!/bin/bash -declare localization="labs_network"; +declare localization="labs"; +declare type="cosim"; +declare type_list=("systemc" "vhdl" "cosim" "debug" "debug_systemc"); +declare distcc=0; declare file_version="Version"; +declare error=0; #-----[ environment_usage ]-------------------------------- function environment_usage () { - echo "Usage : ${0} [localization]"; + echo "Usage : ${0} [-l localization] [-t type] [-d]"; # exit; } @@ -14,12 +18,29 @@ function environment_test_usage () { - if test ${#} -ne 1 -a ${#} -ne 0; then - environment_usage; +# if test ${#} -gt 1 -a ${#} -lt 0; then +# environment_usage ${*}; +# fi; + + TEMP=`getopt -o l:t:hd -- "$@"` + + if test $? != 0; then + echo "Error in argument parsing"; + error=1; fi; - if test ${#} -eq 1; then - localization=${1}; - - # else : default localization + if test ${error} -eq 0; then + + eval set -- "$TEMP" + + while true ; do + case "$1" in + -t) type=${2}; shift 2;; + -l) localization=${2}; shift 2;; + -h) environment_usage ${*}; shift;; + -d) distcc=1; shift;; + --) shift ; break ;; + *) echo "Internal error"; error=1;; + esac + done fi; } @@ -39,5 +60,4 @@ export MORPHEO_DATE_YEAR=$( echo ${version} | cut -d ' ' -f 7); - echo "Morpheo ${MORPHEO_MAJOR_VERSION}.${MORPHEO_MINOR_VERSION}.${MORPHEO_REVISION} \"${MORPHEO_CODENAME}\" (${MORPHEO_DATE_DAY}/${MORPHEO_DATE_MONTH}/${MORPHEO_DATE_YEAR})"; } @@ -48,45 +68,54 @@ environment_test_usage ${*}; - local OS_FOUND=`uname -s`-`uname -m | sed -e 's/i[0-9]/iX/' -e 's/sun4./sun4X/'` + if test ${error} -eq 0; then + local OS_FOUND=`uname -s`-`uname -m | sed -e 's/i[0-9]/iX/' -e 's/sun4./sun4X/'` - case ${OS_FOUND} in - "Linux-iX86") - export TARGET_ARCH=linux; - export EXE_SUFFIX=; - ;; - *) - echo "Unknown OS found" - esac - - cd $(dirname ${BASH_SOURCE[0]}); - export MORPHEO_TOPLEVEL=${PWD}; - cd - &> /dev/null; - - # Export environment - export MORPHEO_LOCALIZATION=${localization}; - export MORPHEO_SCRIPT=${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Script; - export MORPHEO_HOME=${HOME}/.Morpheo; - local MORPHEO_XTTY=${MORPHEO_TOPLEVEL}/IPs/systemC/Environment/TTY/xtty; - local error=0; + case ${OS_FOUND} in + "Linux-iX86") + export TARGET_ARCH=linux; + export EXE_SUFFIX=; + ;; + *) + echo "Unknown OS found" + esac + + cd $(dirname ${BASH_SOURCE[0]}); + export MORPHEO_TOPLEVEL=${PWD}; + cd - &> /dev/null; + + # Export environment + export MORPHEO_LOCALIZATION=${localization}; + export MORPHEO_TYPE=${type}; + export MORPHEO_DISTCC=${distcc}; + export MORPHEO_SCRIPT=${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Script; + export MORPHEO_HOME=${HOME}/.Morpheo; + local MORPHEO_XTTY=${MORPHEO_TOPLEVEL}/IPs/systemC/Environment/TTY/xtty; + + for i in ${type_list[*]}; do + if test "${i}" = "${MORPHEO_TYPE}"; then + error=0; + break; + fi; + done; + + if test ${error} -ne 0; then + echo "Bad type : \"${MORPHEO_TYPE}\""; + fi; - case ${MORPHEO_LOCALIZATION} in - "labs_network") - export MORPHEO_PREFIX=/users/chaos/kane/Morpheo; - export MORPHEO_TMP=${MORPHEO_PREFIX}/tmp; - ;; - "labs_local") - export MORPHEO_PREFIX=/users/chaos/kane/Morpheo; - export MORPHEO_TMP=${MORPHEO_PREFIX}/tmp; - ;; - "home") - export MORPHEO_PREFIX=${HOME}/tmp/Morpheo; - export MORPHEO_TMP=${MORPHEO_PREFIX}/tmp; - ;; - *) - echo "Bad localization : \"${MORPHEO_LOCALIZATION}\""; - error=1; - environment_usage ${*}; - ;; - esac + case ${MORPHEO_LOCALIZATION} in + "labs") + export MORPHEO_PREFIX=/users/chaos/kane/Morpheo; + export MORPHEO_TMP=${MORPHEO_PREFIX}/tmp; + ;; + "home" | "nettop") + export MORPHEO_PREFIX=${HOME}/tmp/Morpheo; + export MORPHEO_TMP=${MORPHEO_PREFIX}/tmp; + ;; + *) + echo "Bad localization : \"${MORPHEO_LOCALIZATION}\""; + error=1; + ;; + esac + fi; if test ${error} -eq 0; then @@ -98,4 +127,6 @@ echo "Modification of environement's variable :" echo " - MORPHEO_LOCALIZATION is set to ${MORPHEO_LOCALIZATION}" + echo " - MORPHEO_TYPE is set to ${MORPHEO_TYPE}" + echo " - MORPHEO_DISTCC is set to ${MORPHEO_DISTCC}" echo " - MORPHEO_TOPLEVEL is set to ${MORPHEO_TOPLEVEL}" echo " - MORPHEO_SCRIPT is set to ${MORPHEO_SCRIPT}" @@ -111,6 +142,6 @@ echo ${PATH} |grep -q ${MORPHEO_SCRIPT}; if test $? -eq 1; then - export PATH=${PATH}:${MORPHEO_SCRIPT} - echo " - PATH add ${MORPHEO_SCRIPT}" + export PATH=${PATH}:${MORPHEO_SCRIPT} + echo " - PATH add ${MORPHEO_SCRIPT}" fi; @@ -118,9 +149,11 @@ if test $? -eq 1; then - export PATH=${PATH}:${MORPHEO_XTTY} - echo " - PATH add ${MORPHEO_XTTY}" + export PATH=${PATH}:${MORPHEO_XTTY} + echo " - PATH add ${MORPHEO_XTTY}" fi; echo "" + else + environment_usage ${*}; fi; } @@ -129,4 +162,8 @@ environment ${*}; +unset error; unset file_version; +unset type_list; +unset distcc; +unset type; unset localization;