Index: /soft/giet_vm/giet_boot/boot.c =================================================================== --- /soft/giet_vm/giet_boot/boot.c (revision 261) +++ /soft/giet_vm/giet_boot/boot.c (revision 262) @@ -2099,4 +2099,8 @@ } // 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] ); Index: /soft/giet_vm/giet_common/utils.c =================================================================== --- /soft/giet_vm/giet_common/utils.c (revision 261) +++ /soft/giet_vm/giet_common/utils.c (revision 262) @@ -150,4 +150,11 @@ 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)); } ////////////////////////////////////////////////////////////////////////////////// Index: /soft/giet_vm/giet_xml/Makefile =================================================================== --- /soft/giet_vm/giet_xml/Makefile (revision 261) +++ /soft/giet_vm/giet_xml/Makefile (revision 262) @@ -3,8 +3,8 @@ 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,5 +18,3 @@ clean: - rm xml2bin bin2xml - - + rm -f xml2bin bin2xml Index: /soft/giet_vm/giet_xml/xml_parser.c =================================================================== --- /soft/giet_vm/giet_xml/xml_parser.c (revision 261) +++ /soft/giet_vm/giet_xml/xml_parser.c (revision 262) @@ -1545,7 +1545,7 @@ 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 { Index: /soft/giet_vm/mappings/4c_1p_sort.xml =================================================================== --- /soft/giet_vm/mappings/4c_1p_sort.xml (revision 262) +++ /soft/giet_vm/mappings/4c_1p_sort.xml (revision 262) @@ -0,0 +1,270 @@ + + + + +*** The "increment" parameter is the virtual address cluster increment +*** The physical address cluster increment is 0x10000000000 / NB_CLUSTERS + +*** This first section describes an instance of the "tsar_generic_iob" architecture +*** with 4 clusters, 1 processor per cluster and 40 bits physical address. + + + + + + + + + +*** Non replicated peripherals (including the ROM containing the preloader code) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +*** Segments used by the boot code / A[31:28] = 0x0 / Identity mapping +- seg_boot_mapping is loaded by the boot-loader. It contains the mapping info. The content is reused by the kernel. +- seg_boot_code and seg_boot data are loaded by the preloader, used by the boot-loader The content is not reused by the kernel. +- seg_boot_stack is contains the stacks used by all processors during reset and boot. The content is not reused by the Kernel. +- seg_boot_buffer is used by the boot-loader. It can contain a complete .elf file. The content is not reused by the kernel. + + + + + + + + + + + + + + + + + +*** Segments used by the kernel / A[31:28] = 0x8 + + + + + + + + + + + + + + +*** Segments for non replicated peripherals / A[31:28] = 0xB / Identity mapping + + + + + + + + + + + + + + + + + + + + +*** Segments for replicated ICUS / A[31:24] = 0xB0 / Increment = 0x10000 / Identity mapping in cluster 0 + + + + + + + + + + + + + + +*** segments for replicated DMAs / A[31:24] = 0xB1 / Increment = 0x10000 / Tdentity mapping in cluster 0 + + + + + + + + + + + + + + +*** segments for replicated MMC / A[31:24] = 0xB2 / Increment = 0x10000 / Identity mapping in cluster 0 + + + + + + + + + + + + + + +*** segments for replicated schedulers / A[31:28] = 0xF / Increment = 0x10000 + + + + + + + + + + + + + +*** + + + + +*** For each vspace, the startname field is the name of the vobj containing the start_vector (entry point array) +*** For each task, the startid field define the task entry point as an index in the start_vector +*** For each task, the clusterid and proclocid arguments define the task static placement +*** For each task, the stackname field is the name of the vobj containing the task stack +*** For each task, the heapname field is the name of the vobj containing the task heap + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +