Changeset 1104

Timestamp:

Dec 17, 2011, 11:36:45 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

wmapsym.cmd: Understand segment entries with missing code or group names.

File:

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

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

@@ -3 +3 @@
  * Creates a .SYM file from the Watcom .MAP file using IBM MAPSYM.
  *
- * Copyright (C) 2010 Dmitry A. Kuminov
+ * Copyright (C) 2010-2011 Dmitry Kuminov
  *
  * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -166 +166 @@
                 end
                 else do
-                    parse value Normalize(line) with name class group addr size
+                    parse value Normalize(line) with name rest
+                    i = words(rest)
+                    if (i == 2) then parse var rest         addr size
+                    else if (i == 3) then parse var rest        group addr size
+                    else parse var rest                     class group addr size
                     i = segments.0 + 1
                     segments.i.!name = name
@@ -234 +238 @@
     cmdline
 
-    call DeleteFile G.IbmMapFile
-
     if (rc \= 0) then do
         call SayErr 'Executing "'cmdline'" failed with code 'rc'.'
+        call SayErr 'Please check the contents of "'G.IbmMapFile'".'
         call Done rc
     end
+
+    call DeleteFile G.IbmMapFile
 
     return