ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FifoFileStruct: replace unions with explicit padding

This commit is contained in:
Michael Maltese 2017-04-25 17:29:49 -07:00
parent 4d52df150b
commit f9a67fbf6f
1 changed files with 28 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Core/Core/FifoPlayer/FifoFileStruct.h
View File

@ -15,11 +15,9 @@ enum
MIN_LOADER_VERSION = 1, MIN_LOADER_VERSION = 1,
}; };
#pragma pack(push, 4) #pragma pack(push, 1)
union FileHeader struct FileHeader
{
struct
{ {
u32 fileId; u32 fileId;
u32 file_version; u32 file_version;
@ -37,13 +35,10 @@ union FileHeader
u32 flags; u32 flags;
u64 texMemOffset; u64 texMemOffset;
u32 texMemSize; u32 texMemSize;
}; u8 reserved[40];
u32 rawData[32];
}; };
union FileFrameInfo struct FileFrameInfo
{
struct
{ {
u64 fifoDataOffset; u64 fifoDataOffset;
u32 fifoDataSize; u32 fifoDataSize;
@ -51,8 +46,7 @@ union FileFrameInfo
u32 fifoEnd; u32 fifoEnd;
u64 memoryUpdatesOffset; u64 memoryUpdatesOffset;
u32 numMemoryUpdates; u32 numMemoryUpdates;
}; u8 reserved[32];
u32 rawData[16];
}; };
struct FileMemoryUpdate struct FileMemoryUpdate
@ -62,6 +56,7 @@ struct FileMemoryUpdate
u64 dataOffset; u64 dataOffset;
u32 dataSize; u32 dataSize;
u8 type; u8 type;
u8 reserved[3];
}; };
#pragma pack(pop) #pragma pack(pop)