Changeset 101 for trunk/Platforms

Timestamp:

Jan 15, 2009, 6:19:08 PM (16 years ago)

Author:

rosiere

Message:

1) Add soc test
2) fix bug (Pc management, Decod and execute, Update prediction ...)

Location:

trunk/Platforms/Test

Files:

• Makefile (modified) (4 diffs)
• data/Test_000_000.cfg (modified) (1 diff)
• data/Test_000_001.cfg (modified) (1 diff)
• data/Test_000_002.cfg (modified) (1 diff)
• data/Test_000_003.cfg (modified) (1 diff)
• data/Test_000_004.cfg (modified) (1 diff)
• data/Test_000_005.cfg (modified) (1 diff)
• data/Test_000_006.cfg (modified) (1 diff)
• data/Test_000_007.cfg (modified) (1 diff)
• data/Test_000_008.cfg (modified) (1 diff)
• data/Test_000_009.cfg (modified) (1 diff)
• data/Test_000_010.cfg (modified) (1 diff)
• data/Test_000_011.cfg (modified) (1 diff)
• data/Test_000_012.cfg (modified) (1 diff)
• data/Test_000_013.cfg (modified) (1 diff)
• data/Test_000_014.cfg (modified) (1 diff)
• data/Test_000_015.cfg (modified) (1 diff)
• data/Test_000_016.cfg (modified) (1 diff)
• data/Test_000_017.cfg (modified) (1 diff)
• data/Test_000_018.cfg (modified) (1 diff)
• data/Test_000_019.cfg (modified) (1 diff)
• data/Test_000_020.cfg (modified) (1 diff)
• data/Test_000_021.cfg (modified) (1 diff)
• data/Test_000_022.cfg (modified) (1 diff)
• data/Test_000_023.cfg (modified) (1 diff)
• data/Test_000_024.cfg (modified) (1 diff)
• data/Test_000_025.cfg (modified) (1 diff)
• data/Test_001_000.cfg (deleted)
• data/Test_001_001.cfg (deleted)
• data/Test_001_002.cfg (deleted)
• data/Test_001_003.cfg (deleted)
• data/Test_001_004.cfg (deleted)
• data/Test_001_005.cfg (deleted)
• data/Test_001_006.cfg (deleted)
• data/Test_001_007.cfg (deleted)
• data/Test_001_008.cfg (deleted)
• data/Test_001_009.cfg (deleted)
• data/Test_001_010.cfg (deleted)
• data/Test_002_000.cfg (deleted)
• data/Test_002_001.cfg (deleted)
• data/Test_002_002.cfg (deleted)
• data/Test_002_003.cfg (deleted)
• data/Test_002_004.cfg (deleted)
• data/Test_002_005.cfg (deleted)
• data/Test_002_006.cfg (deleted)
• data/Test_002_007.cfg (deleted)
• data/Test_002_008.cfg (deleted)
• data/Test_002_009.cfg (deleted)
• data/Test_002_010.cfg (deleted)
• src/test.cpp (modified) (1 diff)

trunk/Platforms/Test/Makefile

@@ -35 +35 @@
 DIR_OBJ                         =       $(DIR_TMP)/obj
 DIR_BIN                         =       $(DIR_TMP)/bin
-DIR_LOG                         =       ./log
+DIR_LOG                         =       $(DIR_TMP)/log
 DIR_DATA                        =       ./data
 DIR_SOFT                        =       $(MORPHEO_TOPLEVEL)/Softwares
@@ -115 +115 @@
                                 fi;                                                     \
                                 $(MAKE) $$logs;                                         \
-                                declare -i have_test_ko=0;                              \
+                                declare -i nb_test=0;                                   \
+                                declare -i nb_test_ko=0;                                \
                                 for log in $$logs; do                                   \
                                         $(GREP) -q "Test OK" $$log;                     \
@@ -122 +123 @@
                                         declare -i test_ko=$$?;                         \
                                         if $(TEST) $$test_ko -eq 0 -o $$test_ok -ne 0;  \
-                                        then have_test_ko=1;                            \
+                                        then nb_test_ko=$$(($${nb_test_ko} + 1));       \
                                         fi;                                             \
+                                        nb_test=$$(($${nb_test} + 1));                  \
                                 done;                                                   \
-                                if $(TEST) $$have_test_ko -ne 0;                        \
-                                then $(ECHO) "-------------------| Test KO"; exit 1;    \
+                                if $(TEST) $${nb_test_ko} -ne 0;                        \
+                                then $(ECHO) "-------------------| Test KO !!! ($${nb_test_ko}/$${nb_test})"; exit 1;   \
                                 else $(ECHO) "-------------------| Test OK"; exit 0;    \
                                 fi;
 
 execute                         : run
-
 
 $(DIR_LOG)/%.log                : %.cfg
@@ -146 +147 @@
                                 declare timing=$$($(GREP) -h "Timing" $$log);           \
                                 if $(TEST) $$test_ko -ne 0 -a $$test_ok -eq 0;          \
-                                then $(ECHO) -e "                     $$file ... OK\t$$timing"; \
-                                else $(ECHO) -e "                     $$file ... KO\t$$timing"; \
-                                     have_test_ko=1;                                    \
+                                then $(ECHO) -e "                     $$file ... OK    \t$$timing";     \
+                                else $(ECHO) -e "                     $$file ... KO !!!\t$$timing";     \
                                 fi;                                                     \
 

trunk/Platforms/Test/data/Test_000_000.cfg

@@ -1 +1 @@
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.sim
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.gen
-../../IPs/systemC/processor/Morpheo/Files/Instance_min.cfg
+../../IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg
 ../../Softwares/Test/Test_000/bin/soft.x
 0

trunk/Platforms/Test/data/Test_000_001.cfg

@@ -1 +1 @@
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.sim
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.gen
-../../IPs/systemC/processor/Morpheo/Files/Instance_min.cfg
+../../IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg
 ../../Softwares/Test/Test_001/bin/soft.x
 0

trunk/Platforms/Test/data/Test_000_002.cfg

@@ -1 +1 @@
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.sim
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.gen
-../../IPs/systemC/processor/Morpheo/Files/Instance_min.cfg
+../../IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg
 ../../Softwares/Test/Test_002/bin/soft.x
 0

trunk/Platforms/Test/data/Test_000_003.cfg

@@ -1 +1 @@
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.sim
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.gen
-../../IPs/systemC/processor/Morpheo/Files/Instance_min.cfg
+../../IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg
 ../../Softwares/Test/Test_003/bin/soft.x
 0

trunk/Platforms/Test/data/Test_000_004.cfg

@@ -1 +1 @@
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.sim
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.gen
-../../IPs/systemC/processor/Morpheo/Files/Instance_min.cfg
+../../IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg
 ../../Softwares/Test/Test_004/bin/soft.x
 0

trunk/Platforms/Test/data/Test_000_005.cfg

@@ -1 +1 @@
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.sim
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.gen
-../../IPs/systemC/processor/Morpheo/Files/Instance_min.cfg
+../../IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg
 ../../Softwares/Test/Test_005/bin/soft.x
 0

trunk/Platforms/Test/data/Test_000_006.cfg

@@ -1 +1 @@
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.sim
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.gen
-../../IPs/systemC/processor/Morpheo/Files/Instance_min.cfg
+../../IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg
 ../../Softwares/Test/Test_006/bin/soft.x
 0

trunk/Platforms/Test/data/Test_000_007.cfg

@@ -1 +1 @@
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.sim
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.gen
-../../IPs/systemC/processor/Morpheo/Files/Instance_min.cfg
+../../IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg
 ../../Softwares/Test/Test_007/bin/soft.x
 0

trunk/Platforms/Test/data/Test_000_008.cfg

@@ -1 +1 @@
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.sim
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.gen
-../../IPs/systemC/processor/Morpheo/Files/Instance_min.cfg
+../../IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg
 ../../Softwares/Test/Test_008/bin/soft.x
 0

trunk/Platforms/Test/data/Test_000_009.cfg

@@ -1 +1 @@
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.sim
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.gen
-../../IPs/systemC/processor/Morpheo/Files/Instance_min.cfg
+../../IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg
 ../../Softwares/Test/Test_009/bin/soft.x
 0

trunk/Platforms/Test/data/Test_000_010.cfg

@@ -1 +1 @@
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.sim
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.gen
-../../IPs/systemC/processor/Morpheo/Files/Instance_min.cfg
+../../IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg
 ../../Softwares/Test/Test_010/bin/soft.x
 0

trunk/Platforms/Test/data/Test_000_011.cfg

@@ -1 +1 @@
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.sim
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.gen
-../../IPs/systemC/processor/Morpheo/Files/Instance_min.cfg
+../../IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg
 ../../Softwares/Test/Test_011/bin/soft.x
 0

trunk/Platforms/Test/data/Test_000_012.cfg

@@ -1 +1 @@
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.sim
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.gen
-../../IPs/systemC/processor/Morpheo/Files/Instance_min.cfg
+../../IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg
 ../../Softwares/Test/Test_012/bin/soft.x
 0

trunk/Platforms/Test/data/Test_000_013.cfg

@@ -1 +1 @@
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.sim
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.gen
-../../IPs/systemC/processor/Morpheo/Files/Instance_min.cfg
+../../IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg
 ../../Softwares/Test/Test_013/bin/soft.x
 0

trunk/Platforms/Test/data/Test_000_014.cfg

@@ -1 +1 @@
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.sim
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.gen
-../../IPs/systemC/processor/Morpheo/Files/Instance_min.cfg
+../../IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg
 ../../Softwares/Test/Test_014/bin/soft.x
 0

trunk/Platforms/Test/data/Test_000_015.cfg

@@ -1 +1 @@
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.sim
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.gen
-../../IPs/systemC/processor/Morpheo/Files/Instance_min.cfg
+../../IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg
 ../../Softwares/Test/Test_015/bin/soft.x
 0

trunk/Platforms/Test/data/Test_000_016.cfg

@@ -1 +1 @@
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.sim
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.gen
-../../IPs/systemC/processor/Morpheo/Files/Instance_min.cfg
+../../IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg
 ../../Softwares/Test/Test_016/bin/soft.x
 0

trunk/Platforms/Test/data/Test_000_017.cfg

@@ -1 +1 @@
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.sim
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.gen
-../../IPs/systemC/processor/Morpheo/Files/Instance_min.cfg
+../../IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg
 ../../Softwares/Test/Test_017/bin/soft.x
 0

trunk/Platforms/Test/data/Test_000_018.cfg

@@ -1 +1 @@
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.sim
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.gen
-../../IPs/systemC/processor/Morpheo/Files/Instance_min.cfg
+../../IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg
 ../../Softwares/Test/Test_018/bin/soft.x
 0

trunk/Platforms/Test/data/Test_000_019.cfg

@@ -1 +1 @@
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.sim
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.gen
-../../IPs/systemC/processor/Morpheo/Files/Instance_min.cfg
+../../IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg
 ../../Softwares/Test/Test_019/bin/soft.x
 0

trunk/Platforms/Test/data/Test_000_020.cfg

@@ -1 +1 @@
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.sim
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.gen
-../../IPs/systemC/processor/Morpheo/Files/Instance_min.cfg
+../../IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg
 ../../Softwares/Test/Test_020/bin/soft.x
 0

trunk/Platforms/Test/data/Test_000_021.cfg

@@ -1 +1 @@
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.sim
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.gen
-../../IPs/systemC/processor/Morpheo/Files/Instance_min.cfg
+../../IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg
 ../../Softwares/Test/Test_021/bin/soft.x
 0

trunk/Platforms/Test/data/Test_000_022.cfg

@@ -1 +1 @@
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.sim
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.gen
-../../IPs/systemC/processor/Morpheo/Files/Instance_min.cfg
+../../IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg
 ../../Softwares/Test/Test_022/bin/soft.x
 0

trunk/Platforms/Test/data/Test_000_023.cfg

@@ -1 +1 @@
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.sim
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.gen
-../../IPs/systemC/processor/Morpheo/Files/Instance_min.cfg
+../../IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg
 ../../Softwares/Test/Test_023/bin/soft.x
 0

trunk/Platforms/Test/data/Test_000_024.cfg

@@ -1 +1 @@
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.sim
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.gen
-../../IPs/systemC/processor/Morpheo/Files/Instance_min.cfg
+../../IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg
 ../../Softwares/Test/Test_024/bin/soft.x
 0

trunk/Platforms/Test/data/Test_000_025.cfg

@@ -1 +1 @@
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.sim
 ../../IPs/systemC/processor/Morpheo/Files/Morpheo.gen
-../../IPs/systemC/processor/Morpheo/Files/Instance_min.cfg
+../../IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg
 ../../Softwares/Test/Test_025/bin/soft.x
 0

trunk/Platforms/Test/src/test.cpp

@@ -240 +240 @@
   segtable->setDefaultTarget(0,0);
     
-  // Add a segment    ,name      ,address of base   ,size              ,global index,local index,uncache
-  segtable->addSegment("text"    ,TEXT_BASE         ,TEXT_SIZE         ,0           ,0          ,false);
-  segtable->addSegment("data"    ,DATA_CACHED_BASE  ,DATA_CACHED_SIZE  ,0           ,0          ,false);
-  segtable->addSegment("data_unc",DATA_UNCACHED_BASE,DATA_UNCACHED_SIZE,0           ,0          ,true );
+  // Add a segment    ,name          ,address of base   ,size              ,global index,local index,uncache
+  segtable->addSegment("text"        ,TEXT_BASE         ,TEXT_SIZE         ,0           ,0          ,false);
+  segtable->addSegment("data"        ,DATA_CACHED_BASE  ,DATA_CACHED_SIZE  ,0           ,0          ,false);
+  segtable->addSegment("data_stack"  ,DATA_STACK_BASE   ,DATA_STACK_SIZE   ,0           ,0          ,false);
+  segtable->addSegment("data_unc"    ,DATA_UNCACHED_BASE,DATA_UNCACHED_SIZE,0           ,0          ,true );
 
   Parameters * param_environment = new Parameters