crashanalysercmd/PerfToolsSharedLibraries/Engine/SymbianSymbolLib/QueryAPI/SymbolQueryAPI.cs
changeset 3 045ade241ef5
parent 2 0c91f0baec58
equal deleted inserted replaced
2:0c91f0baec58 3:045ade241ef5
    68             if (aAddress < 0x400000) // Process run area is above this address
    68             if (aAddress < 0x400000) // Process run area is above this address
    69             {
    69             {
    70                 return null;
    70                 return null;
    71             }
    71             }
    72 
    72 
    73             // First check with the relocated/activated symbol collections,
    73             Symbol ret = null;
    74             // i.e. RAM-loaded code that has been fixed up.
    74             // First check from symbol file and then from map files
    75             Symbol ret = iRelocator.CollectionList.Lookup( aAddress, out aCollection );
    75             foreach (SymSource source in SourceManager)
       
    76             {
       
    77                 if (source.Contains(aAddress))
       
    78                 {
       
    79                     ret = source.Lookup(aAddress, out aCollection);
       
    80                     break;
       
    81                 }
       
    82             }
       
    83 
    76             if ( ret == null && aCollection == null )
    84             if ( ret == null && aCollection == null )
    77             {
    85             {
    78                 foreach ( SymSource source in SourceManager )
    86                 ret = iRelocator.CollectionList.Lookup(aAddress, out aCollection);
    79                 {
       
    80                     if ( source.Contains( aAddress ) )
       
    81                     {
       
    82                         ret = source.Lookup( aAddress, out aCollection );
       
    83                         break;
       
    84                     }
       
    85                 }
       
    86             }
    87             }
    87 
    88 
    88             // Tag the collection because it provided a symbol
    89             // Tag the collection because it provided a symbol
    89             if ( aCollection != null )
    90             if ( aCollection != null )
    90             {
    91             {