Add dumping of options

git-svn-id: svn://svn.cc65.org/cc65/trunk@237 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/src/od65/dump.c b/src/od65/dump.c
index 0cc65433c163c862b56a8ec41d0e115686f78290..0eaa18d4b50acd80b3abdcb267f83fe417a5a454 100644 (file)
--- a/src/od65/dump.c
+++ b/src/od65/dump.c
@@ -33,79 +33,172 @@
 
 
 
+#include <time.h>
+
 /* common */
 #include "objdefs.h"
+#include "optdefs.h"
+#include "xmalloc.h"
 
 /* od65 */
+#include "error.h"
 #include "fileio.h"
 #include "dump.h"
 
 
 
 /*****************************************************************************/
-/*                                  Code                                    */
+/*                                  Code                                    */
 /*****************************************************************************/
 
 
 
-static void DumpHeaderSection (const char* Name,
-                              unsigned long Offset,
-                              unsigned long Size)
+static void DumpObjHeaderSection (const char* Name,
+                                 unsigned long Offset,
+                                 unsigned long Size)
 /* Dump a header section */
 {
     printf ("    %s:\n", Name);
-    printf ("      Offset:           %8lu\n", Offset);
-    printf ("      Size:             %8lu\n", Size);
+    printf ("      Offset:                %8lu\n", Offset);
+    printf ("      Size:                  %8lu\n", Size);
 }
 
 
 
-void DumpHeader (FILE* F, unsigned long Offset)
+void DumpObjHeader (FILE* F, unsigned long Offset)
 /* Dump the header of the given object file */
 {
     ObjHeader H;
 
-    /* Output a header */
-    printf ("  Header:\n");
-
     /* Seek to the header position */
-    fseek (F, 0, SEEK_SET);
+    FileSeek (F, Offset);
 
     /* Read the header */
     ReadObjHeader (F, &H);
 
     /* Now dump the information */
 
+    /* Output a header */
+    printf ("  Header:\n");
+
     /* Magic */
-    printf ("    Magic:            0x%08lX\n", H.Magic);
+    printf ("    Magic:                 0x%08lX\n", H.Magic);
 
     /* Version */
-    printf ("    Version:          %10u\n", H.Version);
+    printf ("    Version:               %10u\n", H.Version);
 
     /* Flags */
-    printf ("    Flags:                0x%04X (", H.Flags);
+    printf ("    Flags:                     0x%04X (", H.Flags);
     if (H.Flags & OBJ_FLAGS_DBGINFO) {
-       printf ("OBJ_FLAGS_DBGINFO");
+       printf ("OBJ_FLAGS_DBGINFO");
     }
     printf (")\n");
 
     /* Options */
-    DumpHeaderSection ("Options", H.OptionOffs, H.OptionSize);
+    DumpObjHeaderSection ("Options", H.OptionOffs, H.OptionSize);
 
     /* Files */
-    DumpHeaderSection ("Files", H.FileOffs, H.FileSize);
+    DumpObjHeaderSection ("Files", H.FileOffs, H.FileSize);
 
     /* Segments */
-    DumpHeaderSection ("Segments", H.SegOffs, H.SegSize);
+    DumpObjHeaderSection ("Segments", H.SegOffs, H.SegSize);
 
     /* Imports */
-    DumpHeaderSection ("Imports", H.ImportOffs, H.ImportSize);
+    DumpObjHeaderSection ("Imports", H.ImportOffs, H.ImportSize);
 
     /* Exports */
-    DumpHeaderSection ("Exports", H.ExportOffs, H.ExportSize);
+    DumpObjHeaderSection ("Exports", H.ExportOffs, H.ExportSize);
 
     /* Debug symbols */
-    DumpHeaderSection ("Debug symbols", H.DbgSymOffs, H.DbgSymSize);
+    DumpObjHeaderSection ("Debug symbols", H.DbgSymOffs, H.DbgSymSize);
+}
+
+
+
+void DumpObjOptions (FILE* F, unsigned long Offset)
+/* Dump the file options */
+{
+    ObjHeader H;
+    long     Size;
+    unsigned Count;
+    unsigned I;
+
+    /* Seek to the header position */
+    FileSeek (F, Offset);
+
+    /* Read the header */
+    ReadObjHeader (F, &H);
+
+    /* Seek to the start of the options */
+    FileSeek (F, Offset + H.OptionOffs);
+
+    /* Output a header */
+    printf ("  Options:\n");
+
+    /* Read the number of options and print it */
+    Count = Read16 (F);
+    printf ("    Count:                      %5u\n", Count);
+
+    /* Read and print all options */
+    for (I = 0; I < Count; ++I) {
+
+       unsigned long ArgNum;
+       char*         ArgStr;
+       unsigned      ArgLen;
+
+       /* Read the type of the option */
+       unsigned char Type = Read8 (F);
+
+               /* Get the type of the argument */
+       unsigned char ArgType = Type & OPT_ARGMASK;
+
+       /* Determine which option follows */
+       const char* TypeDesc;
+       switch (Type) {
+                   case OPT_COMMENT:   TypeDesc = "OPT_COMMENT";       break;
+           case OPT_AUTHOR:    TypeDesc = "OPT_AUTHOR";        break;
+           case OPT_TRANSLATOR:TypeDesc = "OPT_TRANSLATOR";    break;
+           case OPT_COMPILER:  TypeDesc = "OPT_COMPILER";      break;
+           case OPT_OS:        TypeDesc = "OPT_OS";            break;
+           case OPT_DATETIME:  TypeDesc = "OPT_DATETIME";      break;
+           default:            TypeDesc = "OPT_UNKNOWN";       break;
+       }
+
+       /* Print the header */
+       printf ("    Option %u:\n", I);
+
+       /* Print the data */
+       printf ("      Type:                      0x%02X (%s)\n", Type, TypeDesc);
+       switch (ArgType) {
+
+           case OPT_ARGSTR:
+               ArgStr = ReadMallocedStr (F);
+               ArgLen = strlen (ArgStr);
+               printf ("      Data:%*s\"%s\"\n", 24-ArgLen, "", ArgStr);
+               Size -= 1 + ArgLen + 1;
+               xfree (ArgStr);
+               break;
+
+           case OPT_ARGNUM:
+               ArgNum = Read32 (F);
+               printf ("      Data:%26lu", ArgNum);
+               if (Type == OPT_DATETIME) {
+                   /* Print the time as a string */
+                   time_t T = (time_t) ArgNum;
+                   printf (" (%.24s)", asctime (localtime (&T)));
+               }
+               printf ("\n");
+               Size -= 1 + 4;
+               break;
+
+           default:
+               /* Unknown argument type. This means that we cannot determine
+                * the option length, so we cannot proceed.
+                */
+               Error ("Unknown option type: 0x%02X", Type);
+               break;
+       }
+    }
 }
 
 

diff --git a/src/od65/dump.h b/src/od65/dump.h
index 44700781ae40542dc893ec4ffe721848399a4ded..42ac38aae1cc69590d394b1b76f149f0eb250a91 100644 (file)
--- a/src/od65/dump.h
+++ b/src/od65/dump.h
@@ -37,19 +37,22 @@
 
 
 
-#ifndef DUMP_H   
+#ifndef DUMP_H
 #define DUMP_H
 
 
 
 /*****************************************************************************/
-/*                                  Code                                    */
+/*                                  Code                                    */
 /*****************************************************************************/
 
 
 
-void DumpHeader (FILE* F, unsigned long Offset);
+void DumpObjHeader (FILE* F, unsigned long Offset);
 /* Dump the header of the given object file */
+           
+void DumpObjOptions (FILE* F, unsigned long Offset);
+/* Dump the file options */
 
 
 

diff --git a/src/od65/fileio.c b/src/od65/fileio.c
index 1fabded67e745b4a62ae9bf72cbb3acd5c88664e..c8ccc773dc623f188ba86fe03dd567c041cf8303 100644 (file)
--- a/src/od65/fileio.c
+++ b/src/od65/fileio.c
@@ -34,6 +34,7 @@
 
 
 #include <string.h>
+#include <errno.h>
 
 /* common */
 #include "xmalloc.h"
@@ -50,13 +51,23 @@
 
 
 
+void FileSeek (FILE* F, unsigned long Pos)
+/* Seek to the given absolute position, fail on errors */
+{
+    if (fseek (F, Pos, SEEK_SET) != 0) {
+       Error ("Cannot seek: %s", strerror (errno));
+    }
+}
+
+
+
 unsigned Read8 (FILE* F)
 /* Read an 8 bit value from the file */
 {
     int C = getc (F);
     if (C == EOF) {
        Error ("Read error (file corrupt?)");
-    }
+    }            
     return C;
 }
 

diff --git a/src/od65/fileio.h b/src/od65/fileio.h
index 75059da32c72054a987fcf5240ba871c64499309..06d55fcfbbc2de7d22fdf66c8cf338d859a7ab91 100644 (file)
--- a/src/od65/fileio.h
+++ b/src/od65/fileio.h
@@ -52,6 +52,9 @@
 
 
 
+void FileSeek (FILE* F, unsigned long Pos);
+/* Seek to the given absolute position, fail on errors */
+
 unsigned Read8 (FILE* F);
 /* Read an 8 bit value from the file */
 

diff --git a/src/od65/global.h b/src/od65/global.h
index 58691cdda85a9a077a5707f07c947c7eab843ae4..de70990e370fb7d4faf49bafc47e0132f5fe4aff 100644 (file)
--- a/src/od65/global.h
+++ b/src/od65/global.h
@@ -44,7 +44,13 @@
 
 
 
-#define        D_HEADER        0x00000001UL    /* Dump the header */    
+#define        D_HEADER        0x00000001UL    /* Dump the header */
+#define D_OPTIONS      0x00000002UL    /* Dump the options */
+#define D_FILES                0x00000004UL    /* Dump source file info */
+#define D_SEGMENTS     0x00000008UL    /* Dump segment info */
+#define D_IMPORTS      0x00000010UL    /* Dump imported symbols */
+#define D_EXPORTS      0x00000020UL    /* Dump exported symbols */
+#define D_DBGSYMS      0x00000040UL    /* Dump debug symbols */
 
 
 

diff --git a/src/od65/main.c b/src/od65/main.c
index 25963086d18bd9abd7be8bace7694c6a428a9e90..81a4c5ad2a28ff3286fffcdf056e58cd2fb6a6dc 100644 (file)
--- a/src/od65/main.c
+++ b/src/od65/main.c
@@ -77,7 +77,8 @@ static void Usage (void)
                     "  -V\t\t\tPrint the version number and exit\n"
             "\n"
             "Long options:\n"
-            "  --dump-header\t\tDump the object file header\n"
+            "  --dump-header\t\tDump the object file header\n"   
+            "  --dump-options\t\tDump object file options\n"
             "  --help\t\tHelp (this text)\n"
                     "  --version\t\tPrint the version number and exit\n",
             ProgName);
@@ -93,6 +94,14 @@ static void OptDumpHeader (const char* Opt, const char* Arg)
 
 
 
+static void OptDumpOptions (const char* Opt, const char* Arg)
+/* Dump the object file options */
+{
+    What |= D_OPTIONS;
+}
+
+
+
 static void OptHelp (const char* Opt, const char* Arg)
 /* Print usage information and exit */
 {
@@ -130,7 +139,7 @@ static void DumpFile (const char* Name)
     if (Magic != OBJ_MAGIC) {
 
        /* Unknown format */
-               printf ("%s: (no xo65 object file)\n", Name);
+               printf ("%s: (no x65 object file)\n", Name);
 
     } else if (What == 0) {
 
@@ -144,9 +153,11 @@ static void DumpFile (const char* Name)
 
        /* Check what to dump */
        if (What & D_HEADER) {
-           DumpHeader (F, 0);
+           DumpObjHeader (F, 0);
        }
-
+       if (What & D_OPTIONS) {
+           DumpObjOptions (F, 0);
+       }
     }
 
     /* Close the file */
@@ -161,6 +172,7 @@ int main (int argc, char* argv [])
     /* Program long options */
     static const LongOpt OptTab[] = {
        { "--dump-header",      0,      OptDumpHeader           },
+       { "--dump-options",     0,      OptDumpOptions          },
        { "--help",             0,      OptHelp                 },
        { "--version",          0,      OptVersion              },
     };