Changeset 1167

Timestamp:

Feb 9, 2018, 10:52:57 AM (7 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: wmapsym.cmd: Add /m switch and improve compatibility with IBM map.

The /m switch will only produce the IBM map file without calling MAPSYM on it.
Improved compatibility means proper generation of the Class column's values
for the segments table which is needed for the IBM MAPTSF tool.

File:

• trunk/mkspecs/os2-g++/wmapsym.cmd (modified) (4 diffs)

trunk/mkspecs/os2-g++/wmapsym.cmd

@@ -41 +41 @@
 G.StartDir = directory()
 
-parse arg aArgs
-if (aArgs == '') then do
+parse arg G.WatMapFile aOpts
+if (G.WatMapFile == '') then do
     say
     say 'Creates a .SYM file from the Watcom .MAP file using IBM MAPSYM'
-    say 'Version 1.1 (2011-12-18)'
-    say 'Copyright (C) 2011 Dmitriy Kuminov'
+    say 'Version 1.2 (2018-02-09)'
+    say 'Copyright (C) 2018 Dmitriy Kuminov'
     say
     say 'Usage: '
     say
-    say '  'G.ScriptFile' <watcom_map_file>'
+    say '  'G.ScriptFile' <watcom_map_file> [/m]'
+    say
+    say '  /m - Don''t run MAPSYM and only produce an IBM map file (.NNNNN-map)'
 
     call Done 0
 end
 
-G.WatMapFile = aArgs
+G.MapOnly = 0
+if (translate(aOpts) == '/m') then G.MapOnly = 1
 
 call Main
@@ -199 +202 @@
                         call lineout G.IbmMapFile, ' Start         Length     Name                   Class'
                         do i = 1 to segments.0
-                            call lineout G.IbmMapFile, ' 'segments.i.!addr' 0'segments.i.!size'H 'segments.i.!name
+
+                            call lineout G.IbmMapFile, ' 'segments.i.!addr' 0'segments.i.!size'H 'AlignLeft(segments.i.!name, 22) segments.i.!class '32-bit'
                         end
                         call lineout G.IbmMapFile, ''
@@ -235 +239 @@
     call lineout G.IbmMapFile
 
+    if (G.MapOnly) then do
+        say 'Created IBM map file:' G.IbmMapFile
+        return
+    end
+
     cmdline = 'mapsym.exe' G.IbmMapFile
     cmdline
@@ -251 +260 @@
  utility functions
 ------------------------------------------------------------------------------*/
+
+/**
+ * Pad the given string with the pad character on the right to the requested
+ * width. If the string length is equal or greater than the requested width, it
+ * is returned as is.
+ *
+ * @param  aStr         String to align.
+ * @param  aWidth       Minimum width of the resulting stiring.
+ * @param  aPad h       Pad character (blank by default).
+ * @return              Resulting string.
+ */
+AlignLeft: procedure expose (Globals)
+    parse arg aStr, aWidth, aPad
+    len = length(aStr)
+    if (len >= aWidth) then return aStr
+    if (aPad == "") then aPad = " "
+    return aStr || copies(aPad, aWidth - len)
 
 /**