From 23bad5d398c9f3ce8e15fd67e1cb7ffa69779ed7 Mon Sep 17 00:00:00 2001 From: Weiyi Wang Date: Sat, 1 Dec 2018 18:39:30 -0500 Subject: [PATCH] fix clang-format --- src/core/hle/kernel/shared_memory.cpp | 4 ++-- src/core/memory.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp index 91f82c45e..3e1e6d9f5 100644 --- a/src/core/hle/kernel/shared_memory.cpp +++ b/src/core/hle/kernel/shared_memory.cpp @@ -87,8 +87,8 @@ SharedPtr KernelSystem::CreateSharedMemoryForApplet( for (const auto& interval : backing_blocks) { shared_memory->backing_blocks.push_back( {memory.GetFCRAMPointer(interval.lower()), interval.upper() - interval.lower()}); - std::fill(memory.GetFCRAMPointer(interval.lower()), memory.GetFCRAMPointer(interval.upper()), - 0); + std::fill(memory.GetFCRAMPointer(interval.lower()), + memory.GetFCRAMPointer(interval.upper()), 0); } shared_memory->base_address = Memory::HEAP_VADDR + offset; diff --git a/src/core/memory.cpp b/src/core/memory.cpp index d94bd0381..396a00e39 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -29,7 +29,8 @@ public: std::fill(n3ds_extra_ram.get(), n3ds_extra_ram.get() + Memory::N3DS_EXTRA_RAM_SIZE, 0); } - // Visual Studio would try to allocate these on compile time if they are std::array, which would exceed the memory limit. + // Visual Studio would try to allocate these on compile time if they are std::array, which would + // exceed the memory limit. std::unique_ptr fcram = std::make_unique(Memory::FCRAM_N3DS_SIZE); std::unique_ptr vram = std::make_unique(Memory::VRAM_SIZE); std::unique_ptr n3ds_extra_ram = std::make_unique(Memory::N3DS_EXTRA_RAM_SIZE); @@ -223,7 +224,8 @@ u8* MemorySystem::GetPointer(const VAddr vaddr) { return page_pointer + (vaddr & PAGE_MASK); } - if (impl->current_page_table->attributes[vaddr >> PAGE_BITS] == PageType::RasterizerCachedMemory) { + if (impl->current_page_table->attributes[vaddr >> PAGE_BITS] == + PageType::RasterizerCachedMemory) { return GetPointerForRasterizerCache(vaddr); }