diff options
| author | 2015-02-18 00:12:37 -0500 | |
|---|---|---|
| committer | 2015-02-18 00:12:37 -0500 | |
| commit | 745b42d236873522ee854aa7422f8330eaa86c0e (patch) | |
| tree | cd7be21255658b42e295b6df365c1a74cf70a3aa /src/core/hle/shared_page.cpp | |
| parent | Merge pull request #582 from lioncash/warnings (diff) | |
| parent | ConfigMem: Clean up the Config memory to be more like the shared page and moved (diff) | |
| download | yuzu-745b42d236873522ee854aa7422f8330eaa86c0e.tar.gz yuzu-745b42d236873522ee854aa7422f8330eaa86c0e.tar.xz yuzu-745b42d236873522ee854aa7422f8330eaa86c0e.zip | |
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 f0726ef09..568dad684 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" |
| @@ -13,13 +14,6 @@ | |||
| 13 | 14 | ||
| 14 | namespace SharedPage { | 15 | namespace SharedPage { |
| 15 | 16 | ||
| 16 | // helper macro to properly align structure members. | ||
| 17 | // Calling INSERT_PADDING_BYTES will add a new member variable with a name like "pad121", | ||
| 18 | // depending on the current source line to make sure variable names are unique. | ||
| 19 | #define INSERT_PADDING_BYTES_HELPER1(x, y) x ## y | ||
| 20 | #define INSERT_PADDING_BYTES_HELPER2(x, y) INSERT_PADDING_BYTES_HELPER1(x, y) | ||
| 21 | #define INSERT_PADDING_BYTES(num_words) u8 INSERT_PADDING_BYTES_HELPER2(pad, __LINE__)[(num_words)] | ||
| 22 | |||
| 23 | // see http://3dbrew.org/wiki/Configuration_Memory#Shared_Memory_Page_For_ARM11_Processes | 17 | // see http://3dbrew.org/wiki/Configuration_Memory#Shared_Memory_Page_For_ARM11_Processes |
| 24 | 18 | ||
| 25 | #pragma pack(1) | 19 | #pragma pack(1) |