Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Common
===================================================================
--- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Common (revision 129)
+++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Common (revision 130)
@@ -11,4 +11,7 @@
else
include $(MORPHEO_TOPLEVEL)/Makefile.tools
+endif
+ifeq ($(origin MORPHEO_PREFIX), undefined)
+ $(error "variable MORPHEO_PREFIX is undefined");
endif
ifeq ($(origin MORPHEO_TMP), undefined)
@@ -27,5 +30,5 @@
DIR_SRC = src
DIR_OBJ = $(DIR_TMP)/obj
-DIR_LIB = $(DIR_TMP)/lib
+DIR_LIB = $(MORPHEO_PREFIX)/lib
DIR_SCRIPT = $(MORPHEO_SCRIPT)
Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Version.h
===================================================================
--- /trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Version.h (revision 129)
+++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Version.h (revision 130)
@@ -10,8 +10,8 @@
#define MORPHEO_MAJOR_VERSION "0"
#define MORPHEO_MINOR_VERSION "2"
-#define MORPHEO_REVISION "129"
+#define MORPHEO_REVISION "130"
#define MORPHEO_CODENAME "Castor"
-#define MORPHEO_DATE_DAY "29"
+#define MORPHEO_DATE_DAY "30"
#define MORPHEO_DATE_MONTH "06"
#define MORPHEO_DATE_YEAR "2009"
Index: /trunk/IPs/systemC/processor/Morpheo/Files/Morpheo-Dhrystone.sim
===================================================================
--- /trunk/IPs/systemC/processor/Morpheo/Files/Morpheo-Dhrystone.sim (revision 129)
+++ /trunk/IPs/systemC/processor/Morpheo/Files/Morpheo-Dhrystone.sim (revision 130)
@@ -15,7 +15,7 @@
-
+
-
+
Index: /trunk/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
===================================================================
--- /trunk/IPs/systemC/processor/Morpheo/Files/Morpheo.sim (revision 129)
+++ /trunk/IPs/systemC/processor/Morpheo/Files/Morpheo.sim (revision 130)
@@ -15,5 +15,5 @@
-
+
Index: /trunk/IPs/systemC/processor/Morpheo/Files/debug.sim
===================================================================
--- /trunk/IPs/systemC/processor/Morpheo/Files/debug.sim (revision 129)
+++ /trunk/IPs/systemC/processor/Morpheo/Files/debug.sim (revision 130)
@@ -15,5 +15,5 @@
-
+
Index: /trunk/Platforms/Test/Makefile
===================================================================
--- /trunk/Platforms/Test/Makefile (revision 129)
+++ /trunk/Platforms/Test/Makefile (revision 130)
@@ -23,4 +23,7 @@
$(error "variable MORPHEO_TMP is undefined")
endif
+ifeq ($(origin MORPHEO_PREFIX), undefined)
+ $(error "variable MORPHEO_PREFIX is undefined")
+endif
DATA_ALL = *
@@ -43,11 +46,10 @@
ENTITY = Test
-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_OBJ = $(MORPHEO_TMP)/obj
+PATH_LIB = $(MORPHEO_PREFIX)/lib
+PATH_BIN = $(MORPHEO_PREFIX)/bin
+PATH_LOG = $(MORPHEO_TMP)/log
PATH_DATA = ./data
PATH_LOGS = $(patsubst $(PATH_DATA)/%,$(PATH_LOG)/%,$(wildcard $(PATH_DATA)/*))
Index: /trunk/Platforms/Test/data/_Dhrystone/x1_w1_4.cfg
===================================================================
--- /trunk/Platforms/Test/data/_Dhrystone/x1_w1_4.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_Dhrystone/x1_w1_4.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo-Dhrystone.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w1_4.cfg
+${MORPHEO_TOPLEVEL}/Softwares/Dhrystone/bin/soft.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_Dhrystone/x1_w2_4.cfg
===================================================================
--- /trunk/Platforms/Test/data/_Dhrystone/x1_w2_4.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_Dhrystone/x1_w2_4.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo-Dhrystone.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w2_4.cfg
+${MORPHEO_TOPLEVEL}/Softwares/Dhrystone/bin/soft.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_Dhrystone/x1_w4_2.cfg
===================================================================
--- /trunk/Platforms/Test/data/_Dhrystone/x1_w4_2.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_Dhrystone/x1_w4_2.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo-Dhrystone.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w4_2.cfg
+${MORPHEO_TOPLEVEL}/Softwares/Dhrystone/bin/soft.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_Dhrystone/x1_w8_2.cfg
===================================================================
--- /trunk/Platforms/Test/data/_Dhrystone/x1_w8_2.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_Dhrystone/x1_w8_2.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo-Dhrystone.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w8_2.cfg
+${MORPHEO_TOPLEVEL}/Softwares/Dhrystone/bin/soft.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_IPC/max_x1_w1_4.cfg
===================================================================
--- /trunk/Platforms/Test/data/_IPC/max_x1_w1_4.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_IPC/max_x1_w1_4.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w1_4.cfg
+${MORPHEO_TOPLEVEL}/Softwares/Test/Test_071/bin/soft.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_IPC/max_x1_w2_4.cfg
===================================================================
--- /trunk/Platforms/Test/data/_IPC/max_x1_w2_4.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_IPC/max_x1_w2_4.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w2_4.cfg
+${MORPHEO_TOPLEVEL}/Softwares/Test/Test_071/bin/soft.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_IPC/max_x1_w4_2.cfg
===================================================================
--- /trunk/Platforms/Test/data/_IPC/max_x1_w4_2.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_IPC/max_x1_w4_2.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w4_2.cfg
+${MORPHEO_TOPLEVEL}/Softwares/Test/Test_071/bin/soft.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_IPC/max_x1_w8_2.cfg
===================================================================
--- /trunk/Platforms/Test/data/_IPC/max_x1_w8_2.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_IPC/max_x1_w8_2.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w8_2.cfg
+${MORPHEO_TOPLEVEL}/Softwares/Test/Test_071/bin/soft.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_MiBench/x1_w1_4-bench_0.cfg
===================================================================
--- /trunk/Platforms/Test/data/_MiBench/x1_w1_4-bench_0.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_MiBench/x1_w1_4-bench_0.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w1_4.cfg
+${MORPHEO_TOPLEVEL}/Softwares/MiBench/bin/soft_0.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_MiBench/x1_w1_4-bench_1.cfg
===================================================================
--- /trunk/Platforms/Test/data/_MiBench/x1_w1_4-bench_1.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_MiBench/x1_w1_4-bench_1.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w1_4.cfg
+${MORPHEO_TOPLEVEL}/Softwares/MiBench/bin/soft_1.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_MiBench/x1_w1_4-bench_2.cfg
===================================================================
--- /trunk/Platforms/Test/data/_MiBench/x1_w1_4-bench_2.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_MiBench/x1_w1_4-bench_2.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w1_4.cfg
+${MORPHEO_TOPLEVEL}/Softwares/MiBench/bin/soft_2.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_MiBench/x1_w1_4-bench_3.cfg
===================================================================
--- /trunk/Platforms/Test/data/_MiBench/x1_w1_4-bench_3.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_MiBench/x1_w1_4-bench_3.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w1_4.cfg
+${MORPHEO_TOPLEVEL}/Softwares/MiBench/bin/soft_3.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_MiBench/x1_w1_4-bench_4.cfg
===================================================================
--- /trunk/Platforms/Test/data/_MiBench/x1_w1_4-bench_4.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_MiBench/x1_w1_4-bench_4.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w1_4.cfg
+${MORPHEO_TOPLEVEL}/Softwares/MiBench/bin/soft_4.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_MiBench/x1_w1_4-bench_5.cfg
===================================================================
--- /trunk/Platforms/Test/data/_MiBench/x1_w1_4-bench_5.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_MiBench/x1_w1_4-bench_5.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w1_4.cfg
+${MORPHEO_TOPLEVEL}/Softwares/MiBench/bin/soft_5.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_MiBench/x1_w1_4-bench_6.cfg
===================================================================
--- /trunk/Platforms/Test/data/_MiBench/x1_w1_4-bench_6.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_MiBench/x1_w1_4-bench_6.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w1_4.cfg
+${MORPHEO_TOPLEVEL}/Softwares/MiBench/bin/soft_6.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_MiBench/x1_w2_4-bench_0.cfg
===================================================================
--- /trunk/Platforms/Test/data/_MiBench/x1_w2_4-bench_0.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_MiBench/x1_w2_4-bench_0.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w2_4.cfg
+${MORPHEO_TOPLEVEL}/Softwares/MiBench/bin/soft_0.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_MiBench/x1_w2_4-bench_1.cfg
===================================================================
--- /trunk/Platforms/Test/data/_MiBench/x1_w2_4-bench_1.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_MiBench/x1_w2_4-bench_1.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w2_4.cfg
+${MORPHEO_TOPLEVEL}/Softwares/MiBench/bin/soft_1.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_MiBench/x1_w2_4-bench_2.cfg
===================================================================
--- /trunk/Platforms/Test/data/_MiBench/x1_w2_4-bench_2.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_MiBench/x1_w2_4-bench_2.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w2_4.cfg
+${MORPHEO_TOPLEVEL}/Softwares/MiBench/bin/soft_2.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_MiBench/x1_w2_4-bench_3.cfg
===================================================================
--- /trunk/Platforms/Test/data/_MiBench/x1_w2_4-bench_3.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_MiBench/x1_w2_4-bench_3.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w2_4.cfg
+${MORPHEO_TOPLEVEL}/Softwares/MiBench/bin/soft_3.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_MiBench/x1_w2_4-bench_4.cfg
===================================================================
--- /trunk/Platforms/Test/data/_MiBench/x1_w2_4-bench_4.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_MiBench/x1_w2_4-bench_4.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w2_4.cfg
+${MORPHEO_TOPLEVEL}/Softwares/MiBench/bin/soft_4.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_MiBench/x1_w2_4-bench_5.cfg
===================================================================
--- /trunk/Platforms/Test/data/_MiBench/x1_w2_4-bench_5.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_MiBench/x1_w2_4-bench_5.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w2_4.cfg
+${MORPHEO_TOPLEVEL}/Softwares/MiBench/bin/soft_5.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_MiBench/x1_w2_4-bench_6.cfg
===================================================================
--- /trunk/Platforms/Test/data/_MiBench/x1_w2_4-bench_6.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_MiBench/x1_w2_4-bench_6.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w2_4.cfg
+${MORPHEO_TOPLEVEL}/Softwares/MiBench/bin/soft_6.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_MiBench/x1_w4_2-bench_0.cfg
===================================================================
--- /trunk/Platforms/Test/data/_MiBench/x1_w4_2-bench_0.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_MiBench/x1_w4_2-bench_0.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w4_2.cfg
+${MORPHEO_TOPLEVEL}/Softwares/MiBench/bin/soft_0.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_MiBench/x1_w4_2-bench_1.cfg
===================================================================
--- /trunk/Platforms/Test/data/_MiBench/x1_w4_2-bench_1.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_MiBench/x1_w4_2-bench_1.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w4_2.cfg
+${MORPHEO_TOPLEVEL}/Softwares/MiBench/bin/soft_1.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_MiBench/x1_w4_2-bench_2.cfg
===================================================================
--- /trunk/Platforms/Test/data/_MiBench/x1_w4_2-bench_2.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_MiBench/x1_w4_2-bench_2.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w4_2.cfg
+${MORPHEO_TOPLEVEL}/Softwares/MiBench/bin/soft_2.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_MiBench/x1_w4_2-bench_3.cfg
===================================================================
--- /trunk/Platforms/Test/data/_MiBench/x1_w4_2-bench_3.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_MiBench/x1_w4_2-bench_3.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w4_2.cfg
+${MORPHEO_TOPLEVEL}/Softwares/MiBench/bin/soft_3.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_MiBench/x1_w4_2-bench_4.cfg
===================================================================
--- /trunk/Platforms/Test/data/_MiBench/x1_w4_2-bench_4.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_MiBench/x1_w4_2-bench_4.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w4_2.cfg
+${MORPHEO_TOPLEVEL}/Softwares/MiBench/bin/soft_4.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_MiBench/x1_w4_2-bench_5.cfg
===================================================================
--- /trunk/Platforms/Test/data/_MiBench/x1_w4_2-bench_5.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_MiBench/x1_w4_2-bench_5.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w4_2.cfg
+${MORPHEO_TOPLEVEL}/Softwares/MiBench/bin/soft_5.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_MiBench/x1_w4_2-bench_6.cfg
===================================================================
--- /trunk/Platforms/Test/data/_MiBench/x1_w4_2-bench_6.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_MiBench/x1_w4_2-bench_6.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w4_2.cfg
+${MORPHEO_TOPLEVEL}/Softwares/MiBench/bin/soft_6.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_MiBench/x1_w8_2-bench_0.cfg
===================================================================
--- /trunk/Platforms/Test/data/_MiBench/x1_w8_2-bench_0.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_MiBench/x1_w8_2-bench_0.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w8_2.cfg
+${MORPHEO_TOPLEVEL}/Softwares/MiBench/bin/soft_0.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_MiBench/x1_w8_2-bench_1.cfg
===================================================================
--- /trunk/Platforms/Test/data/_MiBench/x1_w8_2-bench_1.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_MiBench/x1_w8_2-bench_1.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w8_2.cfg
+${MORPHEO_TOPLEVEL}/Softwares/MiBench/bin/soft_1.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_MiBench/x1_w8_2-bench_2.cfg
===================================================================
--- /trunk/Platforms/Test/data/_MiBench/x1_w8_2-bench_2.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_MiBench/x1_w8_2-bench_2.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w8_2.cfg
+${MORPHEO_TOPLEVEL}/Softwares/MiBench/bin/soft_2.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_MiBench/x1_w8_2-bench_3.cfg
===================================================================
--- /trunk/Platforms/Test/data/_MiBench/x1_w8_2-bench_3.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_MiBench/x1_w8_2-bench_3.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w8_2.cfg
+${MORPHEO_TOPLEVEL}/Softwares/MiBench/bin/soft_3.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_MiBench/x1_w8_2-bench_4.cfg
===================================================================
--- /trunk/Platforms/Test/data/_MiBench/x1_w8_2-bench_4.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_MiBench/x1_w8_2-bench_4.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w8_2.cfg
+${MORPHEO_TOPLEVEL}/Softwares/MiBench/bin/soft_4.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_MiBench/x1_w8_2-bench_5.cfg
===================================================================
--- /trunk/Platforms/Test/data/_MiBench/x1_w8_2-bench_5.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_MiBench/x1_w8_2-bench_5.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w8_2.cfg
+${MORPHEO_TOPLEVEL}/Softwares/MiBench/bin/soft_5.x
+0
+0
+4096
+2
Index: /trunk/Platforms/Test/data/_MiBench/x1_w8_2-bench_6.cfg
===================================================================
--- /trunk/Platforms/Test/data/_MiBench/x1_w8_2-bench_6.cfg (revision 130)
+++ /trunk/Platforms/Test/data/_MiBench/x1_w8_2-bench_6.cfg (revision 130)
@@ -0,0 +1,8 @@
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen
+${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w8_2.cfg
+${MORPHEO_TOPLEVEL}/Softwares/MiBench/bin/soft_6.x
+0
+0
+4096
+2
Index: /trunk/Softwares/Dhrystone/Makefile
===================================================================
--- /trunk/Softwares/Dhrystone/Makefile (revision 129)
+++ /trunk/Softwares/Dhrystone/Makefile (revision 130)
@@ -7,4 +7,5 @@
#
+include Makefile.defs
# common definition
@@ -22,4 +23,6 @@
LIBNAME = $(NEWLIB_LIBNAME)
+FLAGS = -DDHRYSTONE_NB_RUNS=$(DHRYSTONE_NB_RUNS)
+
#-----[ Files ]-------------------------------------------------------------------
OBJECTS = $(NEWLIB)/lib/*.o \
Index: /trunk/Softwares/Dhrystone/src/c/main.c
===================================================================
--- /trunk/Softwares/Dhrystone/src/c/main.c (revision 129)
+++ /trunk/Softwares/Dhrystone/src/c/main.c (revision 130)
@@ -10,7 +10,11 @@
#include "dhry21.h"
+#ifndef DHRYSTONE_NB_RUNS
+# error "DHRYSTONE_NB_RUNS must be defined."
+#endif
+
int main()
{
- dhry21(100);
+ dhry21(DHRYSTONE_NB_RUNS);
exit (0);
Index: /trunk/Softwares/MiBench/Makefile.defs
===================================================================
--- /trunk/Softwares/MiBench/Makefile.defs (revision 129)
+++ /trunk/Softwares/MiBench/Makefile.defs (revision 130)
@@ -19,3 +19,6 @@
none
-BENCHS_TYPE = -DMIBENCH_SMALL
+BENCHS_TYPE = -DMIBENCH_LARGE
+
+# MIBENCH_SMALL
+# MIBENCH_LARGE
Index: /trunk/environment.sh
===================================================================
--- /trunk/environment.sh (revision 129)
+++ /trunk/environment.sh (revision 130)
@@ -28,6 +28,8 @@
export MORPHEO_SCRIPT=${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Script
export MORPHEO_HOME=${HOME}/.Morpheo
-export MORPHEO_TMP=/dsk/l1/misc/Morpheo
+export MORPHEO_PREFIX=/users/chaos/kane/Morpheo
#export MORPHEO_TMP=${HOME}/tmp/Morpheo
+#export MORPHEO_TMP=/dsk/l1/misc/Morpheo
+export MORPHEO_TMP=${MORPHEO_PREFIX}
MORPHEO_XTTY=${MORPHEO_TOPLEVEL}/IPs/systemC/Environment/TTY/xtty
@@ -39,4 +41,5 @@
echo " - MORPHEO_SCRIPT is set to ${MORPHEO_SCRIPT}"
echo " - MORPHEO_HOME is set to ${MORPHEO_HOME}"
+echo " - MORPHEO_PREFIX is set to ${MORPHEO_PREFIX}"
echo " - MORPHEO_TMP is set to ${MORPHEO_TMP}"