Changeset 117 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Common

Timestamp:

May 16, 2009, 4:42:39 PM (15 years ago)

Author:

rosiere

Message:

1) Platforms : add new organization for test
2) Load_Store_Unit : add array to count nb_check in store_queue
3) Issue_queue and Core_Glue : rewrite the issue network
4) Special_Register_Unit : add reset value to register CID
5) Softwares : add multicontext test
6) Softwares : add SPECINT
7) Softwares : add MiBench?
7) Read_queue : inhib access for r0
8) Change Core_Glue (network) - dont yet support priority and load balancing scheme

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Common (modified) (3 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Common

@@ -22 +22 @@
 endif
 
-##-----[ Entity ]-------------------------------------------
-#ENTITY                         = $$($(BASENAME) $$PWD)
-
 #-----[ Directory ]----------------------------------------
-#DIR_TMP                         = .
 DIR_TMP                         = $(MORPHEO_TMP)
 DIR_INC                         = include
@@ -35 +31 @@
 
 #-----[ Compilation ]--------------------------------------
-INCDIR                          = $(SYSTEMC_INCDIR_$(SIMULATOR))        \
+INCDIR                          = $(SYSTEMC_INCDIR_$(SIMULATOR_SYSTEMC))        \
                                   -I.                                   \
                                   -I$(DIR_MORPHEO) 
 
 LIBDIR                          = -L$(DIR_LIB) \
-                                  $(SYSTEMC_LIBDIR_$(SIMULATOR))        
+                                  $(SYSTEMC_LIBDIR_$(SIMULATOR_SYSTEMC))        
 #                                 $(OR1K_LIBDIR)                                
 
-FLAGS_COMMON                    = $(SYSTEMC_CFLAGS_$(SIMULATOR))        \
+FLAGS_COMMON                    = $(SYSTEMC_CFLAGS_$(SIMULATOR_SYSTEMC))        \
                                   $(CXX_FLAGS)
 
@@ -62 +58 @@
                                 @$(ECHO) "-------------------| $(ENTITY)"
 
-test                            :
-                                @echo $(DIR_LIBRARY);
-
 $(DIR_OBJ)/$(ENTITY)_%.o        : $(DIR_SRC)/%.cpp $(HEADERS)
                                 @\
                                 $(ECHO) "Compilation        : $*";\
-                                $(SYSTEMC_CXX_$(SIMULATOR)) $(CFLAGS) -c -o $@ $<;
+                                $(SYSTEMC_CXX_$(SIMULATOR_SYSTEMC)) $(CFLAGS) -c -o $@ $<;
 
 $(DIR_OBJ)                      :