Allow non-code symbol, fix sort

Author: codehz

EatPdb/EatPdb.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Version>0.0.2</Version>
+    <Version>0.0.3</Version>
     <Authors>CodeHz</Authors>
     <Company>CodeHz</Company>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>

EatPdb/Program.cs

@@ -46,6 +46,8 @@ private static bool FilterName(string name) {
                 return false;
             if (name.StartsWith("??@"))
                 return false;
+            if (name.StartsWith("?$TSS"))
+                return false;
             if (name.Contains("std@@Q"))
                 return false;
             if (name.Contains("std@@U"))
@@ -71,7 +73,7 @@ private static void RealMain(Options options) {
                 var symdb = new SymbolDatabase();
 
                 // Collect all symbols
-                foreach (var item in pdb.PublicSymbols.Where(item => item.IsCode && FilterName(item.Name)))
+                foreach (var item in pdb.PublicSymbols.Where(item => FilterName(item.Name)))
                     symdb.Add((uint) item.RelativeVirtualAddress, item.Name);
 
                 // Exclude imported symbols

EatPdb/SymbolDatabase.cs

@@ -1,13 +1,14 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 
 namespace EatPdb {
 
     internal class SymbolDatabase : IEnumerable<KeyValuePair<uint, SortedSet<string>>> {
         private readonly SortedDictionary<uint, SortedSet<string>> fullmap = new SortedDictionary<uint, SortedSet<string>>();
-        private readonly SortedDictionary<string, uint> revmap = new SortedDictionary<string, uint>();
+        private readonly SortedDictionary<string, uint> revmap = new SortedDictionary<string, uint>(StringComparer.Ordinal);
 
         public void Add(uint RVA, string name) {
             if (fullmap.TryGetValue(RVA, out var set))
@@ -35,7 +36,7 @@ public KeyValuePair<string, ushort>[] Build() {
             ushort idx = 0;
             foreach (var (key, _) in fullmap)
                 tempid.Add(key, idx++);
-            var ret = new SortedDictionary<string, ushort>();
+            var ret = new SortedDictionary<string, ushort>(StringComparer.Ordinal);
             foreach (var (name, rva) in revmap) {
                 if (tempid.TryGetValue(rva, out var id)) {
                     ret.Add(name, id);

PdbReader/PdbReader.csproj

@@ -4,7 +4,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <NeutralLanguage>English (United States)</NeutralLanguage>
-    <Version>0.0.1</Version>
+    <Version>0.0.2</Version>
     <Authors>CodeHz</Authors>
     <Product>EatPdb</Product>
     <Copyright>CodeHz</Copyright>

PdbReader/Program.cs

@@ -35,14 +35,17 @@ private static void RealMain(Options options) {
             try {
                 using var reader = new PdbFileReader(options.InputFile);
                 if (options.Verbose)
-                    foreach (var item in from item in reader.PublicSymbols where item.IsCode && !item.Name.StartsWith("_") orderby item.RelativeVirtualAddress select item)
+                    foreach (var item in from item in reader.PublicSymbols where !item.Name.StartsWith("_") orderby item.RelativeVirtualAddress select item)
                         Console.WriteLine("{0}:{1:X8} {2}", item.Segment, item.RelativeVirtualAddress, options.Demangle ? item.GetUndecoratedName() : item.Name);
                 else {
-                    var items = from item in reader.PublicSymbols
-                                where item.IsCode && !item.Name.StartsWith("_")
+                    var syms = from item in reader.PublicSymbols
+                                where !item.Name.StartsWith("_")
                                 select item;
-                    Console.WriteLine("FullCount: {0}", items.Count());
-                    Console.WriteLine("DistinctCount: {0}", items.Distinct(new SymbolEqualityComparer()).Count());
+                    Console.WriteLine("Symbol FullCount: {0}", syms.Count());
+                    Console.WriteLine("Symbol DistinctCount: {0}", syms.Distinct(new SymbolEqualityComparer()).Count());
+
+                    var functions = reader.Functions;
+                    Console.WriteLine("Functions FullCount: {0}", functions.Count());
                 }
             } catch (Exception e) {
                 Console.WriteLine(e.ToString());