Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_allocation.cpp
===================================================================
--- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_allocation.cpp (revision 124)
+++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_allocation.cpp (revision 125)
@@ -17,6 +17,4 @@
namespace ooo_engine {
namespace commit_unit {
-
-
#undef FUNCTION
@@ -354,5 +352,5 @@
_param->_nb_inst_insert,
_param->_nb_rename_unit_select);
-
+
#ifdef POSITION
if (usage_is_set(_usage,USE_POSITION))
Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_deallocation.cpp
===================================================================
--- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_deallocation.cpp (revision 124)
+++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_deallocation.cpp (revision 125)
@@ -168,5 +168,7 @@
DELETE2_SIGNAL(out_SPR_WRITE_SR_OV ,_param->_nb_front_end, _param->_nb_context[it1],1);
+#ifdef DEBUG_TEST
DELETE0_SIGNAL(out_INFO_ROB_EMPTY ,1);
+#endif
// ~~~~~[ Internal ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Version.h
===================================================================
--- /trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Version.h (revision 124)
+++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Version.h (revision 125)
@@ -10,5 +10,5 @@
#define MORPHEO_MAJOR_VERSION "0"
#define MORPHEO_MINOR_VERSION "2"
-#define MORPHEO_REVISION "124"
+#define MORPHEO_REVISION "125"
#define MORPHEO_CODENAME "Castor"
Index: /trunk/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
===================================================================
--- /trunk/IPs/systemC/processor/Morpheo/Files/Morpheo.sim (revision 124)
+++ /trunk/IPs/systemC/processor/Morpheo/Files/Morpheo.sim (revision 125)
@@ -28,5 +28,5 @@
-
+
@@ -34,80 +34,80 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
Index: /trunk/Platforms/Test/Makefile
===================================================================
--- /trunk/Platforms/Test/Makefile (revision 124)
+++ /trunk/Platforms/Test/Makefile (revision 125)
@@ -43,15 +43,15 @@
ENTITY = Test
-DIR_TMP = $(MORPHEO_TMP)
-DIR_INC = include
-DIR_SRC = src
-DIR_OBJ = $(DIR_TMP)/obj
-DIR_LIB = $(DIR_TMP)/lib
-DIR_BIN = $(DIR_TMP)/bin
-DIR_LOG = $(DIR_TMP)/log
-DIR_DATA = ./data
-DIR_LOGS = $(patsubst $(DIR_DATA)/%,$(DIR_LOG)/%,$(wildcard $(DIR_DATA)/*))
-
-DIR_SOFT = $(MORPHEO_TOPLEVEL)/Softwares
+PATH_TMP = $(MORPHEO_TMP)
+PATH_INC = include
+PATH_SRC = src
+PATH_OBJ = $(PATH_TMP)/obj
+PATH_LIB = $(PATH_TMP)/lib
+PATH_BIN = $(PATH_TMP)/bin
+PATH_LOG = $(PATH_TMP)/log
+PATH_DATA = ./data
+PATH_LOGS = $(patsubst $(PATH_DATA)/%,$(PATH_LOG)/%,$(wildcard $(PATH_DATA)/*))
+
+PATH_SOFT = $(MORPHEO_TOPLEVEL)/Softwares
#MORPHEO - define in $(MORPHEO_TOPLEVEL)/IPs/systemC/processor/Morpheo/Makefile.deps
@@ -71,10 +71,11 @@
#----------------------------------------------------------
#----------------------------------------------------------
-SOURCES = $(wildcard $(DIR_SRC)/*.cpp)
-OBJECTS = $(patsubst $(DIR_SRC)/%.cpp,$(DIR_OBJ)/%.o,$(SOURCES))
-LOGS = $(patsubst $(DIR_DATA)/%.cfg,$(DIR_LOG)/%.log,$(wildcard $(DIR_DATA)/$(DATA)/*.cfg))
-EXEC = $(DIR_BIN)/soft.x
-EXEC_PREFIX = $(NICE) -n $(PRIORITY)
-#$(VALGRIND)
+SOURCES = $(wildcard $(PATH_SRC)/*.cpp)
+OBJECTS = $(patsubst $(PATH_SRC)/%.cpp,$(PATH_OBJ)/%.o,$(SOURCES))
+LOGS = $(patsubst $(PATH_DATA)/%.cfg,$(PATH_LOG)/%.log,$(wildcard $(PATH_DATA)/$(DATA)/*.cfg))
+EXEC = $(PATH_BIN)/soft.x
+EXEC_PREFIX = $(NICE) -n $(PRIORITY) $(VALGRIND)
+
+SCRIPT = make.sh
#-----[ Compilation ]--------------------------------------
@@ -82,5 +83,5 @@
$(MORPHEO_INCDIR) \
$(ENVIRONMENT_INCDIR) \
- -I$(DIR_INC)
+ -I$(PATH_INC)
#LIBDIR = $(SYSTEMC_LIBDIR_$(SIMULATOR_SYSTEMC)) \
@@ -89,5 +90,5 @@
LIBDIR = $(SYSTEMC_LIBDIR_$(SIMULATOR_SYSTEMC)) \
- -L$(DIR_LIB)
+ -L$(PATH_LIB)
LIBNAME = $(ENVIRONMENT_LIBNAME) \
@@ -106,14 +107,14 @@
#----------------------------------------------------------
-vpath %.h $(DIR_INC)
-vpath %.cpp $(DIR_SRC)
-vpath %.o $(DIR_OBJ)
-vpath %.cfg $(DIR_DATA)/*/
-
-.PRECIOUS : $(DIR_OBJ)/%.o $(DIR_BIN)/%.x $(DIR_LOG)/%.log
+vpath %.h $(PATH_INC)
+vpath %.cpp $(PATH_SRC)
+vpath %.o $(PATH_OBJ)
+vpath %.cfg $(PATH_DATA)/*/
+
+.PRECIOUS : $(PATH_OBJ)/%.o $(PATH_BIN)/%.x $(PATH_LOG)/%.log
all : $(EXEC)
-$(DIR_BIN)/%.x : $(DIR_OBJ) $(DIR_BIN)
+$(PATH_BIN)/%.x : $(PATH_OBJ) $(PATH_BIN)
@\
$(ECHO) "Linkage : $*";\
@@ -139,7 +140,7 @@
declare -i clean=$(CLEAN); \
if $(TEST) $${clean} -ne 0 -a "$(DATA)" != "$(DATA_ALL)"; then \
- $(RM) $(DIR_LOG)/$(DATA); \
+ $(RM) $(PATH_LOG)/$(DATA); \
fi; \
- $(MAKE) $(DIR_LOGS); \
+ $(MAKE) $(PATH_LOGS); \
declare logs="$(LOGS)"; \
$(MAKE) $${logs}; \
@@ -171,5 +172,16 @@
$(MAKE) run DATA=bench;
-$(DIR_LOG)/%.log : $(DIR_DATA)/%.cfg $(EXEC)
+distexe :
+ @\
+ $(RM) $(SCRIPT); \
+ for log in $(LOGS); do \
+ $(ECHO) -n "cd $(MORPHEO_TOPLEVEL); source environment.sh; cd -; path=\"${PWD}\"; " >> $(SCRIPT); \
+ if $(TEST) $(CLEAN) -ne 0; then \
+ $(ECHO) -n "$(RM) $${log}; " >> $(SCRIPT); \
+ fi; \
+ $(ECHO) "$(MAKE) -C "'$${path}'" $${log} PRIORITY=$(PRIORITY);" >> $(SCRIPT); \
+ done
+
+$(PATH_LOG)/%.log : $(PATH_DATA)/%.cfg $(EXEC)
@\
file=$$($(BASENAME) $<); \
@@ -202,14 +214,14 @@
soft :
@\
- $(MAKE) --directory=$(DIR_SOFT) --makefile=Makefile;
+ $(MAKE) --directory=$(PATH_SOFT) --makefile=Makefile;
#-----[ Rules ]--------------------------------------------
-$(DIR_OBJ)/%.o : %.cpp
+$(PATH_OBJ)/%.o : %.cpp
@\
$(ECHO) "Compilation : $*";\
$(CXX) $(PLATFORMS_CXX_FLAGS) -c -o $@ $<;
-$(DIR_OBJ) $(DIR_BIN) $(DIR_LOGS) :
+$(PATH_OBJ) $(PATH_BIN) $(PATH_LOGS) :
@\
$(ECHO) "Create directory : $@";\
@@ -222,5 +234,5 @@
$(ECHO) "Delete temporary files in directory $(PWD)";\
$(RM) $(OBJECTS) $(EXEC) $(LOGS) \
- *~ $(DIR_SRC)/*~ $(DIR_INC)/*~ $(DIR_DATA)/*/*~ *.res *.txt\
+ *~ $(PATH_SRC)/*~ $(PATH_INC)/*~ $(PATH_DATA)/*/*~ *.res *.txt\
*core* \
tty* \
@@ -234,6 +246,6 @@
@\
$(ECHO) "Delete generated files in directory $(PWD)";\
- $(RM) $(DIR_OBJ) $(DIR_BIN) $(DIR_LOG);\
- $(MAKE) --directory=$(DIR_SOFT) --makefile=Makefile clean_all; \
+ $(RM) $(PATH_OBJ) $(PATH_BIN) $(PATH_LOG) $(SCRIPT);\
+ $(MAKE) --directory=$(PATH_SOFT) --makefile=Makefile clean_all; \
$(MAKE) --directory=$(ENVIRONMENT_DIR) --makefile=Makefile clean_all; \
$(MAKE) --directory=$(MORPHEO_DIR) --makefile=Makefile clean_all;
@@ -246,5 +258,5 @@
$(ECHO) " * all (default rules) : create software";\
$(ECHO) " * run : execute platforms with test configuration";\
- $(ECHO) " set DATA to select a specific directory in $(DIR_DATA) (default : all)";\
+ $(ECHO) " set DATA to select a specific directory in $(PATH_DATA) (default : all)";\
$(ECHO) " set PRIORITY to nice the execution (default : 0)";\
$(ECHO) " set CLEAN to remove previous log (default : 0)";\
@@ -253,4 +265,5 @@
$(ECHO) " * debug : cf 'make run DATA=debug'";\
$(ECHO) " * bench : cf 'make run DATA=bench'";\
+ $(ECHO) " * distexe : Generate an command file to distexe. It's as run command, but just generate an script with all make";\
$(ECHO) " * lib : make library";\
$(ECHO) " * soft : make software";\