Reformat all the things. Have fun with merge conflicts.

Source/Core/Core/HW/Memmap.h

@@ -12,12 +12,15 @@
 
 // Enable memory checks in the Debug/DebugFast builds, but NOT in release
 #if defined(_DEBUG) || defined(DEBUGFAST)
-	#define ENABLE_MEM_CHECK
+#define ENABLE_MEM_CHECK
 #endif
 
 // Global declarations
 class PointerWrap;
-namespace MMIO { class Mapping; }
+namespace MMIO
+{
+class Mapping;
+}
 
 namespace Memory
 {
@@ -40,26 +43,26 @@ extern bool bFakeVMEM;
 
 enum
 {
-	// RAM_SIZE is the amount allocated by the emulator, whereas REALRAM_SIZE is
-	// what will be reported in lowmem, and thus used by emulated software.
-	// Note: Writing to lowmem is done by IPL. If using retail IPL, it will
-	// always be set to 24MB.
-	REALRAM_SIZE  = 0x01800000,
-	RAM_SIZE      = ROUND_UP_POW2(REALRAM_SIZE),
-	RAM_MASK      = RAM_SIZE - 1,
-	FAKEVMEM_SIZE = 0x02000000,
-	FAKEVMEM_MASK = FAKEVMEM_SIZE - 1,
-	L1_CACHE_SIZE = 0x00040000,
-	L1_CACHE_MASK = L1_CACHE_SIZE - 1,
-	IO_SIZE       = 0x00010000,
-	EXRAM_SIZE    = 0x04000000,
-	EXRAM_MASK    = EXRAM_SIZE - 1,
+  // RAM_SIZE is the amount allocated by the emulator, whereas REALRAM_SIZE is
+  // what will be reported in lowmem, and thus used by emulated software.
+  // Note: Writing to lowmem is done by IPL. If using retail IPL, it will
+  // always be set to 24MB.
+  REALRAM_SIZE = 0x01800000,
+  RAM_SIZE = ROUND_UP_POW2(REALRAM_SIZE),
+  RAM_MASK = RAM_SIZE - 1,
+  FAKEVMEM_SIZE = 0x02000000,
+  FAKEVMEM_MASK = FAKEVMEM_SIZE - 1,
+  L1_CACHE_SIZE = 0x00040000,
+  L1_CACHE_MASK = L1_CACHE_SIZE - 1,
+  IO_SIZE = 0x00010000,
+  EXRAM_SIZE = 0x04000000,
+  EXRAM_MASK = EXRAM_SIZE - 1,
 
-	ADDR_MASK_HW_ACCESS = 0x0c000000,
-	ADDR_MASK_MEM1      = 0x20000000,
+  ADDR_MASK_HW_ACCESS = 0x0c000000,
+  ADDR_MASK_MEM1 = 0x20000000,
 
 #if _ARCH_32
-	MEMVIEW32_MASK  = 0x3FFFFFFF,
+  MEMVIEW32_MASK = 0x3FFFFFFF,
 #endif
 };
 
@@ -70,7 +73,7 @@ extern std::unique_ptr<MMIO::Mapping> mmio_mapping;
 bool IsInitialized();
 void Init();
 void Shutdown();
-void DoState(PointerWrap &p);
+void DoState(PointerWrap& p);
 
 void Clear();
 bool AreMemoryBreakpointsActivated();
@@ -82,7 +85,7 @@ u8* GetPointer(const u32 address);
 void CopyFromEmu(void* data, u32 address, size_t size);
 void CopyToEmu(u32 address, const void* data, size_t size);
 void Memset(u32 address, u8 value, size_t size);
-u8  Read_U8(const u32 address);
+u8 Read_U8(const u32 address);
 u16 Read_U16(const u32 address);
 u32 Read_U32(const u32 address);
 u64 Read_U64(const u32 address);
@@ -97,25 +100,24 @@ void Write_U64_Swap(const u64 var, const u32 address);
 template <typename T>
 void CopyFromEmuSwapped(T* data, u32 address, size_t size)
 {
-	const T* src = reinterpret_cast<T*>(GetPointer(address));
+  const T* src = reinterpret_cast<T*>(GetPointer(address));
 
-	if(src == nullptr)
-		return;
+  if (src == nullptr)
+    return;
 
-	for (size_t i = 0; i < size / sizeof(T); i++)
-		data[i] = Common::FromBigEndian(src[i]);
+  for (size_t i = 0; i < size / sizeof(T); i++)
+    data[i] = Common::FromBigEndian(src[i]);
 }
 
 template <typename T>
 void CopyToEmuSwapped(u32 address, const T* data, size_t size)
 {
-	T* dest = reinterpret_cast<T*>(GetPointer(address));
+  T* dest = reinterpret_cast<T*>(GetPointer(address));
 
-	if (dest == nullptr)
-		return;
+  if (dest == nullptr)
+    return;
 
-	for (size_t i = 0; i < size / sizeof(T); i++)
-		dest[i] = Common::FromBigEndian(data[i]);
+  for (size_t i = 0; i < size / sizeof(T); i++)
+    dest[i] = Common::FromBigEndian(data[i]);
 }
-
 }