Changeset 101 for trunk/Softwares/Makefile.Software

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 ...)

File:

• trunk/Softwares/Makefile.Software (modified) (3 diffs)

trunk/Softwares/Makefile.Software

@@ -20 +20 @@
 
 DIR_COMMON              = $(MORPHEO_TOPLEVEL)/Softwares/Common
-DIR_COMMON_C            = $(DIR_GLOBAL)/src/c
-DIR_COMMON_ASM          = $(DIR_GLOBAL)/src/asm
-DIR_COMMON_SYS          = $(DIR_GLOBAL)/src/sys
-DIR_COMMON_INC          = $(DIR_GLOBAL)/include
+DIR_COMMON_C            = $(DIR_COMMON)/src/c
+DIR_COMMON_ASM          = $(DIR_COMMON)/src/asm
+DIR_COMMON_SYS          = $(DIR_COMMON)/src/sys
+DIR_COMMON_INC          = $(DIR_COMMON)/include
 
-OBJECTS_COMMON          =       $(patsubst $(DIR_COMMON_ASM)/%.s,$(DIR_OBJ)/%.o,$(wildcard $(DIR_COMMON_ASM)/*.s))      \
-                                $(patsubst $(DIR_COMMON_SYS)/%.s,$(DIR_OBJ)/%.o,$(wildcard $(DIR_COMMON_SYS)/*.s))      \
+OBJECTS_COMMON          =       $(patsubst $(DIR_COMMON_SYS)/%.s,$(DIR_OBJ)/%.o,$(wildcard $(DIR_COMMON_SYS)/*.s))      \
+                                $(patsubst $(DIR_COMMON_ASM)/%.s,$(DIR_OBJ)/%.o,$(wildcard $(DIR_COMMON_ASM)/*.s))      \
                                 $(patsubst $(DIR_COMMON_C)/%.c,$(DIR_OBJ)/%.o,$(wildcard $(DIR_COMMON_C)/*.c))
 
 
 #-----[ To the compilation ]------------------------------------------------------
-OPTIMIZE                        = -O3 -fomit-frame-pointer -fdelayed-branch -mror -mcmov -msext -mhard-mul -msoft-div -msoft-float
+OPTIMIZE                        = -O3 -std=c99 -fomit-frame-pointer -fdelayed-branch -mror -mcmov -msext -mhard-mul -msoft-div -msoft-float
 #Option :
 # -fomit-frame-pointer                  : n'utilise pas le pointeur de frame
@@ -64 +64 @@
 .PRECIOUS                       : $(DIR_BIN)/%.x.txt $(DIR_BIN)/%.x $(DIR_OBJ)/%.o
 
-vpath   %.h     $(DIR_INC)
-vpath   %.c     $(DIR_C)
-vpath   %.s     $(DIR_ASM):$(DIR_SYS)
+vpath   %.h     $(DIR_INC):$(DIR_COMMON_INC)
+vpath   %.c     $(DIR_C):$(DIR_COMMON_C)
+vpath   %.s     $(DIR_ASM):$(DIR_SYS):$(DIR_COMMON_ASM):$(DIR_COMMON_SYS)
 vpath   %.o     $(DIR_OBJ)
 vpath   %.x     $(DIR_BIN)
@@ -82 +82 @@
                                 $(OR32_NM)      $(OR32_NM_OPT)      $^ > $@.nm; \
                                 $(ECHO) "Display info       : $*.x.txt";                \
-                                $(OR32_OBJDUMP) $(OR32_OBJDUMP_OPT) $^ > $@.txt;
+                                $(OR32_OBJDUMP) $(OR32_OBJDUMP_OPT) $@ > $@.txt;
 
 $(DIR_OBJ)/%.o                  : %.s