Changeset 1551 for trunk/debugtools/mapsymw.pl

Timestamp:

Nov 15, 2010, 4:33:25 AM (15 years ago)

Author:

Gregg Young

Message:

This code adds the semaphores to prevent a rescan from starting before the current one is finished; it fixes the double directory listing in the tree container and streamlines scanning. It update mapsym.pl to the latest version. Some code cleanup is included

File:

• trunk/debugtools/mapsymw.pl (modified) (9 diffs)

trunk/debugtools/mapsymw.pl

@@ -1 +1 @@
 #!perl -w
-# mapsymw - mapsym Watcom map files
-
-# Copyright (c) 2007, 2008 Steven Levine and Associates, Inc.
+# mapsymw - mapsym wrapper Watcom map files
+# $Id: $
+# Copyright (c) 2007, 2010 Steven Levine and Associates, Inc.
 # All rights reserved.
-
-# $TLIB$: $ &(#) %n - Ver %v, %f $
-# TLIB: $ $
 
 # This program is free software licensed under the terms of the GNU
@@ -19 +16 @@
 # 08 Nov 07 SHL Drop leading keywords from function definitions
 # 14 Dec 08 SHL Ensure symbols sorted by value - some apps care
+# 03 May 10 SHL Comments
+# 14 Jun 10 SHL Avoid missing C++ symbols
 
 # mapsym requires each segment to have at least 1 symbol
@@ -165 +164 @@
       # Address        Symbol
       # 0002:0004ae46+ ArcTextProc
+      # 0002:0d11+     void near IoctlAudioCapability( __2bd9g9REQPACKET far *, short unsigned )
       # Out
       # 0        1         2         3         4         5         6
@@ -171 +171 @@
       #  0000:00000000  Imp  WinEmptyClipbrd      (PMWIN.733)
       #  0002:0001ED40       __towlower_dummy
-      if (/^([[:xdigit:]]+):([[:xdigit:]]+)[+*]?\s+(\w+)$/) {
+      if (/^([[:xdigit:]]+):([[:xdigit:]]+)[+*]?\s+(.+)$/) {
         $segnum = $1;
         $offset = $2;
@@ -195 +195 @@
 
         # Convert C++ symbols to something mapsym will accept
+        # warn "$sym\n";
 
         $_ = $sym;
 
-        # s/\bIdle\b/    /;     # Drop Idle keyword
-        s/\(.*\).*$//;          # Drop (... tails
-
-        s/::~/_x/;              # Replace ::~ with _x
-        s/::/_/;                # Replace :: with _
+        # 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/_*$//;              # Drop trailing _
+        # s/\W+\w//;            # Drop leading keywords (including Idle)
+        s/\b.*\b\s+//g;         # Drop leading keywords (including Idle)
 
         # Drop leading and trailing _ to match source code
@@ -214 +216 @@
         s/^_//;                 # Drop leading _ (cdecl)
         s/_$//;                 # Drop trailing _ (watcall)
+
+        # warn "$_\n";
 
         # Prune some libc symbols to avoid mapsym overflows
@@ -242 +246 @@
   close MAPFILE;
 
-  # Generate dummy symbols as needed
+  # Sort segments
 
   my @keys = sort keys %segsinfo;
@@ -249 +253 @@
     @keys = '0000'..$maxseg;
   }
+
+  # Generate dummy symbols for 32-bit segments smaller than 64KB
 
   foreach $segnum (@keys) {
@@ -280 +286 @@
   } # foreach
 
+  # Generate symbols by value listing
+
+  my $lastsym = '';
+  my $seq = 0;
   @keys = sort keys %syms;
   foreach $segaddr (@keys) {
     my $sym = $syms{$segaddr};
     my $imp = substr($segaddr, 0, 4) eq '0000' ? 'Imp' : '';
+    if ($sym ne $lastsym) {
+      $lastsym = $sym;
+      $seq = 0;
+    } else {
+      $seq++;
+      $sym = "${sym}_$seq";
+    }
     printf WRKFILE $symfmt, $segaddr, $imp, $sym;
   }