diff options
| author | 2015-02-12 20:57:02 -0800 | |
|---|---|---|
| committer | 2015-02-16 15:12:05 -0800 | |
| commit | c3c309f33dacf877f4d7d5308d2036a89f8f9387 (patch) | |
| tree | a2f7d884935508052438eb312e0c8771f1e30732 /src/core/hle/shared_page.cpp | |
| parent | Merge pull request #569 from lioncash/modeswitch (diff) | |
| download | yuzu-c3c309f33dacf877f4d7d5308d2036a89f8f9387.tar.gz yuzu-c3c309f33dacf877f4d7d5308d2036a89f8f9387.tar.xz yuzu-c3c309f33dacf877f4d7d5308d2036a89f8f9387.zip | |
ConfigMem: Clean up the Config memory to be more like the shared page and moved
the helper macro for padding to common_funcs.h
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 f5f2a6858..bc625416b 100644 --- a/src/core/hle/shared_page.cpp +++ b/src/core/hle/shared_page.cpp | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include "common/common_types.h" | 5 | #include "common/common_types.h" |
| 6 | #include "common/common_funcs.h" | ||
| 6 | 7 | ||
| 7 | #include "core/core.h" | 8 | #include "core/core.h" |
| 8 | #include "core/mem_map.h" | 9 | #include "core/mem_map.h" |
| @@ -12,13 +13,6 @@ | |||
| 12 | 13 | ||
| 13 | namespace SharedPage { | 14 | namespace SharedPage { |
| 14 | 15 | ||
| 15 | // helper macro to properly align structure members. | ||
| 16 | // Calling INSERT_PADDING_BYTES will add a new member variable with a name like "pad121", | ||
| 17 | // depending on the current source line to make sure variable names are unique. | ||
| 18 | #define INSERT_PADDING_BYTES_HELPER1(x, y) x ## y | ||
| 19 | #define INSERT_PADDING_BYTES_HELPER2(x, y) INSERT_PADDING_BYTES_HELPER1(x, y) | ||
| 20 | #define INSERT_PADDING_BYTES(num_words) u8 INSERT_PADDING_BYTES_HELPER2(pad, __LINE__)[(num_words)] | ||
| 21 | |||
| 22 | // see http://3dbrew.org/wiki/Configuration_Memory#Shared_Memory_Page_For_ARM11_Processes | 16 | // see http://3dbrew.org/wiki/Configuration_Memory#Shared_Memory_Page_For_ARM11_Processes |
| 23 | 17 | ||
| 24 | #pragma pack(1) | 18 | #pragma pack(1) |