Changeset 589 for soft/giet_vm/applications/display

Timestamp:

Jul 8, 2015, 3:57:15 PM (9 years ago)

Author:

alain

Message:

Modify all applications to support two new rules:
1) introduce a local Makefile for each application.
2) change "application.elf" name to "application/appli.elf" name in the application.py" file.
Introduce the shell application.

Location:

soft/giet_vm/applications/display

Files:

• Makefile (modified) (1 diff)
• display.py (modified) (4 diffs)
• images.raw (deleted)
• lena.raw (deleted)
• main.c (modified) (3 diffs)

soft/giet_vm/applications/display/Makefile

@@ -1 @@
-APP_NAME=display
 
-USE+= stdio.o
-
-USES=$(patsubst %,$(BUILD_PATH)/$(LIB_NAME)/%,$(USE))
+APP_NAME = display
 
 OBJS= main.o 
 
-all: $(APP_NAME).elf
+LIBS= -L../../build/libs -luser
 
-BIN_NAME_PATH=$(BUILD_PATH)$(APP_NAME).elf
+INCLUDES = -I../../giet_libs -I. -I../..
 
-$(APP_NAME).elf: $(OBJS) $(APP_NAME).ld
-        $(LD) -o $(BIN_NAME_PATH) -T $(APP_NAME).ld $(OBJS) $(USES)
-        $(DU) -D $(BIN_NAME_PATH) > $@.txt
+LIB_DEPS = ../../build/libs/libuser.a
+
+appli.elf: $(OBJS) $(APP_NAME).ld $(LIBS_DEPS) 
+        $(LD) -o $@ -T $(APP_NAME).ld $(OBJS) $(LIBS)
+        $(DU) -D $@ > $@.txt
 
 %.o: %.c 
-        $(CC)  $(INCLUDE) $(CFLAGS) $($*.o_CFLAGS) -c -o  $@ $<
-        $(DU) -D  $@ >  $@.txt
-
+        $(CC)  $(INCLUDES) $(CFLAGS) -c -o  $@ $<
 
 clean:
-        rm -f *.o *.elf *.txt core *~ 2>$(TRASH)
-        rm $(BIN_NAME_PATH) 2>$(TRASH)
+        rm -f *.o *.elf *.txt core *~

soft/giet_vm/applications/display/display.py

@@ -13 +13 @@
 
 ######################
-def display( mapping ):
+def extend( mapping ):
 
     nprocs    = mapping.nprocs
@@ -38 +38 @@
     mapping.addVseg( vspace, 'disp_data', data_base , data_size, 
                      'C_WU', vtype = 'ELF', x = 0, y = 0, pseg = 'RAM', 
-                     binpath = 'build/display/display.elf',
+                     binpath = 'build/display/appli.elf',
                      local = False )
 
@@ -44 +44 @@
     mapping.addVseg( vspace, 'disp_code', code_base , code_size,
                      'CXWU', vtype = 'ELF', x = 0, y = 0, pseg = 'RAM', 
-                     binpath = 'build/display/display.elf',
+                     binpath = 'build/display/appli.elf',
                      local = False )
 
@@ -69 +69 @@
 if __name__ == '__main__':
 
-    vspace = display( Mapping( 'test', 2, 2, 4 ) )
+    vspace = extend( Mapping( 'test', 2, 2, 4 ) )
     print vspace.xml()
 

soft/giet_vm/applications/display/main.c

@@ -16 +16 @@
 #define NLINES      256
 #define NIMAGES     1                  
-#define NBLOCKS     (NPIXELS*NLINES/512)   // number of blocks per image
 
 #define INTERACTIVE 1
@@ -69 +68 @@
     {
         // load buf0
-        giet_fat_read( fd, buf0, NBLOCKS, image*NBLOCKS );
+        giet_fat_read( fd, buf0, NPIXELS*NLINES );
 
         giet_tty_printf("\n[DISPLAY] Proc[%d,%d,%d] load image %d at cycle %d\n", 
@@ -85 +84 @@
 
         // load buf1
-        giet_fat_read( fd, buf1, NBLOCKS, image*NBLOCKS );
+        giet_fat_read( fd, buf1, NPIXELS*NLINES );
 
         giet_tty_printf("\n[DISPLAY] Proc[%d,%d,%d] load image %d at cycle %d\n",