From c3c309f33dacf877f4d7d5308d2036a89f8f9387 Mon Sep 17 00:00:00 2001 From: purpasmart96 Date: Thu, 12 Feb 2015 20:57:02 -0800 Subject: ConfigMem: Clean up the Config memory to be more like the shared page and moved the helper macro for padding to common_funcs.h --- src/core/hle/shared_page.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/core/hle/shared_page.cpp') diff --git a/src/core/hle/shared_page.cpp b/src/core/hle/shared_page.cpp index f5f2a685..bc625416 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" @@ -12,13 +13,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) -- cgit v1.2.3