Changeset 63 for trunk/tools/mapsymw.pl

Timestamp:

Mar 21, 2019, 11:05:05 PM (6 years ago)

Author:

Gregg Young

Message:

Updated mapsymw from Steven Levine

File:

• trunk/tools/mapsymw.pl (modified) (10 diffs)

trunk/tools/mapsymw.pl

@@ -2 +2 @@
 # mapsymw - mapsym wrapper Watcom map files
 
-# Copyright (c) 2007, 2015 Steven Levine and Associates, Inc.
+# Copyright (c) 2007-2019 Steven Levine and Associates, Inc.
 # All rights reserved.
 
@@ -10 +10 @@
 
 # 2007-07-02 SHL Baseline
-# 2007-07-02 SHL Adapt from mapsymb.pl
-# 2007-07-28 SHL Relax module name detect
-# 2007-07-30 SHL Auto-trim libstdc++ symbols from libc06x maps
-# 2007-08-09 SHL Generate dummy symbol for interior segments with no symbols
-# 2007-11-08 SHL Drop leading keywords from function definitions
 # 2008-12-14 SHL Ensure symbols sorted by value - some apps care
 # 2010-05-03 SHL Comments
@@ -22 +17 @@
 # 2014-11-01 SHL Generate ibm map files in watcom map file directory
 # 2015-01-31 SHL Use unix slashes to keep kLIBC sh.exe happy
+# 2019-03-02 SHL More C++ logic
+# 2019-03-03 SHL Rework dup logic and sym length limiting
 
 # mapsym requires each segment to have at least 1 symbol
@@ -37 +34 @@
 use File::Basename;
 
-our $g_version = '0.3';
+our $g_version = '0.4';
 
 our $g_cmdname;
@@ -82 +79 @@
 
   my $g_wrkfile = $g_mapfile . '-ibm';
-  $g_wrkfile =~ s/-watcom-ibm$/-ibm/;           # In case renamed from .map
+  $g_wrkfile =~ s/-watcom-ibm$/-ibm/;   # In case renamed from .map
   unlink $g_wrkfile || die "unlink $g_wrkfile $!" if -f $g_wrkfile;
   open WRKFILE, ">$g_wrkfile" or die "open $g_wrkfile $!";
@@ -102 +99 @@
   while (<MAPFILE>) {
 
-    chomp;                      # EOL
+    chomp;                              # EOL
 
     if (/Executable Image: (\S+)\.\w+$/) {
@@ -180 +177 @@
 
         my $seginfo;
-        if (defined($segsinfo{$1})) {
-          $seginfo = $segsinfo{$1};
-        }
-        else {
+        if (defined($segsinfo{$segnum})) {
+          $seginfo = $segsinfo{$segnum};
+        } else {
           $seginfo = {max_offset => 0,
                       symcnt => 0};
@@ -193 +189 @@
         $seginfo->{symcnt}++;
 
-        $segsinfo{$1} = $seginfo;
+        $segsinfo{$segnum} = $seginfo;
 
         $segaddr = "$segnum:$offset";
 
         # Convert C++ symbols to something mapsym will accept
-        # warn "$sym\n";
+        warn "\n$sym\n";
 
         $_ = $sym;
 
-        # s/\bIdle\b/    /;     # Drop Idle keyword - obsolete done later
-        s/\(.*\).*$//;          # Drop (...) tails
-
-        s/::~/__x/;             # Replace ::~ with __x
-        s/::/__/;               # Replace :: with __
-
-        s/[<,]/_/g;             # Replace < and , with _
-        s/[>]//g;               # Replace > with nothing
-        s/[\[\]]//g;            # Replace [] with nothing
-        # s/_*$//;              # Drop trailing _
-        # s/\W+\w//;            # Drop leading keywords (including Idle)
-        s/\b.*\b\s+//g;         # Drop leading keywords (including Idle)
+        s/\s+\(.*\)//;                  # Drop (...) comments preceeded by whitespace
+
+        # Make C++ compatible with mapsym
+
+        # Drop keywords and decorations
+        s/\b(near|int|short|unsigned|long|void|char|const|wchar_t)\b\s*[*&]?\s*//g;
+
+        # s/<[^<>]+>//g;                # Replace < > templates with nothing
+
+        s/std::\s*/std/g;               # Replace std:: with std
+        s/::~/__x/g;                    # Replace destructor ::~ with __x
+        s/::/__/g;                      # Replace :: with __
+
+        s/[\[\]()<>,]/ /g;              # Replace [ ] < > and , with spaces
+        s/\s+/_/g;                      # Replace whitespace with single _
+        s/__+/_/g;                      # Replace multiple _ with single _
 
         # Drop leading and trailing _ to match source code
 
-        s/^_//;                 # Drop leading _ (cdecl)
-        s/_$//;                 # Drop trailing _ (watcall)
-
-        # warn "$_\n";
+        s/^_//;                         # Drop leading _ (cdecl)
+        s/_$//;                         # Drop trailing _ (watcall)
+
+        $_ = substr($_, 0, 63) if length($_) > 63;              # limit
+
+        warn "\n$_\n";
 
         # Prune some libc symbols to avoid mapsym overflows
@@ -264 +266 @@
       if (defined($segsinfo{$segnum})) {
         $seginfo = $segsinfo{$segnum};
-      }
-      else {
+      } else {
         $seginfo = {max_offset => 0,
                     symcnt => 0};
@@ -287 +288 @@
       }
     }
-  } # foreach
+  } # foreach $segnum
 
   # Generate symbols by value listing
-
-  my $lastsym = '';
-  my $seq = 0;
+  # FIXME to warn if may overflow 64K limit
+
   @keys = sort keys %syms;
+  my %used;
   foreach $segaddr (@keys) {
     my $sym = $syms{$segaddr};
     my $imp = substr($segaddr, 0, 4) eq '0000' ? 'Imp' : '';
-    if ($sym ne $lastsym) {
-      $lastsym = $sym;
-      $seq = 0;
+    # Avoid dups
+    if (defined $used{$sym}) {
+      my $seq = $used{$sym};
+      $seq++;
+      $used{$sym} = $seq;
+      $sym = "${sym}_$seq";
     } else {
-      $seq++;
-      $sym = "${sym}_$seq";
+      $used{$sym} = 0;
     }
     printf WRKFILE $symfmt, $segaddr, $imp, $sym;
-  }
+  } # foreach
 
   close WRKFILE;