处理v27以上的metadataUsage

Perfare · Perfare · commit 7a0ee09aa8c1 · 2021-04-21T09:19:06.000+08:00
diff --git a/Il2CppDumper/ExecutableFormats/Elf.cs b/Il2CppDumper/ExecutableFormats/Elf.cs
@@ -79,7 +79,13 @@ public bool CheckSection()
         public override ulong MapVATR(ulong addr)
         {
             var phdr = programSegment.First(x => addr >= x.p_vaddr && addr <= x.p_vaddr + x.p_memsz);
-            return addr - (phdr.p_vaddr - phdr.p_offset);
+            return addr - phdr.p_vaddr + phdr.p_offset;
+        }
+
+        public override ulong MapRTVA(ulong addr)
+        {
+            var phdr = programSegment.First(x => addr >= x.p_offset && addr <= x.p_offset + x.p_filesz);
+            return addr - phdr.p_offset + phdr.p_vaddr;
         }
 
         public override bool Search()
diff --git a/Il2CppDumper/ExecutableFormats/Elf64.cs b/Il2CppDumper/ExecutableFormats/Elf64.cs
@@ -70,7 +70,13 @@ public bool CheckSection()
         public override ulong MapVATR(ulong addr)
         {
             var phdr = programSegment.First(x => addr >= x.p_vaddr && addr <= x.p_vaddr + x.p_memsz);
-            return addr - (phdr.p_vaddr - phdr.p_offset);
+            return addr - phdr.p_vaddr + phdr.p_offset;
+        }
+
+        public override ulong MapRTVA(ulong addr)
+        {
+            var phdr = programSegment.First(x => addr >= x.p_offset && addr <= x.p_offset + x.p_filesz);
+            return addr - phdr.p_offset + phdr.p_vaddr;
         }
 
         public override bool Search()
diff --git a/Il2CppDumper/ExecutableFormats/Macho.cs b/Il2CppDumper/ExecutableFormats/Macho.cs
@@ -51,7 +51,6 @@ public Macho(Stream stream) : base(stream)
                             section.offset = ReadUInt32();
                             Position += 12; //skip align, reloff, nreloc
                             section.flags = ReadUInt32();
-                            section.end = section.addr + section.size;
                             Position += 8; //skip reserved1, reserved2
                         }
                         break;
@@ -75,10 +74,16 @@ public override void Init(ulong codeRegistration, ulong metadataRegistration)
             customAttributeGenerators = customAttributeGenerators.Select(x => x - 1).ToArray();
         }
 
-        public override ulong MapVATR(ulong uiAddr)
+        public override ulong MapVATR(ulong addr)
         {
-            var section = sections.First(x => uiAddr >= x.addr && uiAddr <= x.end);
-            return uiAddr - (section.addr - section.offset);
+            var section = sections.First(x => addr >= x.addr && addr <= x.addr + x.size);
+            return addr - section.addr + section.offset;
+        }
+
+        public override ulong MapRTVA(ulong addr)
+        {
+            var section = sections.First(x => addr >= x.offset && addr <= x.offset + x.size);
+            return addr - section.offset + section.addr;
         }
 
         public override bool Search()
diff --git a/Il2CppDumper/ExecutableFormats/Macho64.cs b/Il2CppDumper/ExecutableFormats/Macho64.cs
@@ -50,7 +50,6 @@ public Macho64(Stream stream) : base(stream)
                             section.offset = ReadUInt32();
                             Position += 12; //skip align, reloff, nreloc
                             section.flags = ReadUInt32();
-                            section.end = section.addr + section.size;
                             Position += 12; //skip reserved1, reserved2, reserved3
                         }
                         break;
@@ -67,14 +66,24 @@ public Macho64(Stream stream) : base(stream)
             }
         }
 
-        public override ulong MapVATR(ulong uiAddr)
+        public override ulong MapVATR(ulong addr)
         {
-            var section = sections.First(x => uiAddr >= x.addr && uiAddr <= x.end);
+            var section = sections.First(x => addr >= x.addr && addr <= x.addr + x.size);
             if (section.sectname == "__bss")
             {
                 throw new Exception();
             }
-            return uiAddr - (section.addr - section.offset);
+            return addr - section.addr + section.offset;
+        }
+
+        public override ulong MapRTVA(ulong addr)
+        {
+            var section = sections.First(x => addr >= x.offset && addr <= x.offset + x.size);
+            if (section.sectname == "__bss")
+            {
+                throw new Exception();
+            }
+            return addr - section.offset + section.addr;
         }
 
         public override bool Search()
diff --git a/Il2CppDumper/ExecutableFormats/MachoClass.cs b/Il2CppDumper/ExecutableFormats/MachoClass.cs
@@ -12,7 +12,6 @@ public class MachoSection
         public uint size;
         public uint offset;
         public uint flags;
-        public uint end;
     }
 
     public class MachoSection64Bit
@@ -22,7 +21,6 @@ public class MachoSection64Bit
         public ulong size;
         public ulong offset;
         public uint flags;
-        public ulong end;
     }
 
     public class Fat
diff --git a/Il2CppDumper/ExecutableFormats/NSO.cs b/Il2CppDumper/ExecutableFormats/NSO.cs
@@ -96,6 +96,12 @@ public override ulong MapVATR(ulong addr)
             return addr - segment.MemoryOffset + segment.FileOffset;
         }
 
+        public override ulong MapRTVA(ulong addr)
+        {
+            var segment = segments.First(x => addr >= x.FileOffset && addr <= x.FileOffset + x.DecompressedSize);
+            return addr - segment.FileOffset + segment.MemoryOffset;
+        }
+
         public override bool Search()
         {
             return false;
diff --git a/Il2CppDumper/ExecutableFormats/PE.cs b/Il2CppDumper/ExecutableFormats/PE.cs
@@ -64,7 +64,17 @@ public override ulong MapVATR(ulong absAddr)
             {
                 return 0ul;
             }
-            return addr - (section.VirtualAddress - section.PointerToRawData);
+            return addr - section.VirtualAddress + section.PointerToRawData;
+        }
+
+        public override ulong MapRTVA(ulong addr)
+        {
+            var section = sections.FirstOrDefault(x => addr >= x.PointerToRawData && addr <= x.PointerToRawData + x.SizeOfRawData);
+            if (section == null)
+            {
+                return 0ul;
+            }
+            return addr - section.PointerToRawData + section.VirtualAddress + imageBase;
         }
 
         public override bool Search()
diff --git a/Il2CppDumper/ExecutableFormats/WebAssemblyMemory.cs b/Il2CppDumper/ExecutableFormats/WebAssemblyMemory.cs
@@ -14,6 +14,11 @@ public override ulong MapVATR(ulong addr)
             return addr;
         }
 
+        public override ulong MapRTVA(ulong addr)
+        {
+            return addr;
+        }
+
         public override bool PlusSearch(int methodCount, int typeDefinitionsCount, int imageCount)
         {
             var exec = new SearchSection
diff --git a/Il2CppDumper/Il2Cpp/Il2Cpp.cs b/Il2CppDumper/Il2Cpp/Il2Cpp.cs
@@ -31,7 +31,8 @@ public abstract class Il2Cpp : BinaryStream
         public Dictionary<string, ulong[]> codeGenModuleMethodPointers;
         public Dictionary<string, Dictionary<uint, Il2CppRGCTXDefinition[]>> rgctxsDictionary;
 
-        public abstract ulong MapVATR(ulong uiAddr);
+        public abstract ulong MapVATR(ulong addr);
+        public abstract ulong MapRTVA(ulong addr);
         public abstract bool Search();
         public abstract bool PlusSearch(int methodCount, int typeDefinitionsCount, int imageCount);
         public abstract bool SymbolSearch();
diff --git a/Il2CppDumper/Il2Cpp/Metadata.cs b/Il2CppDumper/Il2Cpp/Metadata.cs
@@ -19,12 +19,12 @@ public sealed class Metadata : BinaryStream
         public Il2CppPropertyDefinition[] propertyDefs;
         public Il2CppCustomAttributeTypeRange[] attributeTypeRanges;
         private Dictionary<Il2CppImageDefinition, Dictionary<uint, int>> attributeTypeRangesDic;
-        private Il2CppStringLiteral[] stringLiterals;
+        public Il2CppStringLiteral[] stringLiterals;
         private Il2CppMetadataUsageList[] metadataUsageLists;
         private Il2CppMetadataUsagePair[] metadataUsagePairs;
         public int[] attributeTypes;
         public int[] interfaceIndices;
-        public Dictionary<uint, SortedDictionary<uint, uint>> metadataUsageDic;
+        public Dictionary<Il2CppMetadataUsage, SortedDictionary<uint, uint>> metadataUsageDic;
         public long maxMetadataUsages;
         public int[] nestedTypeIndices;
         public Il2CppEventDefinition[] eventDefs;
@@ -85,15 +85,17 @@ public Metadata(Stream stream) : base(stream)
             genericParameters = ReadMetadataClassArray<Il2CppGenericParameter>(header.genericParametersOffset, header.genericParametersCount);
             constraintIndices = ReadClassArray<int>(header.genericParameterConstraintsOffset, header.genericParameterConstraintsCount / 4);
             vtableMethods = ReadClassArray<uint>(header.vtableMethodsOffset, header.vtableMethodsCount / 4);
-            if (Version > 16 && Version < 27) //TODO
+            stringLiterals = ReadMetadataClassArray<Il2CppStringLiteral>(header.stringLiteralOffset, header.stringLiteralCount);
+            if (Version > 16)
             {
-                stringLiterals = ReadMetadataClassArray<Il2CppStringLiteral>(header.stringLiteralOffset, header.stringLiteralCount);
-                metadataUsageLists = ReadMetadataClassArray<Il2CppMetadataUsageList>(header.metadataUsageListsOffset, header.metadataUsageListsCount);
-                metadataUsagePairs = ReadMetadataClassArray<Il2CppMetadataUsagePair>(header.metadataUsagePairsOffset, header.metadataUsagePairsCount);
-
-                ProcessingMetadataUsage();
-
                 fieldRefs = ReadMetadataClassArray<Il2CppFieldRef>(header.fieldRefsOffset, header.fieldRefsCount);
+                if (Version < 27)
+                {
+                    metadataUsageLists = ReadMetadataClassArray<Il2CppMetadataUsageList>(header.metadataUsageListsOffset, header.metadataUsageListsCount);
+                    metadataUsagePairs = ReadMetadataClassArray<Il2CppMetadataUsagePair>(header.metadataUsagePairsOffset, header.metadataUsagePairsCount);
+
+                    ProcessingMetadataUsage();
+                }
             }
             if (Version > 20)
             {
@@ -178,10 +180,10 @@ public string GetStringLiteralFromIndex(uint index)
 
         private void ProcessingMetadataUsage()
         {
-            metadataUsageDic = new Dictionary<uint, SortedDictionary<uint, uint>>();
-            for (uint i = 1; i <= 6u; i++)
+            metadataUsageDic = new Dictionary<Il2CppMetadataUsage, SortedDictionary<uint, uint>>();
+            for (uint i = 1; i <= 6; i++)
             {
-                metadataUsageDic[i] = new SortedDictionary<uint, uint>();
+                metadataUsageDic[(Il2CppMetadataUsage)i] = new SortedDictionary<uint, uint>();
             }
             foreach (var metadataUsageList in metadataUsageLists)
             {
@@ -191,7 +193,7 @@ private void ProcessingMetadataUsage()
                     var metadataUsagePair = metadataUsagePairs[offset];
                     var usage = GetEncodedIndexType(metadataUsagePair.encodedSourceIndex);
                     var decodedIndex = GetDecodedMethodIndex(metadataUsagePair.encodedSourceIndex);
-                    metadataUsageDic[usage][metadataUsagePair.destinationIndex] = decodedIndex;
+                    metadataUsageDic[(Il2CppMetadataUsage)usage][metadataUsagePair.destinationIndex] = decodedIndex;
                 }
             }
             maxMetadataUsages = metadataUsageDic.Max(x => x.Value.Max(y => y.Key)) + 1;
diff --git a/Il2CppDumper/Il2Cpp/MetadataClass.cs b/Il2CppDumper/Il2Cpp/MetadataClass.cs
@@ -350,4 +350,15 @@ public class Il2CppRGCTXDefinition
         public Il2CppRGCTXDataType type;
         public Il2CppRGCTXDefinitionData data;
     }
+
+    public enum Il2CppMetadataUsage
+    {
+        kIl2CppMetadataUsageInvalid,
+        kIl2CppMetadataUsageTypeInfo,
+        kIl2CppMetadataUsageIl2CppType,
+        kIl2CppMetadataUsageMethodDef,
+        kIl2CppMetadataUsageFieldInfo,
+        kIl2CppMetadataUsageStringLiteral,
+        kIl2CppMetadataUsageMethodRef,
+    };
 }
diff --git a/Il2CppDumper/Outputs/ScriptJson.cs b/Il2CppDumper/Outputs/ScriptJson.cs
@@ -13,7 +13,7 @@ public class ScriptJson
         public List<ScriptString> ScriptString = new List<ScriptString>();
         public List<ScriptMetadata> ScriptMetadata = new List<ScriptMetadata>();
         public List<ScriptMetadataMethod> ScriptMetadataMethod = new List<ScriptMetadataMethod>();
-        public List<ulong> Addresses = new List<ulong>();
+        public ulong[] Addresses;
     }
 
     public class ScriptMethod
diff --git a/Il2CppDumper/Outputs/StructGenerator.cs b/Il2CppDumper/Outputs/StructGenerator.cs

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,13 @@ public bool CheckSection()`
`79`	`79`	`public override ulong MapVATR(ulong addr)`
`80`	`80`	`{`
`81`	`81`	`var phdr = programSegment.First(x => addr >= x.p_vaddr && addr <= x.p_vaddr + x.p_memsz);`
`82`		`- return addr - (phdr.p_vaddr - phdr.p_offset);`
	`82`	`+ return addr - phdr.p_vaddr + phdr.p_offset;`
	`83`	`+ }`
	`84`	`+`
	`85`	`+ public override ulong MapRTVA(ulong addr)`
	`86`	`+ {`
	`87`	`+ var phdr = programSegment.First(x => addr >= x.p_offset && addr <= x.p_offset + x.p_filesz);`
	`88`	`+ return addr - phdr.p_offset + phdr.p_vaddr;`
`83`	`89`	`}`
`84`	`90`
`85`	`91`	`public override bool Search()`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,13 @@ public bool CheckSection()`
`70`	`70`	`public override ulong MapVATR(ulong addr)`
`71`	`71`	`{`
`72`	`72`	`var phdr = programSegment.First(x => addr >= x.p_vaddr && addr <= x.p_vaddr + x.p_memsz);`
`73`		`- return addr - (phdr.p_vaddr - phdr.p_offset);`
	`73`	`+ return addr - phdr.p_vaddr + phdr.p_offset;`
	`74`	`+ }`
	`75`	`+`
	`76`	`+ public override ulong MapRTVA(ulong addr)`
	`77`	`+ {`
	`78`	`+ var phdr = programSegment.First(x => addr >= x.p_offset && addr <= x.p_offset + x.p_filesz);`
	`79`	`+ return addr - phdr.p_offset + phdr.p_vaddr;`
`74`	`80`	`}`
`75`	`81`
`76`	`82`	`public override bool Search()`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,6 @@ public Macho64(Stream stream) : base(stream)`
`50`	`50`	`section.offset = ReadUInt32();`
`51`	`51`	`Position += 12; //skip align, reloff, nreloc`
`52`	`52`	`section.flags = ReadUInt32();`
`53`		`- section.end = section.addr + section.size;`
`54`	`53`	`Position += 12; //skip reserved1, reserved2, reserved3`
`55`	`54`	`}`
`56`	`55`	`break;`
`@@ -67,14 +66,24 @@ public Macho64(Stream stream) : base(stream)`
`67`	`66`	`}`
`68`	`67`	`}`
`69`	`68`
`70`		`- public override ulong MapVATR(ulong uiAddr)`
	`69`	`+ public override ulong MapVATR(ulong addr)`
`71`	`70`	`{`
`72`		`- var section = sections.First(x => uiAddr >= x.addr && uiAddr <= x.end);`
	`71`	`+ var section = sections.First(x => addr >= x.addr && addr <= x.addr + x.size);`
`73`	`72`	`if (section.sectname == "__bss")`
`74`	`73`	`{`
`75`	`74`	`throw new Exception();`
`76`	`75`	`}`
`77`		`- return uiAddr - (section.addr - section.offset);`
	`76`	`+ return addr - section.addr + section.offset;`
	`77`	`+ }`
	`78`	`+`
	`79`	`+ public override ulong MapRTVA(ulong addr)`
	`80`	`+ {`
	`81`	`+ var section = sections.First(x => addr >= x.offset && addr <= x.offset + x.size);`
	`82`	`+ if (section.sectname == "__bss")`
	`83`	`+ {`
	`84`	`+ throw new Exception();`
	`85`	`+ }`
	`86`	`+ return addr - section.offset + section.addr;`
`78`	`87`	`}`
`79`	`88`
`80`	`89`	`public override bool Search()`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ public class MachoSection`
`12`	`12`	`public uint size;`
`13`	`13`	`public uint offset;`
`14`	`14`	`public uint flags;`
`15`		`- public uint end;`
`16`	`15`	`}`
`17`	`16`
`18`	`17`	`public class MachoSection64Bit`
`@@ -22,7 +21,6 @@ public class MachoSection64Bit`
`22`	`21`	`public ulong size;`
`23`	`22`	`public ulong offset;`
`24`	`23`	`public uint flags;`
`25`		`- public ulong end;`
`26`	`24`	`}`
`27`	`25`
`28`	`26`	`public class Fat`
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,12 @@ public override ulong MapVATR(ulong addr)`
`96`	`96`	`return addr - segment.MemoryOffset + segment.FileOffset;`
`97`	`97`	`}`
`98`	`98`
	`99`	`+ public override ulong MapRTVA(ulong addr)`
	`100`	`+ {`
	`101`	`+ var segment = segments.First(x => addr >= x.FileOffset && addr <= x.FileOffset + x.DecompressedSize);`
	`102`	`+ return addr - segment.FileOffset + segment.MemoryOffset;`
	`103`	`+ }`
	`104`	`+`
`99`	`105`	`public override bool Search()`
`100`	`106`	`{`
`101`	`107`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,17 @@ public override ulong MapVATR(ulong absAddr)`
`64`	`64`	`{`
`65`	`65`	`return 0ul;`
`66`	`66`	`}`
`67`		`- return addr - (section.VirtualAddress - section.PointerToRawData);`
	`67`	`+ return addr - section.VirtualAddress + section.PointerToRawData;`
	`68`	`+ }`
	`69`	`+`
	`70`	`+ public override ulong MapRTVA(ulong addr)`
	`71`	`+ {`
	`72`	`+ var section = sections.FirstOrDefault(x => addr >= x.PointerToRawData && addr <= x.PointerToRawData + x.SizeOfRawData);`
	`73`	`+ if (section == null)`
	`74`	`+ {`
	`75`	`+ return 0ul;`
	`76`	`+ }`
	`77`	`+ return addr - section.PointerToRawData + section.VirtualAddress + imageBase;`
`68`	`78`	`}`
`69`	`79`
`70`	`80`	`public override bool Search()`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,11 @@ public override ulong MapVATR(ulong addr)`
`14`	`14`	`return addr;`
`15`	`15`	`}`
`16`	`16`
	`17`	`+ public override ulong MapRTVA(ulong addr)`
	`18`	`+ {`
	`19`	`+ return addr;`
	`20`	`+ }`
	`21`	`+`
`17`	`22`	`public override bool PlusSearch(int methodCount, int typeDefinitionsCount, int imageCount)`
`18`	`23`	`{`
`19`	`24`	`var exec = new SearchSection`