Remove try catch in Il2CppBinary::TryMapRawAddressToVirtual

Author: ds5678

Cpp2IL.Plugin.StrippedCodeRegSupport/StrippedCodeRegSupportPlugin.cs

@@ -1,4 +1,4 @@
-using Cpp2IL.Core.Api;
+using Cpp2IL.Core.Api;
 using Cpp2IL.Core.Attributes;
 using Cpp2IL.Plugin.StrippedCodeRegSupport;
 using LibCpp2IL;
@@ -40,7 +40,7 @@ private void OnReadFail(Il2CppBinary binary, Il2CppMetadata metadata, ref Il2Cpp
         //We can piggyback off BinarySearcher:
         var searcher = new BinarySearcher(binary, metadata.MethodDefinitionCount, metadata.TypeDefinitionCount);
 
-        var mscorlibs = searcher.FindAllStrings("mscorlib.dll\0").Select(binary.MapRawAddressToVirtual).ToList();
+        var mscorlibs = searcher.FindAllStrings("mscorlib.dll\0").Select(idx => binary.MapRawAddressToVirtual(idx)).ToList();
 
         Logger.VerboseNewline($"Found {mscorlibs.Count} occurrences of mscorlib.dll: [{string.Join(", ", mscorlibs.Select(p => p.ToString("X")))}]");
 

LibCpp2IL/Elf/ElfFile.cs

@@ -709,12 +709,20 @@ public override long MapVirtualAddressToRaw(ulong addr, bool throwOnError = true
         return (long)(addr - (section.VirtualAddress - section.RawAddress));
     }
 
-    public override ulong MapRawAddressToVirtual(uint offset)
+    public override ulong MapRawAddressToVirtual(uint offset, bool throwOnError = true)
     {
         if (relocationBlocks.Any(b => b.start <= offset && b.end > offset))
-            throw new InvalidOperationException("Attempt to map a relocation block to a virtual address");
+            if (throwOnError)
+                throw new InvalidOperationException("Attempt to map a relocation block to a virtual address");
+            else
+                return 0;
 
-        var section = _elfProgramHeaderEntries.First(x => offset >= x.RawAddress && offset < x.RawAddress + x.RawSize);
+        var section = _elfProgramHeaderEntries.FirstOrDefault(x => offset >= x.RawAddress && offset < x.RawAddress + x.RawSize);
+        if (section == null)
+            if (throwOnError)
+                throw new InvalidOperationException($"No entry in the Elf PHT contains raw address 0x{offset:X}");
+            else
+                return 0;
 
         return section.VirtualAddress + offset - section.RawAddress;
     }

LibCpp2IL/Il2CppBinary.cs

@@ -327,21 +327,13 @@ private Il2CppVariableWidthIndex<Il2CppMethodDefinition> GetGenericMethodFromInd
 
     public abstract byte GetByteAtRawAddress(ulong addr);
     public abstract long MapVirtualAddressToRaw(ulong uiAddr, bool throwOnError = true);
-    public abstract ulong MapRawAddressToVirtual(uint offset);
+    public abstract ulong MapRawAddressToVirtual(uint offset, bool throwOnError = true);
     public abstract ulong GetRva(ulong pointer);
 
     public bool TryMapRawAddressToVirtual(in uint offset, out ulong va)
     {
-        try
-        {
-            va = MapRawAddressToVirtual(offset);
-            return true;
-        }
-        catch (Exception)
-        {
-            va = 0;
-            return false;
-        }
+        va = MapRawAddressToVirtual(offset, false);
+        return va != 0;
     }
 
     public bool TryMapVirtualAddressToRaw(ulong virtAddr, out long result)

LibCpp2IL/MachO/MachOFile.cs

@@ -111,19 +111,23 @@ public override long MapVirtualAddressToRaw(ulong uiAddr, bool throwOnError = tr
         return (long)(sec.Offset + (uiAddr - sec.Address));
     }
 
-    public override ulong MapRawAddressToVirtual(uint offset)
+    public override ulong MapRawAddressToVirtual(uint offset, bool throwOnError = true)
     {
         var sec = Sections64.FirstOrDefault(s => s.Offset <= offset && offset < s.Offset + s.Size);
 
         if (sec == null)
-            throw new($"Could not find section for raw address 0x{offset:X}");
+            if (throwOnError)
+                throw new($"Could not find section for raw address 0x{offset:X}");
+            else
+                return 0;
 
         return sec.Address + (offset - sec.Offset);
     }
 
     public override ulong GetRva(ulong pointer)
     {
-        return pointer; //TODO?
+        // Mach-O doesn't have RVAs and instead uses virtual addresses, so we can just return the pointer as-is.
+        return pointer;
     }
 
     public override byte[] GetRawBinaryContent() => _raw;

LibCpp2IL/NintendoSwitch/NsoFile.cs

@@ -319,13 +319,14 @@ public override long MapVirtualAddressToRaw(ulong addr, bool throwOnError = true
         return (long)(addr - (segment.MemoryOffset + NsoGlobalOffset) + segment.FileOffset);
     }
 
-    public override ulong MapRawAddressToVirtual(uint offset)
+    public override ulong MapRawAddressToVirtual(uint offset, bool throwOnError = true)
     {
         var segment = segments.FirstOrDefault(x => offset >= x.FileOffset && offset < x.FileOffset + x.DecompressedSize);
         if (segment == null)
-        {
-            return 0;
-        }
+            if (throwOnError)
+                throw new InvalidOperationException($"NSO: Offset 0x{offset:X} is not present in any of the segments. Known segment starts are (hex) {string.Join(", ", segments.Select(s => s.FileOffset.ToString("X")))}");
+            else
+                return 0;
 
         return offset - segment.FileOffset + (NsoGlobalOffset + segment.MemoryOffset);
     }

LibCpp2IL/PE/PE.cs

@@ -110,9 +110,14 @@ public override long MapVirtualAddressToRaw(ulong uiAddr, bool throwOnError = tr
         return addr - (section.VirtualAddress - section.PointerToRawData);
     }
 
-    public override ulong MapRawAddressToVirtual(uint offset)
+    public override ulong MapRawAddressToVirtual(uint offset, bool throwOnError = true)
     {
-        var section = peSectionHeaders.First(x => offset >= x.PointerToRawData && offset < x.PointerToRawData + x.SizeOfRawData);
+        var section = peSectionHeaders.FirstOrDefault(x => offset >= x.PointerToRawData && offset < x.PointerToRawData + x.SizeOfRawData);
+        if (section == null)
+            if (throwOnError)
+                throw new InvalidOperationException($"Provided offset, 0x{offset:X}, does not fall within any section of the PE file.");
+            else
+                return 0;
 
         return peImageBase + section.VirtualAddress + offset - section.PointerToRawData;
     }

LibCpp2IL/Wasm/WasmFile.cs

@@ -219,7 +219,7 @@ public override long MapVirtualAddressToRaw(ulong uiAddr, bool throwOnError = tr
         return (long)uiAddr;
     }
 
-    public override ulong MapRawAddressToVirtual(uint offset)
+    public override ulong MapRawAddressToVirtual(uint offset, bool throwOnError = true)
     {
         var data = DataSection;
         if (offset > data.Pointer && offset < data.Pointer + (long)data.Size)