diff options
| author |  bunnei <bunneidev@gmail.com> | 2015-02-18 00:12:37 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-02-18 00:12:37 -0500 |
| commit | 745b42d236873522ee854aa7422f8330eaa86c0e (patch) | |
| tree | cd7be21255658b42e295b6df365c1a74cf70a3aa /src/core/hle/shared_page.cpp | |
| parent | 8e731b129d02937813a2d725994ab56b5654a62a (diff) | |
| parent | c3c309f33dacf877f4d7d5308d2036a89f8f9387 (diff) | |
Merge pull request #570 from purpasmart96/config_mem
ConfigMem: Clean up the Config memory to be more like the shared page
Diffstat (limited to 'src/core/hle/shared_page.cpp')
| -rw-r--r-- | src/core/hle/shared_page.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/core/hle/shared_page.cpp b/src/core/hle/shared_page.cpp index f0726ef0..568dad68 100644 --- a/src/core/hle/shared_page.cpp +++ b/src/core/hle/shared_page.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include "common/common_types.h" +#include "common/common_funcs.h" #include "core/core.h" #include "core/mem_map.h" @@ -13,13 +14,6 @@ namespace SharedPage { -// helper macro to properly align structure members. -// Calling INSERT_PADDING_BYTES will add a new member variable with a name like "pad121", -// depending on the current source line to make sure variable names are unique. -#define INSERT_PADDING_BYTES_HELPER1(x, y) x ## y -#define INSERT_PADDING_BYTES_HELPER2(x, y) INSERT_PADDING_BYTES_HELPER1(x, y) -#define INSERT_PADDING_BYTES(num_words) u8 INSERT_PADDING_BYTES_HELPER2(pad, __LINE__)[(num_words)] - // see http://3dbrew.org/wiki/Configuration_Memory#Shared_Memory_Page_For_ARM11_Processes #pragma pack(1) |