Mercurial > hg > dmlib

changeset 2555:6249aa494e83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename "ROM/WT" blocks to just "WT", move the description to --help.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 27 Feb 2022 16:38:35 +0200
parents aabfa00eafd9
children 12ea1ea93522
files tools/objlink.c
diffstat 1 files changed, 24 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/tools/objlink.c	Sun Feb 27 16:37:14 2022 +0200
+++ b/tools/objlink.c	Sun Feb 27 16:38:35 2022 +0200
@@ -71,10 +71,10 @@
 enum
 {
     MTYPE_NONE = 0,
-    MTYPE_ROM,        // Hard ROM
-    MTYPE_ROM_WT,     // Write to RAM through ROM
-    MTYPE_IO,         // I/O lines
-    MTYPE_RES         // RESERVED
+    MTYPE_ROM,         // ROM
+    MTYPE_WT,          // Write to RAM through ROM
+    MTYPE_IO,          // I/O lines
+    MTYPE_RES          // RESERVED
 };
 
 enum
@@ -92,7 +92,7 @@
         64 * 1024,
         0,
         {
-            { 0x0000, 0x0000, 0              , NULL         , 0 }
+            { 0x0000, 0x0000, 0            , NULL         , 0 }
         }
     },
 
@@ -100,9 +100,9 @@
         64 * 1024,
         3,
         {
-            { 0xA000, 0xBFFF,  MTYPE_ROM_WT  , "Basic ROM"  ,  PLACE_STATIC },
-            { 0xD000, 0xDFFF,  MTYPE_IO      , "I/O"        ,  PLACE_STATIC },
-            { 0xE000, 0xFFFF,  MTYPE_ROM_WT  , "Kernal ROM" ,  PLACE_STATIC },
+            { 0xA000, 0xBFFF,  MTYPE_WT    , "Basic ROM"  ,  PLACE_STATIC },
+            { 0xD000, 0xDFFF,  MTYPE_IO    , "I/O"        ,  PLACE_STATIC },
+            { 0xE000, 0xFFFF,  MTYPE_WT    , "Kernal ROM" ,  PLACE_STATIC },
         }
     },
 
@@ -110,8 +110,8 @@
         64 * 1024,
         2,
         {
-            { 0xD000, 0xDFFF,  MTYPE_IO      , "I/O"        ,  PLACE_STATIC },
-            { 0xE000, 0xFFFF,  MTYPE_ROM_WT  , "Kernal ROM" ,  PLACE_STATIC },
+            { 0xD000, 0xDFFF,  MTYPE_IO    , "I/O"        ,  PLACE_STATIC },
+            { 0xE000, 0xFFFF,  MTYPE_WT    , "Kernal ROM" ,  PLACE_STATIC },
         }
     },
 
@@ -119,7 +119,7 @@
         64 * 1024,
         1,
         {
-            { 0xD000, 0xDFFF,  MTYPE_IO      , "I/O"        ,  PLACE_STATIC },
+            { 0xD000, 0xDFFF,  MTYPE_IO    , "I/O"        ,  PLACE_STATIC },
         }
     },
 
@@ -127,9 +127,9 @@
         64 * 1024,
         3,
         {
-            { 0xA000, 0xBFFF,  MTYPE_ROM_WT  , "Basic ROM"  , PLACE_STATIC },
-            { 0xD000, 0xDFFF,  MTYPE_ROM     , "Char ROM"   , PLACE_STATIC },
-            { 0xE000, 0xFFFF,  MTYPE_ROM_WT  , "Kernal ROM" , PLACE_STATIC },
+            { 0xA000, 0xBFFF,  MTYPE_WT    , "Basic ROM"  , PLACE_STATIC },
+            { 0xD000, 0xDFFF,  MTYPE_ROM   , "Char ROM"   , PLACE_STATIC },
+            { 0xE000, 0xFFFF,  MTYPE_WT    , "Kernal ROM" , PLACE_STATIC },
         }
     },
 };
@@ -204,6 +204,15 @@
             "  %d = %-40s [%s] (%d kB)\n",
             i, m->name, m->desc, m->size / 1024);
     }
+
+    fprintf(stdout,
+    "\n"
+    "Memory block types:\n"
+    "  NC     = Not Connected\n"
+    "  RSVD   = Reserved\n"
+    "  WT     = RAM under 'write-through' ROM\n"
+    "\n"
+    );
 }
 
 
@@ -784,7 +793,7 @@
         {
             case MTYPE_NONE:   s = "N/A (NC)"; break;
             case MTYPE_ROM:    s = "ROM"; break;
-            case MTYPE_ROM_WT: s = "ROM/WT"; break;
+            case MTYPE_WT:     s = "WT"; break;
             case MTYPE_IO:     s = "I/O"; break;
             case MTYPE_RES:    s = "RSVD"; break;
             default:           s = "????"; break;
@@ -800,14 +809,6 @@
         memPrintLine(f);
 
     }
-
-    fprintf(f,
-    "\n"
-    "NC     = Not Connected\n"
-    "RSVD   = Reserved\n"
-    "ROM/WT = RAM under 'write-through' ROM\n"
-    "\n"
-    );
 }