Add support for upcoming ELF format

Written by Vincent Rivière, with some additions by Thorsten Otto
freemint · Aug 19, 2023 · 3fee749 · 3fee749 · vinriviere · Sep 13, 2023
1 parent 038abe3
commit 3fee749
Show file tree

Hide file tree

Showing 8 changed files with 240 additions and 210 deletions.
diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c
diff --git a/po/mintbin.pot b/po/mintbin.pot
diff --git a/src/csize.c b/src/csize.c
@@ -230,7 +230,8 @@ invalid argument to `--format'"));
 	  continue;
 	}
       if (target->format != oldstyle_prg_target
-	  && target->format != prg_target)
+	  && target->format != prg_target
+	  && target->format != prgelf_target)
 	{
 	  status = EXIT_FAILURE;
 	  error (EXIT_SUCCESS, 0, _("%s: not a MiNT executable file"),

diff --git a/src/flags.c b/src/flags.c
@@ -419,7 +419,8 @@ warning: changing the bestfit flag is dangerous"));
 	  continue;
 	}
       if (target->format != prg_target
-	  && target->format != oldstyle_prg_target)
+	  && target->format != oldstyle_prg_target
+	  && target->format != prgelf_target)
 	{
 	  status = EXIT_FAILURE;
 	  error (EXIT_SUCCESS, 0, _("%s: not a MiNT executable"),

diff --git a/src/mintbin.c b/src/mintbin.c
@@ -227,6 +227,9 @@ MiNT demand-paged executable with traditional symbol table.\n"),
     case oldstyle_prg_target:
       fputs (_("Old-style GEMDOS executable.\n"), stdout);
       break;
+    case prgelf_target:
+      fputs (_("PRG/ELF executable.\n"), stdout);
+      break;
     default:
       fputs (_("Unrecognized file format.\n"), stdout); 
       break;

diff --git a/src/stack.c b/src/stack.c
@@ -242,7 +242,8 @@ print_stack (filename)
 
   if (target->format != prg_target
       && target->format != oldstyle_prg_target
-      && target->format != aout_target) {
+      && target->format != aout_target
+      && target->format != prgelf_target) {
     error (EXIT_SUCCESS, 0, _("%s: file format not recognized"),
 	   target->filename);
     return -1;

diff --git a/src/targets.c b/src/targets.c
@@ -187,6 +187,7 @@ swap_prg_header_in (target)
 {
   int is_601a = 1;
   int is_extended_mint = 0;
+  int elfheader_offset = 0;
   unsigned char* crs = target->header;
 
   target->format = invalid_target;
@@ -217,6 +218,11 @@ swap_prg_header_in (target)
     {
       is_extended_mint = 1;
     }
+  else if (crs[0] == 'E' && crs[1] == 'L'
+           && crs[2] == 'F' && crs[3] >= 0x28)
+    {
+      elfheader_offset = crs[3];
+    }
   crs += 4;
   target->execp.g_flags = get32 (crs);
   crs += 4;
@@ -229,6 +235,15 @@ swap_prg_header_in (target)
       + target->execp.g_text + target->execp.a_data
       + target->execp.g_syms;
     target->execp.g_symbol_format = 1;
+
+    if (elfheader_offset != 0) {
+      target->format = prgelf_target;
+      target->execp.g_symbol_format = 2;
+      target->execp.g_stkpos = get32 (target->header + 0x24); /* PRGELF_HEADER.g_stkpos */
+      target->stksize_looked_up = 1;
+      target->execp.a_entry = get32 (target->header + elfheader_offset + 0x18); /* ehdr.e_entry */
+    }
+
     return 0;
   }
 

diff --git a/src/targets.h b/src/targets.h
@@ -88,7 +88,11 @@ enum mintbin_targets_enum {
   /* Old-style prg executables or other 0x601a files that are
      not recognized.  */
 #define oldstyle_prg_target oldstyle_prg_target
-  oldstyle_prg_target
+  oldstyle_prg_target,
+
+  /* PRG/ELF executables.  */
+#define prgelf_target prgelf_target
+  prgelf_target
 };
 
 struct mintbin_target {