Changeset 1505 for trunk/tools/elf2flt/elfflt.c

Timestamp:

12/26/11 01:24:43 (17 months ago)

Author:

reyalp

Message:

merge tsvstar module code from reyalp-flt branch, + fixups for r1499, see ​http://chdk.setepontos.com/index.php?topic=847.msg77690#msg77690 and following posts
NOTE modules in CHDK/MODULES are now required for CHDK to work properly. On multi-partition cards, this goes on the large card.
Adds tetris and snake, originally contributed by elektro255 in ​http://chdk.setepontos.com/index.php?topic=2925.0

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/elf2flt (copied) (copied from branches/reyalp-flt/tools/elf2flt)
• tools/elf2flt/elfflt.c (copied) (copied from branches/reyalp-flt/tools/elf2flt/elfflt.c) (5 diffs)

trunk/tools/elf2flt/elfflt.c

@@ -4 +4 @@
  *  Target is modified BINARY FLAT
  *
- *      (c)2011 Sergey Taranenko aka @tsv
+ *      (c)2011 Sergey Taranenko aka tsvstar
  *
  */
@@ -270 +270 @@
     printf("%s 0x%x (%s+0x%x)\n",prefix, offs,sect,offs-secoffs);
 }
+
+
+char* get_flat_string( int32_t offs )
+{
+   static char buf[200];
+
+    if  ( offs <0 )
+        {
+                sprintf(buf," LANGID %d",-offs);
+                return buf;
+        }
+
+    if  ( offs >flat->data_end || offs<=flat->data_start )
+          return "";
+
+        strncpy( buf, flat_buf+offs, sizeof(buf)-1);
+        buf[sizeof(buf)-1]=0;
+        return buf;
+}
+
 
 // Aligning up to int32 bound
@@ -623 +643 @@
           printf(">>elf2flt: lookup entry symbols\n");
   flat->_module_loader = find_symbol_inflat("_module_loader", &text );
-/*  if ( flat->_module_loader <=0 ) {
-    PRINTF("No or invalid section of _module_loader(). It have to be exist as executable function.\n");
-    return ELFFLT_NO_STARTPOINT;
-  }*/
   flat->_module_unloader = find_symbol_inflat("_module_unloader", &text );
   flat->_module_run = find_symbol_inflat("_module_run", &text );
   flat->_module_exportlist = find_symbol_inflat("MODULE_EXPORT_LIST", 0 );
 
-  flat->chdk_min_version =0;
-  flat->chdk_req_platfid =0;
-
-  int ptr = find_symbol_inflat("_chdk_required_ver", 0 );
-  if ( ptr > 0 )
-    flat->chdk_min_version = *(uint32_t*)(flat_buf+ptr);
-
-  ptr = find_symbol_inflat("_chdk_required_platfid", 0 );
-  if ( ptr > 0 )
-    flat->chdk_req_platfid = *(uint32_t*)(flat_buf+ptr);
+  //
+  flat->_module_info = find_symbol_inflat("_module_info", &data );
+  if ( flat->_module_info <=0 ) {
+    PRINTERR(stderr, "No or invalid section of _module_info. This symbol should be initialized as ModuleInfo structure.\n");
+    return ELFFLT_NO_MODULEINFO;
+  }
+
+  struct ModuleInfo* _module_info = (struct ModuleInfo*) (flat_buf + flat->_module_info);
+  if ( _module_info->magicnum != MODULEINFO_V1_MAGICNUM ) 
+  {
+    PRINTERR(stderr, "Wrong _module_info->magicnum value. Please check correct filling of this structure\n");
+    return ELFFLT_NO_MODULEINFO;
+  }
+  if ( _module_info->sizeof_struct != sizeof(struct ModuleInfo) ) 
+  {
+    PRINTERR(stderr, "Wrong _module_info->sizeof_struct value. Please check correct filling of this structure\n");
+    return ELFFLT_NO_MODULEINFO;
+  }
 
   if ( FLAG_DUMP_FLT_HEADERS ) {
@@ -650 +674 @@
         printf("->reloc_start  0x%x (size %d)\n", flat->reloc_start, flat->reloc_count*4 );
         printf("->import_start 0x%x (size %d)\n", flat->import_start, flat->import_count*4 );
-        printf("->chdk_min_ver 0x%x\n", flat->chdk_min_version);
-        printf("->chdk_platfid 0x%x\n", flat->chdk_req_platfid);
 
         print_offs("\n.._module_loader()   =", flat->_module_loader);
@@ -657 +679 @@
         print_offs(".._module_run()      = ", flat->_module_run);
         print_offs("..MODULE_EXPORT_LIST = ", flat->_module_exportlist);
+
+        printf("\nModule info:\n");
+        printf("->Module Name: %s\n", get_flat_string(_module_info->moduleName) );
+        printf("->Module Ver: %d.%d\n", _module_info->major_ver, _module_info->minor_ver );
+
+        char* branches_str[] = {"any branch","CHDK", "CHDK_DE", "CHDK_SDM", "PRIVATEBUILD"};
+        int branch = (_module_info->chdk_required_branch>REQUIRE_CHDK_PRIVATEBUILD) ? 
+                                                REQUIRE_CHDK_PRIVATEBUILD : _module_info->chdk_required_branch;
+        printf("->Require: %s-build%d. ", branches_str[branch], _module_info->chdk_required_ver );
+        if ( _module_info->chdk_required_platfid == 0 )
+                printf("Any platform.\n");
+        else
+                printf(" Platform #%d only.\n", _module_info->chdk_required_platfid );
+        if ( _module_info->flags ) {
+                printf("->Flags:");
+                if ( _module_info->flags & MODULEINFO_FLAG_SYSTEM )
+                        printf(" SYSTEM ");
+            printf("\n");
+        }
+        printf("->Module Info: %s\n", get_flat_string(_module_info->description) );
   }