chizui/Il2CppInspectorRedux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

C++: Fix incorrect field alignment for 2/4/8-byte simple types

Browse Source
This commit is contained in:
Katy Coe
2020-08-13 03:41:49 +02:00
parent ef853b6fd2
commit 0c998de844
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Il2CppInspector.Common/Cpp/CppType.cs
View File

@@ -250,6 +250,13 @@ namespace Il2CppInspector.Cpp
if (field.BitfieldSize == 0 && field.Offset % 8 != 0) if (field.BitfieldSize == 0 && field.Offset % 8 != 0)
field.Offset = (field.Offset / 8) * 8 + 8; field.Offset = (field.Offset / 8) * 8 + 8;
// A struct or union must be aligned on a word boundary for the architecture bit width
//if (field.Type is CppComplexType &&
// A 2, 4 or 8-byte value etc. must be aligned on an equivalent boundary
if (!(field.Type is CppComplexType) && field.OffsetBytes % field.SizeBytes != 0)
field.Offset += (field.SizeBytes - field.OffsetBytes % field.SizeBytes) * 8;
// Respect alignment directives // Respect alignment directives
if (alignmentBytes > 0 && field.OffsetBytes % alignmentBytes != 0) if (alignmentBytes > 0 && field.OffsetBytes % alignmentBytes != 0)
field.Offset += (alignmentBytes - field.OffsetBytes % alignmentBytes) * 8; field.Offset += (alignmentBytes - field.OffsetBytes % alignmentBytes) * 8;