Changeset 142 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod

Timestamp:

Aug 4, 2010, 10:09:03 PM (14 years ago)

Author:

rosiere

Message:

1) Full parallel compilation
2) Add statistics in ROB : list instruction affinity

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod

Files:

• Instruction/Makefile.deps (modified) (2 diffs)
• Makefile.deps (modified) (2 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/Instruction/Makefile.deps

@@ -10 +10 @@
 Instruction                     = yes
 
+ifndef Behavioural
+include                         $(DIR_MORPHEO)/Behavioural/Makefile.deps
+endif
+
 #-----[ Directory ]----------------------------------------
 
@@ -16 +20 @@
 #-----[ Library ]------------------------------------------
 
-Instruction_LIBRARY             =       -lInstruction
-
-Instruction_DIR_LIBRARY         =       -L$(Instruction_DIR)/lib
+Instruction_LIBRARY             =       -lInstruction \
+                                        $(Behavioural_LIBRARY)
 
 #-----[ Rules ]--------------------------------------------
 
-Instruction_library             :
+Instruction_library_only        :
                                 @\
                                 $(MAKE) --directory=$(Instruction_DIR) --makefile=Makefile;
 
-Instruction_library_clean       :
+Instruction_library_clean_only  :
                                 @\
                                 $(MAKE) --directory=$(Instruction_DIR) --makefile=Makefile clean;
 
+Instruction_library             : Instruction_library_only
+                                @\
+                                $(MAKE) Behavioural_library;
+
+Instruction_library_clean       : Instruction_library_clean_only
+                                @\
+                                $(MAKE) Behavioural_library_clean;
+
+

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/Makefile.deps

@@ -8 +8 @@
 # DIR_MORPHEO must be defined
 
-Decod                   = yes
+Decod                           = yes
 
 ifndef Behavioural
@@ -31 +31 @@
                                         $(Behavioural_LIBRARY)  
 
-Decod_DIR_LIBRARY               =       -L$(Decod_DIR)/lib              \
-                                        $(Custom_DIR_LIBRARY)           \
-                                        $(Priority_DIR_LIBRARY)         \
-                                        $(Behavioural_DIR_LIBRARY)
-
 #-----[ Rules ]--------------------------------------------
 
-Decod_library                   :
+Decod_library_only              :
+                                @\
+                                $(MAKE) --directory=$(Decod_DIR) --makefile=Makefile;
+
+Decod_library_clean_only        :
+                                @\
+                                $(MAKE) --directory=$(Decod_DIR) --makefile=Makefile clean;
+
+Decod_library                   : Decod_library_only
                                 @\
                                 $(MAKE) Behavioural_library;            \
                                 $(MAKE) Priority_library;               \
-                                $(MAKE) Custom_library;                 \
-                                $(MAKE) --directory=$(Decod_DIR) --makefile=Makefile;
+                                $(MAKE) Custom_library;
 
-Decod_library_clean     :
+Decod_library_clean             : Decod_library_clean_only
                                 @\
                                 $(MAKE) Behavioural_library_clean;      \
                                 $(MAKE) Priority_library_clean;         \
-                                $(MAKE) Custom_library_clean;           \
-                                $(MAKE) --directory=$(Decod_DIR) --makefile=Makefile clean;
-
+                                $(MAKE) Custom_library_clean;