Changeset 230

Timestamp:

Feb 22, 2013, 4:03:48 PM (11 years ago)

Author:

meunier

Message:

Correction d'un bug lors du boot pour les alignements
Modification de l'appel SRL pour les CONST

Location:

soft/giet_vm

Files:

• boot/boot_init.c (modified) (7 diffs)
• libs/libsrl/srl_args.h (modified) (3 diffs)
• sys/sys_handler.c (modified) (2 diffs)
• xml/xml_parser.c (modified) (1 diff)

soft/giet_vm/boot/boot_init.c

@@ -740 +740 @@
 
     // get physical segment pointer
-    mapping_pseg_t *pseg = boot_pseg_get(vseg->psegid);
+    mapping_pseg_t * pseg = boot_pseg_get(vseg->psegid);
 
     // compute vseg physical base address
@@ -757 +757 @@
     // loop on vobjs contained in vseg to :
     // (1) computes the length of the vseg,
-    // (2) initialise the vaddr and paddr fields of all vobjs,
-    // (3) initialise the page table pointers arrays 
+    // (2) initialize the vaddr and paddr fields of all vobjs,
+    // (3) initialize the page table pointers arrays 
 
     cur_vaddr = vseg->vbase;
@@ -766 +766 @@
         if (vobj[vobj_id].align) {
             cur_paddr = align_to(cur_paddr, vobj[vobj_id].align);
+            cur_vaddr = align_to(cur_vaddr, vobj[vobj_id].align);
         }
         // set vaddr/paddr for current vobj
         vobj[vobj_id].vaddr = cur_vaddr;
         vobj[vobj_id].paddr = cur_paddr;
-
+        
         // initialise boot_ptabs_vaddr[] if current vobj is a PTAB
         if (vobj[vobj_id].type == VOBJ_TYPE_PTAB) {
@@ -1191 +1192 @@
                     boot_puts(" / paddr = ");
                     boot_putx(vobj[vobj_id].paddr);
+                    boot_puts(" / vaddr = ");
+                    boot_putx(vobj[vobj_id].vaddr);
                     boot_puts(" / length = ");
                     boot_putx(vobj[vobj_id].length);
+                    boot_puts(" / buffer = ");
+                    boot_putx(memspace->buffer);
+                    boot_puts(" / size = ");
+                    boot_putx(memspace->size);
                     boot_puts("\n");
 #endif
                     break;
                 }
-                case VOBJ_TYPE_PTAB:    // nothing to initialise
+                case VOBJ_TYPE_PTAB:    // nothing to initialize
                 {
                     ptab_found = 1;
@@ -1211 +1218 @@
                 case VOBJ_TYPE_CONST:
                 {
+                    unsigned int *addr = (unsigned int *) vobj[vobj_id].paddr;
+                    *addr = vobj[vobj_id].init;
 #if BOOT_DEBUG_VOBJS
                     boot_puts("CONST   : ");
@@ -1217 +1226 @@
                     boot_putx(vobj[vobj_id].paddr);
                     boot_puts(" / init = ");
-                    boot_putx(vobj[vobj_id].init);
+                    boot_putx(*addr);
                     boot_puts("\n");
 #endif
-                    unsigned int *addr = (unsigned int *) vobj[vobj_id].paddr;
-                    *addr = vobj[vobj_id].init;
                     break;
                 }
@@ -1228 +1235 @@
                     boot_puts("\n[INIT ERROR] illegal vobj type: ");
                     boot_putd(vobj[vobj_id].type);
-                    boot_puts("\n ");
+                    boot_puts("\n");
                     boot_exit();
                 }

soft/giet_vm/libs/libsrl/srl_args.h

@@ -7 +7 @@
 #define SRL_GET_BARRIER(port)   (srl_barrier_t)  APP_GET_ARG(port, VOBJ_TYPE_BARRIER)
 #define SRL_GET_LOCK(port)                       APP_GET_ARG(port, VOBJ_TYPE_LOCK)
-#define SRL_GET_CONST(port)                      APP_GET_ARG(port, VOBJ_TYPE_CONST)
 #define SRL_GET_MEMSPACE(port)  (srl_memspace_t) APP_GET_ARG(port, VOBJ_TYPE_MEMSPACE)
 
@@ -14 +13 @@
 ({                                                                                                 \
     unsigned int  vbase;                                                                           \
-    if (giet_vobj_get_vbase(APP_NAME , alias_##task_name.port, type, &vbase))                      \
+    if (giet_vobj_get_vbase(APP_NAME , args->port, type, &vbase))                                  \
     {                                                                                              \
         srl_log_printf(NONE, "\n[ERROR] in "#task_name" task :\n");                                \
         srl_log_printf(NONE, "          undefined port <"#port"> for channel \"%s\": %x\n",        \
-                                                                alias_##task_name.port, vbase);    \
+                                                                args->port, vbase);                \
         srl_log_printf(TRACE, "*** &"#port" = %x\n\n", vbase);                                     \
         srl_exit();                                                                                \
@@ -29 +28 @@
 
 
+#define SRL_GET_CONST(port)                                                                        \
+({                                                                                                 \
+    unsigned int vbase;                                                                            \
+    if (giet_vobj_get_vbase(APP_NAME, args->port, VOBJ_TYPE_CONST, &vbase)) {                      \
+        srl_log_printf(NONE, "\n[ERROR] in some task :\n");                                        \
+        srl_log_printf(NONE, "          undefined port <"#port"> for channel \"%s\": %x\n",        \
+                                                                args->port, vbase);                \
+        srl_log_printf(TRACE, "*** &"#port" = %x\n\n", vbase);                                     \
+        srl_exit();                                                                                \
+    }                                                                                              \
+    else                                                                                           \
+        srl_log_printf(TRACE, "%s:%d: arg of %s, from %s; &"#port" = %x\n\n",                      \
+                            __FILE__, __LINE__, APP_NAME, #port, vbase);                           \
+    *(int *) vbase;                                                                                \
+})
+
 
 #endif

soft/giet_vm/sys/sys_handler.c

@@ -148 +148 @@
     unsigned int vobj_id;
 
-
     // scan vspaces 
     for (vspace_id = 0; vspace_id < header->vspaces; vspace_id++) {
@@ -162 +161 @@
                         _puts("*** Error in _get_obj: wrong type\n");
                         _release_lock(&_tty_put_lock);
-                        return -1; //wrong type
+                        return -1; // wrong type
                     }
                     *res_vobj = &vobj[vobj_id];

soft/giet_vm/xml/xml_parser.c

@@ -777 +777 @@
         const char * tag = (const char *) xmlTextReaderConstName(reader);
 
-        if (strcmp(tag, "vseg")     == 0 ) {
+        if (strcmp(tag, "vseg") == 0) {
             vsegNode(reader);
         }
-        else if (strcmp(tag, "task")     == 0 ) {
+        else if (strcmp(tag, "task") == 0) {
             taskNode(reader);
         }
-        else if (strcmp(tag, "#text")    == 0 ) { }
-        else if (strcmp(tag, "#comment") == 0 ) { }
-        else if (strcmp(tag, "vspace")   == 0 ) {
+        else if (strcmp(tag, "#text")    == 0) { }
+        else if (strcmp(tag, "#comment") == 0) { }
+        else if (strcmp(tag, "vspace")   == 0) {
             vspace[vspace_index]->vobjs = vobj_loc_index; 
             vspace[vspace_index]->tasks = task_loc_index ;