Changeset 8369 for trunk/tools

Timestamp:

May 5, 2002, 9:03:32 PM (23 years ago)

Author:

bird

Message:

Corrected some stupid vac40 bugs.

File:

• trunk/tools/bin/MapSym.cmd (modified) (8 diffs)

trunk/tools/bin/MapSym.cmd

@@ -1 @@
-/* $Id: MapSym.cmd,v 1.5 2002-05-01 03:59:24 bird Exp $
+/* $Id: MapSym.cmd,v 1.6 2002-05-05 19:03:32 bird Exp $
  *
  * Helper script for calling MAPSYM.EXE.
@@ -23 +23 @@
 
 if (  (sDummy <> '') ,
-    | (sSymFile = '') ,
+    | (sMapFile = '') ,
     | (pos(';'translate(sLinker)';', translate(sLinkers)) <= 0) ,
     )
@@ -37 +37 @@
     call syntax;
     exit(16);
+end
+
+sMapBaseName = filespec('name', sMapFile);
+if (pos('.', sMapBaseName) > 0) then
+    sMapBaseName = left(sMapBaseName, pos('.', sMapBaseName) - 1);
+
+if (sSymFile = '') then
+do
+    if (lastpos('.', filespec('name', sMapFile)) > 0) then
+        sSymFile = left(sMapFile, lastpos('.', sMapFile)) || 'sym';
+    else
+        sSymFile = sMapFile || '.sym';
 end
 
@@ -81 +93 @@
  *  to this file. And call mapsym on it.)
  */
-sTmpMapFile = SysTempFileName(sTmp'\mapsym????.map');
+sTmpMapFile = SysTempFileName(sTmp'\'||sMapBaseName||'.???');
 if (sTmpMapFile = '') then
 do
@@ -175 +187 @@
  */
 syntax: procedure;
-    say 'syntax: MapSym.cmd <linker> <mapfile> <symfile>';
+    say 'syntax: MapSym.cmd <linker> <mapfile> [symfile]';
     say '   linker      watcom, vac3xx, link386 or vac40. All $(BUILD_ENV).';
     say '   mapfile     Name of the input map file.';
-    say '   symfile     Name of the output sym file.';
+    say '   symfile     Name of the output sym file. If not specified';
+    say '               mapfile is used as a base name.';
 return 0;
 
@@ -288 +301 @@
                 if (sState = sNewState) then
                 do
+                    sLine = translate(sLine, '', '"');
                     if ((strip(sLine) <> '') & (pos('|', sLine) <= 0) & (pos('@', sLine) <= 0)) then
                         call lineout sOutFile, sLine;
@@ -398 +412 @@
     parse arg sStringHex
 /*    say 'HexToDec('sStringHex'):' strip(strip(sStringHex), 'L', '0')*/
-return x2d(strip(strip(sStringHex), 'L', '0'));
+    sStringHex = strip(strip(sStringHex), 'L', '0');
+    if (sStringHex = '') then
+        sStringHex = 0;
+return x2d(sStringHex);
 
 
@@ -410 +427 @@
 DecToHex: procedure
     parse arg sStringDec
-return d2x(strip(strip(sStringDec), 'L', '0'));
+    sStringDec = strip(strip(sStringDec), 'L', '0');
+    if (sStringDec = '') then
+        sStringDec = 0;
+return d2x(sStringDec);