Changeset 262

Timestamp:

Dec 14, 2013, 8:39:48 PM (11 years ago)

Author:

cfuguet

Message:

• Modification in giet_xml/xml_parser.c: When parsing IRQs, compare agains IRQ_TYPE_* constants instead of numbers for readibility

• Modification in giet_common/utils.c Adding utility function to write on CP0 status register

• Modification in giet_boot/boot.c After loading the kernel.elf file, the GIET exception handler is available (giet entry point). Therefore, we can reset the BEV bit of the status register to use the giet entry point instead of the preloader entry point in case of exception during kernel init function.

Location:

soft/giet_vm

Files:

• giet_boot/boot.c (modified) (1 diff)
• giet_common/utils.c (modified) (1 diff)
• giet_xml/Makefile (modified) (2 diffs)
• giet_xml/xml_parser.c (modified) (1 diff)
• mappings/4c_1p_sort.xml (added)

soft/giet_vm/giet_boot/boot.c

@@ -2099 +2099 @@
     }  // end monoprocessor boot
 
+    // reset BEV bit in the status register to use GIET exception
+    // handler instead of the PRELOADER exception handler
+    _set_sr( 0 );
+
     // all processor initialise SCHED register
     _set_sched( (unsigned int)_schedulers[procid] );

soft/giet_vm/giet_common/utils.c

@@ -150 +150 @@
     asm volatile( "mfc0    %0,        $12" : "=r"(ret));
     return ret;
+}
+//////////////////////////////////////////////////////////////////////////////
+// This function set a new value for the CP0 status register.
+//////////////////////////////////////////////////////////////////////////////
+inline void _set_sr(unsigned int val) 
+{
+    asm volatile( "mtc0    %0,        $12" ::"r" (val));
 }
 //////////////////////////////////////////////////////////////////////////////////

soft/giet_vm/giet_xml/Makefile

@@ -3 +3 @@
 
 bin2xml: xml_driver.c mapping_info.h
-        gcc -Wall -g -I. -I../sys xml_driver.c -o bin2xml
+        gcc -Wall -I. -I../sys xml_driver.c -o bin2xml
 
 xml2bin: xml_parser.c mapping_info.h
-        gcc -Wall -g -I. -I../giet_kernel -I/usr/include/libxml2 xml_parser.c -o xml2bin -lxml2
+        gcc -Wall -I. -I../giet_kernel -I/usr/include/libxml2 xml_parser.c -o xml2bin -lxml2
 
 test:
@@ -18 +18 @@
 
 clean:
-        rm xml2bin bin2xml
-
-
+        rm -f xml2bin bin2xml

soft/giet_vm/giet_xml/xml_parser.c

@@ -1545 +1545 @@
         printf("        type    = %s\n", str);
 #endif
-        if      ( strcmp(str, "HARD") == 0 ) irq[irq_index]->type = 0;
-        else if ( strcmp(str, "SOFT") == 0 ) irq[irq_index]->type = 1;
-        else if ( strcmp(str, "TIME") == 0 ) irq[irq_index]->type = 2;
+        if      ( strcmp(str, "HARD") == 0 ) irq[irq_index]->type = IRQ_TYPE_HWI;
+        else if ( strcmp(str, "SOFT") == 0 ) irq[irq_index]->type = IRQ_TYPE_SWI;
+        else if ( strcmp(str, "TIME") == 0 ) irq[irq_index]->type = IRQ_TYPE_PTI;
         else    
         {