Changeset 389

Timestamp:

Aug 7, 2014, 12:42:16 PM (10 years ago)

Author:

alain

Message:

Bloup

Location:

soft/giet_vm

Files:

• Makefile (modified) (4 diffs)
• giet_config.h (modified) (2 diffs)
• giet_libs/stdio.h (modified) (3 diffs)

soft/giet_vm/Makefile

@@ -9 +9 @@
 
 ARCH ?= ../tsar-trunk-svn-2013/platforms/tsar_generic_iob
-X    ?= 16
-Y    ?= 8
-P    ?= 4
+X    ?= 2
+Y    ?= 2
+P    ?= 2
 APP  ?= convol
 
@@ -81 +81 @@
 
 ### Objects to be linked for game.elf
-GAMEOFLIFE_OBJS = build/gameoflife/main.o    \
-                  build/libs/stdio.o         \
-                  build/libs/barrier.o       \
-                  build/libs/remote_malloc.o \
+GAMEOFLIFE_OBJS = build/gameoflife/main.o \
+                  build/libs/stdio.o      \
+                  build/libs/barrier.o    \
+                  build/libs/malloc.o     \
                   build/libs/spin_lock.o
                  
@@ -101 +101 @@
               build/libs/stdio.o         \
               build/libs/barrier.o       \
-              build/libs/remote_malloc.o \
+              build/libs/malloc.o        \
               build/libs/spin_lock.o
 
 ### Objects to be linked for transpose.elf
-TRANSPOSE_OBJS = build/transpose/main.o     \
-                 build/libs/stdio.o         \
-                 build/libs/barrier.o       \
-                 build/libs/remote_malloc.o \
+TRANSPOSE_OBJS = build/transpose/main.o  \
+                 build/libs/stdio.o      \
+                 build/libs/barrier.o    \
+                 build/libs/malloc.o     \
                  build/libs/spin_lock.o
 
 ### Objects to be linked for convol.elf
-CONVOL_OBJS  = build/convol/main.o        \
-               build/libs/stdio.o         \
-               build/libs/stdlib.o        \
-               build/libs/barrier.o       \
-               build/libs/remote_malloc.o \
+CONVOL_OBJS  = build/convol/main.o       \
+               build/libs/stdio.o        \
+               build/libs/stdlib.o       \
+               build/libs/barrier.o      \
+               build/libs/malloc.o       \
                build/libs/spin_lock.o
 
@@ -414 +414 @@
         $(CC) $(CFLAGS) $(USER_INCLUDE) -c -o $@ $<
 
-build/libs/remote_malloc.o: giet_libs/remote_malloc.c \
-                            giet_libs/spin_lock.h \
-                            hard_config.h         \
-                            giet_config.h
-        $(CC) $(CFLAGS) $(USER_INCLUDE) -c -o $@ $<
-
 build/libs/sbt_barrier.o: giet_libs/sbt_barrier.c \
                           hard_config.h         \

soft/giet_vm/giet_config.h

@@ -16 +16 @@
 
 #define BOOT_DEBUG_MAPPING       0          /* trace map_info checking */
-#define BOOT_DEBUG_PT            0          /* trace page tables initialisation */
-#define BOOT_DEBUG_VOBJS         0          /* trace vobjs initialisation */
-#define BOOT_DEBUG_SCHED         0          /* trace schedulers initialisation */
+#define BOOT_DEBUG_PT            0          /* trace page tables initialisation */
+#define BOOT_DEBUG_VOBJS         0          /* trace vobjs initialisation */
+#define BOOT_DEBUG_SCHED         0          /* trace schedulers initialisation */
 #define BOOT_DEBUG_PERI          0          /* trace peripherals initialisation */
 #define BOOT_DEBUG_ELF           0          /* trace .elf files loading */
 
-#define GIET_DEBUG_INIT          0          /* trace kernel initialisation */
+#define GIET_DEBUG_INIT          0          /* trace kernel initialisation */
 #define GIET_DEBUG_FAT           0          /* trace fat accesses */ 
-#define GIET_DEBUG_SWITCH        0          /* trace context switchs  */
+#define GIET_DEBUG_SWITCH        0          /* trace context switchs  */
 #define GIET_DEBUG_IRQS          0          /* trace interrupts */
 #define GIET_DEBUG_IOC_DRIVER    0          /* trace IOC accesses */
@@ -41 +41 @@
 #define GIET_MAX_ELF_FILES       20         /* max .elf files loaded by boot-loader */
 #define GIET_OPEN_FILES_MAX      16         /* max simultaneously open files */
-#define GIET_NB_VSPACE_MAX       64         /* max number of virtual spaces */
+#define GIET_NB_VSPACE_MAX       64         /* max number of virtual spaces */
 #define GIET_TICK_VALUE          0x00008000 /* context switch period (number of cycles) */
 #define GIET_USE_IOMMU           0          /* IOMMU activated when non zero */

soft/giet_vm/giet_libs/stdio.h

@@ -337 +337 @@
 
 ///////////////////////////////////////////////////////////////////////////////////
-// Write "count" sectors from a file identified by "fd", skipping "offset"
+// Write "count" sectors into a file identified by "fd", skipping "offset"
 // sectors in file, and reading from the user "buffer". 
 // The user buffer base address shoulb be 64 bytes aligned.
@@ -405 +405 @@
 // and kill the calling task if the condition is false.
 //////////////////////////////////////////////////////////////////////////
-extern void giet_assert( unsigned int, 
-                         char* string );
+extern void giet_assert( unsigned int condition, 
+                         char*        string );
+
+//////////////////////////////////////////////////////////////////////////
+// The user task calling this function is descheduled and
+// the processor is allocated to another task.
+//////////////////////////////////////////////////////////////////////////
+extern void giet_context_switch();
 
 //////////////////////////////////////////////////////////////////////////
@@ -426 +432 @@
 extern void giet_procnumber( unsigned int cluster_xy,
                              unsigned int buffer );
-
-//////////////////////////////////////////////////////////////////////////
-// The user task calling this function is descheduled and
-// the processor is allocated to another task.
-//////////////////////////////////////////////////////////////////////////
-extern void giet_context_switch();
 
 //////////////////////////////////////////////////////////////////////////