Changeset 1517

Timestamp:

12/30/11 13:39:02 (17 months ago)

Author:

tsv

Message:

• Improved startup stability (run module_menu on first menu popup instead of runing in startup sequence)
• Added stoplist (unsafe symbols) to elf2flt. give no chance to make unobvious mistake

Location:

branches/reyalp-flt

Files:

• core/gui.c (modified) (2 diffs)
• core/gui_menu.c (modified) (1 diff)
• core/modules/Makefile (modified) (1 diff)
• tools/elf2flt/elfflt.c (modified) (4 diffs)
• tools/elf2flt/elfflt.h (modified) (1 diff)
• tools/elf2flt/main.c (modified) (4 diffs)
• tools/elf2flt/myio.c (modified) (1 diff)
• tools/elf2flt/myio.h (modified) (1 diff)
• tools/elf2flt/stoplist.txt (added)

branches/reyalp-flt/core/gui.c

@@ -152 +152 @@
 static void gui_show_build_info(int arg);
 static void gui_show_memory_info(int arg);
-static void     gui_modules_menu_load();
+void    gui_modules_menu_load();
 
 #ifdef OPT_DEBUGGING
@@ -1615 +1615 @@
     gui_splash = (conf.splash_show)?SPLASH_TIME:0;
 
-        gui_modules_menu_load();
-    user_menu_restore();
     gui_lang_init();
     draw_init();

branches/reyalp-flt/core/gui_menu.c

@@ -47 +47 @@
 //-------------------------------------------------------------------
 void gui_menu_init(CMenu *menu_ptr) {
+
+    static char first_call=1;
+
     if (menu_ptr) {
+                if ( first_call ) {
+                        extern void gui_modules_menu_load();
+                        extern void user_menu_restore();
+
+                        gui_modules_menu_load();
+                user_menu_restore();
+                        first_call=0;
+                }
+
         if (conf.menu_select_first_entry)
             gui_menu_set_curr_menu(menu_ptr, 0, 0);

branches/reyalp-flt/core/modules/Makefile

@@ -43 +43 @@
 #       arm-elf-objdump.exe -d -r -x $< >$<.dumpobj
 #       $(topdir)/tools/elf2flt/elf2flt$(EXE) $< $@ -e -f -h -r -s -iexportlist.txt >$@.dump
-        $(topdir)/tools/elf2flt/elf2flt$(EXE) $< $@ -iexportlist.txt > $(DEVNULL)
+        $(topdir)/tools/elf2flt/elf2flt$(EXE) $< $@ -iexportlist.txt -!$(topdir)/tools/elf2flt/stoplist.txt > $(DEVNULL)
 
 calend.elf: simple_module.o ../gui_calendar.o

branches/reyalp-flt/tools/elf2flt/elfflt.c

@@ -53 +53 @@
 
 char* flag_sym_display=0;  // buffer of flags. [symidx]=0 not_showed_yet, 1 already_shown
+int flag_unsafe_sym=0;      // =1 if one of imported symbol is from stoplist
 
 /*---------------------------------------------------------------------------*/
@@ -198 +199 @@
                   continue;
       }
+      if ( stoplist_check(name) )
+              { flag_unsafe_sym=1; }
 
       ret = apply_import( base_sect, &rela, importidx, &s, relidx);
@@ -627 +630 @@
   add_div0_arm();
 
+  flag_unsafe_sym = 0;
+
   // Do relocations
   ret = relocate_section( &text);
@@ -637 +642 @@
   if(ret != ELFFLT_OK)
       return ret;
+
+  if ( flag_unsafe_sym )
+      return ELFFLT_UNSAFE_SYMBOL;
 
   flat->import_start = flat->reloc_start+flat_reloc_count*sizeof(reloc_record_t);

branches/reyalp-flt/tools/elf2flt/elfflt.h

@@ -18 +18 @@
 #define ELFFLT_INPUT_ERROR         10
 #define ELFFLT_OUTPUT_ERROR        11
+#define ELFFLT_UNSAFE_SYMBOL       12
 
 

branches/reyalp-flt/tools/elf2flt/main.c

@@ -25 +25 @@
         printf("elfflt.exe filename.elf filename.flt [-vefrhsS] [-iIMPORTFILE.TXT]\n");
                 printf("  -iPATH/TO/exportlist.txt for list of imported symbols\n");
+                printf("  -!PATH/TO/stoplist.txt for list of unsafe symbols\n");
                 printf("  -e dump elf\n  -S show elf sections\n  -f dump flat\n  -r show relocations\n  -h show flat headers\n  -s dump elf symbols\n  -v verbose");
         return 1;
@@ -33 +34 @@
 
         char* filename_import =0;
+        char* filename_stoplist =0;
 
         int i;
@@ -48 +50 @@
                   case 'v': FLAG_VERBOSE = 1; break;
                   case 'i': filename_import = argv[i]+2; break; 
+                  case '!': filename_stoplist = argv[i]+2; break;
                 }
     }
@@ -62 +65 @@
 
         load_import(filename_import);
+        load_stoplist(filename_stoplist);
       
     int err = elfloader_load(filename_elf, filename_flt);

branches/reyalp-flt/tools/elf2flt/myio.c

@@ -199 +199 @@
 }
 
+
+//==========================================
+
+struct StopListRecord {
+        char* symbol;
+        char* warning;
+        void* next;     
+};
+
+
+char *stoplist_buf=0;
+struct StopListRecord* stoplisthead=0;
+
+
+int load_stoplist(char* stopfile)
+{
+        if ( !stopfile )
+          return 0;
+
+        int fd=open(stopfile, O_RDONLY|O_BINARY, 0777);
+
+    if ( fd <=0 ) {
+                PRINTERR(stderr,"No stoplist file '%s' found\n",stopfile);
+                return 0;
+        }
+    int stoplistfilesize = lseek(fd,0,SEEK_END);
+        if ( FLAG_VERBOSE )
+        printf("Stoplist file '%s' size=%d\n",stopfile, stoplistfilesize);
+
+    stoplist_buf=malloc(stoplistfilesize+1);    
+    if (!stoplist_buf) return 0;
+
+    int now=0, loaded =0; 
+        if (lseek(fd, 0, SEEK_SET) != 0) return 0;
+        do
+        { 
+      now = read(fd, stoplist_buf+loaded, stoplistfilesize-loaded);
+      loaded+=now;
+    } while (loaded<stoplistfilesize && now);
+
+        stoplist_buf[loaded]=0;
+        close(fd);
+       
+    if ( loaded != stoplistfilesize )
+      return -loaded;
+
+    // Parse
+    struct StopListRecord record;
+        char* sym=0, *finsym=0;
+    char* cur=stoplist_buf;
+
+    for ( ; cur<(stoplist_buf+stoplistfilesize); ) {
+                for(;*cur==' '; cur++); // skip spaces
+
+                sym=cur;
+                for(;*cur && *cur!=9 && *cur!=' ' && *cur!=0x0a; cur++);
+                if ( cur==sym ) {
+                        for(;*cur && *cur!=10; cur++);
+                        if ( *cur==10) {cur++;}
+                        continue;
+                }
+
+                record.symbol = sym;    
+                record.warning = "Error: unsafe symbol used. Please check stoplist";
+                finsym=cur;
+                for(;*cur && *cur!=9 && *cur!=0x0a; cur++);     // find \t
+
+                if ( *cur==0 ) break;
+                if ( *cur==9 ) {
+                        cur++;
+                        record.warning=cur;
+                }
+                
+                for(;*cur && *cur!=10; cur++);          // find eol
+                if ( *cur==0x0a && cur>stoplist_buf && *(cur-1)==0x0d)
+                        *(cur-1)=0;
+
+                if (cur==record.warning)
+                        record.warning = "Error: unsafe symbol used. Please check stoplist";
+
+                record.next=stoplisthead;
+                stoplisthead = malloc (sizeof(struct StopListRecord));
+                memcpy( stoplisthead, &record, sizeof(struct StopListRecord));
+
+                if ( *cur!=0 ) { *cur=0; cur++;}
+                *finsym = 0;
+
+                if ( FLAG_VERBOSE )
+                        printf("Stop record: %s => %s\n",record.symbol, record.warning);
+        }
+
+        return loaded;
+}
+
+//return: 1 - found in stoplist, 0 - not found
+int stoplist_check(char *sym)
+{
+        struct StopListRecord *cur;
+  
+        for ( cur = stoplisthead; cur; cur = cur->next ) {
+                if ( !cur->symbol )
+                        continue;
+                if ( !strcmp( sym, cur->symbol) ) {
+                        PRINTERR(stderr,"%s\n",cur->warning);
+                        cur->symbol = 0;  // mark that this symbol is already warned
+                        return 1;
+                }
+        }
+        return 0;
+}
+
+
 //==========================================
 void raise_error()

branches/reyalp-flt/tools/elf2flt/myio.h

@@ -21 +21 @@
 char* get_import_symbol( unsigned symidx );
 
+int load_stoplist(char* importfile);
+int stoplist_check(char *sym);  //1 - found in stoplist, 0- not found
+
 extern int FLAG_DUMP_SOURCE;
 extern int FLAG_DUMP_SYMBOLS;