Changeset 222 for soft/giet_vm

Timestamp:

Nov 12, 2012, 6:11:03 PM (12 years ago)

Author:

meunier

Message:

Correction du bug (unsigned long) -> (unsigned long long) : faisait l'hypothèse que unsigned long était 64 bits... (ne marchait pas sur 32 bits)

File:

• soft/giet_vm/xml/xml_parser.c (modified) (9 diffs)

soft/giet_vm/xml/xml_parser.c

@@ -1208 +1208 @@
     {
 #if XML_PARSER_DEBUG
-printf("      name = %s\n", str);
+       printf("      name = %s\n", str);
 #endif
         strncpy(coproc[coproc_index]->name, str, 31);
@@ -2090 +2090 @@
 void def_int_write(int fdout, char* def, int num)
 {
-    char  buf[64];
+    char buf[64];
     sprintf(buf, "#define\t %s  %d\n", def, num);
     file_write(fdout, buf);
@@ -2098 +2098 @@
 void def_hex_write(int fdout, char* def, int num)
 {
-    char  buf[64];
+    char buf[64];
     sprintf(buf, "#define\t %s  0x%x\n", def, num);
     file_write(fdout, buf);
@@ -2115 +2115 @@
     def_int_write(fdout, "CLUSTER_Y"       , cluster_y);
     def_int_write(fdout, "NB_CLUSTERS"     , cluster_index);
-    def_hex_write(fdout, "CLUSTER_SIZE"    , ( ((unsigned long)1) << 32)/cluster_index);
+    def_hex_write(fdout, "CLUSTER_SIZE"    , (((unsigned long long) 1) << 32) / cluster_index);
     def_int_write(fdout, "NB_PROCS_MAX"    , nb_proc_max);
     def_int_write(fdout, "NB_TIMERS_MAX"   , nb_timer_channel_max);
@@ -2143 +2143 @@
 
 ///////////////////////////////////////
-void  genLd( const char* file_path )
+void  genLd (const char * file_path)
 ///////////////////////////////////////
 {
@@ -2154 +2154 @@
     ld_write(fdout, "seg_boot_code_base"           , boot_code_base);
     ld_write(fdout, "seg_boot_stack_base"          , boot_stack_base);
-    ld_write(fdout, "seg_mapping_base"        , boot_mapping_base );
+    ld_write(fdout, "seg_mapping_base"             , boot_mapping_base);
 
     //kernel
-    ld_write(fdout, "\nseg_kernel_code_base"         , kernel_code_base);
+    ld_write(fdout, "\nseg_kernel_code_base"       , kernel_code_base);
     ld_write(fdout, "seg_kernel_data_base"         , kernel_data_base);
     ld_write(fdout, "seg_kernel_uncdata_base"      , kernel_uncdata_base);
@@ -2163 +2163 @@
 
     //peripherals
-    ld_write(fdout, "\nseg_fbf_base" ,  fbf_base_offset);
-    ld_write(fdout, "seg_icu_base" ,  icu_base_offset);
-    ld_write(fdout, "seg_ioc_base" ,  ioc_base_offset);
-    ld_write(fdout, "seg_nic_base" ,  nic_base_offset);
-    ld_write(fdout, "seg_tty_base" ,  tty_base_offset);
-    ld_write(fdout, "seg_dma_base" ,  dma_base_offset);
-    ld_write(fdout, "seg_tim_base" ,  tim_base_offset);
-    ld_write(fdout, "seg_gcd_base" ,  gcd_base_offset);
-    ld_write(fdout, "seg_iob_base" ,  iob_base_offset);
+    ld_write(fdout, "\nseg_fbf_base",  fbf_base_offset);
+    ld_write(fdout, "seg_icu_base"  ,  icu_base_offset);
+    ld_write(fdout, "seg_ioc_base"  ,  ioc_base_offset);
+    ld_write(fdout, "seg_nic_base"  ,  nic_base_offset);
+    ld_write(fdout, "seg_tty_base"  ,  tty_base_offset);
+    ld_write(fdout, "seg_dma_base"  ,  dma_base_offset);
+    ld_write(fdout, "seg_tim_base"  ,  tim_base_offset);
+    ld_write(fdout, "seg_gcd_base"  ,  gcd_base_offset);
+    ld_write(fdout, "seg_iob_base"  ,  iob_base_offset);
 
     close(fdout);
 }
 
-char* buildPath(const char* path, const char*name)
-{
-    char *res = calloc(strlen(path) + strlen(name) + 1, 1);
+char * buildPath(const char * path, const char * name)
+{
+    char * res = calloc(strlen(path) + strlen(name) + 1, 1);
     strcat(res, path);
     strcat(res, "/");
@@ -2186 +2186 @@
 
 /////////////////////////////////////
-int  main ( int argc, char* argv[] )
+int  main(int argc, char * argv[])
 /////////////////////////////////////
 {
@@ -2250 +2250 @@
     return 0;
 } // end main()
+
+
+
+