Changeset 1342

Timestamp:

Dec 15, 2008, 6:17:15 AM (17 years ago)

Author:

Steven Levine

Message:

Ensure symbols sorted by value

File:

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

trunk/debugtools/mapsymw.pl

@@ -2 +2 @@
 # mapsymw - mapsym Watcom map files
 
-# Copyright (c) 2007 Steven Levine and Associates, Inc.
+# Copyright (c) 2007, 2008 Steven Levine and Associates, Inc.
 # All rights reserved.
 
@@ -18 +18 @@
 # 09 Aug 07 SHL Generate dummy symbol for interior segments with no symbols
 # 08 Nov 07 SHL Drop leading keywords from function definitions
+# 14 Dec 08 SHL Ensure symbols sorted by value - some apps care
 
 # mapsym requires each segment to have at least 1 symbol
@@ -34 +35 @@
 use File::Basename;
 
-our $g_version = '0.2';
+our $g_version = '0.3';
 
 our $g_cmdname;
@@ -89 +90 @@
   my $is32bit;
   my %segsinfo;
+  my %syms;
   my $segnum;
   my $offset;
   my $segaddr;
-  my $imp;
 
   my $segfmt;
@@ -116 +117 @@
     next if /^=/;
     next if /^ /;
-    next if /^ /;
+    next if /^$/;
 
     if ($state eq 'segments') {
@@ -138 +139 @@
 
         if (!$segcnt) {
+          # First segment - determine address size (16/32 bit)
           $is32bit = length($offset) == 8;
+          # Output title
           print WRKFILE "\n";
           if ($is32bit) {
@@ -165 +168 @@
       # 0        1         2         3         4         5         6
       # 123456789012345678901234567890123456789012345678901234567890
-      #  Address         Publics by Value
+      #   Address         Publics by Value
       #  0000:00000000  Imp  WinEmptyClipbrd      (PMWIN.733)
       #  0002:0001ED40       __towlower_dummy
@@ -183 +186 @@
 
         my $n = hex $offset;
+        # Remember max symbol offset
         $seginfo->{max_offset} = $n if $n > $seginfo->{max_offset};
         $seginfo->{symcnt}++;
@@ -189 +193 @@
 
         $segaddr = "$segnum:$offset";
-
-        $imp = $segnum eq '0000' ? 'Imp' : '';
 
         # Convert C++ symbols to something mapsym will accept
@@ -213 +215 @@
         s/_$//;                 # Drop trailing _ (watcall)
 
-        # Prune to avoid mapsym overflows
+        # Prune some libc symbols to avoid mapsym overflows
         if ($mapid =~ /libc06/) {
           # 0001:000b73e0  __ZNSt7codecvtIcc11__mbstate_tEC2Ej
@@ -221 +223 @@
 
         if (!$symcnt) {
+          # First symbol - output title
           print WRKFILE "\n";
           if ($is32bit) {
-            print WRKFILE " Address         Publics by Value\n";
+            print WRKFILE "  Address         Publics by Value\n";
           } else {
-            print WRKFILE " Address     Publics by Value\n";
+            print WRKFILE "  Address     Publics by Value\n";
           }
         }
 
-        printf WRKFILE $symfmt, $segaddr, $imp, $_;
+        $syms{$segaddr} = $_;
+
         $symcnt++;
       }
@@ -264 +268 @@
           $segaddr = "$segnum:0000";
         }
-        $imp = '';
-        printf WRKFILE $symfmt, $segaddr, $imp, $_;
+        $syms{$segaddr} = $_;
         $symcnt++;
       } elsif ($is32bit && $seginfo->{max_offset} < 0x10000) {
@@ -271 +274 @@
         $_ = "Seg${segnum}_dummy";
         $segaddr = "$segnum:00010000";
-        $imp = '';
-        printf WRKFILE $symfmt, $segaddr, $imp, $_;
+        $syms{$segaddr} = $_;
         $symcnt++;
       }
     }
   } # foreach
+
+  @keys = sort keys %syms;
+  foreach $segaddr (@keys) {
+    my $sym = $syms{$segaddr};
+    my $imp = substr($segaddr, 0, 4) eq '0000' ? 'Imp' : '';
+    printf WRKFILE $symfmt, $segaddr, $imp, $sym;
+  }
 
   close WRKFILE;