Merge pull request #2086 from linkmauve/clang-format

Add clang-format as part of our {commit,travis}-time checks

1 files changed, 35 insertions, 36 deletions

diff --git a/src/core/memory.h b/src/core/memory.h
index cad845385..8fd3080ff 100644
--- a/src/core/memory.h
+++ b/src/core/memory.h
@@ -6,7 +6,6 @@
 
 #include <cstddef>
 #include <string>
-
 #include "common/common_types.h"
 
 namespace Memory {
@@ -22,92 +21,93 @@ const int PAGE_BITS = 12;
 /// Physical memory regions as seen from the ARM11
 enum : PAddr {
     /// IO register area
-    IO_AREA_PADDR     = 0x10100000,
-    IO_AREA_SIZE      = 0x01000000, ///< IO area size (16MB)
+    IO_AREA_PADDR = 0x10100000,
+    IO_AREA_SIZE = 0x01000000, ///< IO area size (16MB)
     IO_AREA_PADDR_END = IO_AREA_PADDR + IO_AREA_SIZE,
 
     /// MPCore internal memory region
-    MPCORE_RAM_PADDR     = 0x17E00000,
-    MPCORE_RAM_SIZE      = 0x00002000, ///< MPCore internal memory size (8KB)
+    MPCORE_RAM_PADDR = 0x17E00000,
+    MPCORE_RAM_SIZE = 0x00002000, ///< MPCore internal memory size (8KB)
     MPCORE_RAM_PADDR_END = MPCORE_RAM_PADDR + MPCORE_RAM_SIZE,
 
     /// Video memory
-    VRAM_PADDR     = 0x18000000,
-    VRAM_SIZE      = 0x00600000, ///< VRAM size (6MB)
+    VRAM_PADDR = 0x18000000,
+    VRAM_SIZE = 0x00600000, ///< VRAM size (6MB)
     VRAM_PADDR_END = VRAM_PADDR + VRAM_SIZE,
 
     /// DSP memory
-    DSP_RAM_PADDR     = 0x1FF00000,
-    DSP_RAM_SIZE      = 0x00080000, ///< DSP memory size (512KB)
+    DSP_RAM_PADDR = 0x1FF00000,
+    DSP_RAM_SIZE = 0x00080000, ///< DSP memory size (512KB)
     DSP_RAM_PADDR_END = DSP_RAM_PADDR + DSP_RAM_SIZE,
 
     /// AXI WRAM
-    AXI_WRAM_PADDR     = 0x1FF80000,
-    AXI_WRAM_SIZE      = 0x00080000, ///< AXI WRAM size (512KB)
+    AXI_WRAM_PADDR = 0x1FF80000,
+    AXI_WRAM_SIZE = 0x00080000, ///< AXI WRAM size (512KB)
     AXI_WRAM_PADDR_END = AXI_WRAM_PADDR + AXI_WRAM_SIZE,
 
     /// Main FCRAM
-    FCRAM_PADDR     = 0x20000000,
-    FCRAM_SIZE      = 0x08000000, ///< FCRAM size (128MB)
+    FCRAM_PADDR = 0x20000000,
+    FCRAM_SIZE = 0x08000000, ///< FCRAM size (128MB)
     FCRAM_PADDR_END = FCRAM_PADDR + FCRAM_SIZE,
 };
 
 /// Virtual user-space memory regions
 enum : VAddr {
     /// Where the application text, data and bss reside.
-    PROCESS_IMAGE_VADDR     = 0x00100000,
-    PROCESS_IMAGE_MAX_SIZE  = 0x03F00000,
+    PROCESS_IMAGE_VADDR = 0x00100000,
+    PROCESS_IMAGE_MAX_SIZE = 0x03F00000,
     PROCESS_IMAGE_VADDR_END = PROCESS_IMAGE_VADDR + PROCESS_IMAGE_MAX_SIZE,
 
     /// Area where IPC buffers are mapped onto.
-    IPC_MAPPING_VADDR     = 0x04000000,
-    IPC_MAPPING_SIZE      = 0x04000000,
+    IPC_MAPPING_VADDR = 0x04000000,
+    IPC_MAPPING_SIZE = 0x04000000,
     IPC_MAPPING_VADDR_END = IPC_MAPPING_VADDR + IPC_MAPPING_SIZE,
 
     /// Application heap (includes stack).
-    HEAP_VADDR     = 0x08000000,
-    HEAP_SIZE      = 0x08000000,
+    HEAP_VADDR = 0x08000000,
+    HEAP_SIZE = 0x08000000,
     HEAP_VADDR_END = HEAP_VADDR + HEAP_SIZE,
 
     /// Area where shared memory buffers are mapped onto.
-    SHARED_MEMORY_VADDR     = 0x10000000,
-    SHARED_MEMORY_SIZE      = 0x04000000,
+    SHARED_MEMORY_VADDR = 0x10000000,
+    SHARED_MEMORY_SIZE = 0x04000000,
     SHARED_MEMORY_VADDR_END = SHARED_MEMORY_VADDR + SHARED_MEMORY_SIZE,
 
-    /// Maps 1:1 to an offset in FCRAM. Used for HW allocations that need to be linear in physical memory.
-    LINEAR_HEAP_VADDR     = 0x14000000,
-    LINEAR_HEAP_SIZE      = 0x08000000,
+    /// Maps 1:1 to an offset in FCRAM. Used for HW allocations that need to be linear in physical
+    /// memory.
+    LINEAR_HEAP_VADDR = 0x14000000,
+    LINEAR_HEAP_SIZE = 0x08000000,
     LINEAR_HEAP_VADDR_END = LINEAR_HEAP_VADDR + LINEAR_HEAP_SIZE,
 
     /// Maps 1:1 to the IO register area.
-    IO_AREA_VADDR     = 0x1EC00000,
+    IO_AREA_VADDR = 0x1EC00000,
     IO_AREA_VADDR_END = IO_AREA_VADDR + IO_AREA_SIZE,
 
     /// Maps 1:1 to VRAM.
-    VRAM_VADDR     = 0x1F000000,
+    VRAM_VADDR = 0x1F000000,
     VRAM_VADDR_END = VRAM_VADDR + VRAM_SIZE,
 
     /// Maps 1:1 to DSP memory.
-    DSP_RAM_VADDR     = 0x1FF00000,
+    DSP_RAM_VADDR = 0x1FF00000,
     DSP_RAM_VADDR_END = DSP_RAM_VADDR + DSP_RAM_SIZE,
 
     /// Read-only page containing kernel and system configuration values.
-    CONFIG_MEMORY_VADDR     = 0x1FF80000,
-    CONFIG_MEMORY_SIZE      = 0x00001000,
+    CONFIG_MEMORY_VADDR = 0x1FF80000,
+    CONFIG_MEMORY_SIZE = 0x00001000,
     CONFIG_MEMORY_VADDR_END = CONFIG_MEMORY_VADDR + CONFIG_MEMORY_SIZE,
 
     /// Usually read-only page containing mostly values read from hardware.
-    SHARED_PAGE_VADDR     = 0x1FF81000,
-    SHARED_PAGE_SIZE      = 0x00001000,
+    SHARED_PAGE_VADDR = 0x1FF81000,
+    SHARED_PAGE_SIZE = 0x00001000,
     SHARED_PAGE_VADDR_END = SHARED_PAGE_VADDR + SHARED_PAGE_SIZE,
 
     /// Area where TLS (Thread-Local Storage) buffers are allocated.
-    TLS_AREA_VADDR     = 0x1FF82000,
-    TLS_ENTRY_SIZE     = 0x200,
+    TLS_AREA_VADDR = 0x1FF82000,
+    TLS_ENTRY_SIZE = 0x200,
 
     /// Equivalent to LINEAR_HEAP_VADDR, but expanded to cover the extra memory in the New 3DS.
-    NEW_LINEAR_HEAP_VADDR     = 0x30000000,
-    NEW_LINEAR_HEAP_SIZE      = 0x10000000,
+    NEW_LINEAR_HEAP_VADDR = 0x30000000,
+    NEW_LINEAR_HEAP_SIZE = 0x10000000,
     NEW_LINEAR_HEAP_VADDR_END = NEW_LINEAR_HEAP_VADDR + NEW_LINEAR_HEAP_SIZE,
 };
 
@@ -166,5 +166,4 @@ void RasterizerFlushRegion(PAddr start, u32 size);
  * Flushes and invalidates any externally cached rasterizer resources touching the given region.
  */
 void RasterizerFlushAndInvalidateRegion(PAddr start, u32 size);
-
 }