diff options
| author | 2018-03-22 16:46:33 +0100 | |
|---|---|---|
| committer | 2018-03-22 21:25:06 +0100 | |
| commit | 8afdbf6a1fb933d44e0e4d04cc014d0fcd0c8b14 (patch) | |
| tree | bd7283504909f451ab1a879dbc1f3b87008b2318 /src/core/memory.cpp | |
| parent | Merge pull request #261 from mailwl/spl (diff) | |
| download | yuzu-8afdbf6a1fb933d44e0e4d04cc014d0fcd0c8b14.tar.gz yuzu-8afdbf6a1fb933d44e0e4d04cc014d0fcd0c8b14.tar.xz yuzu-8afdbf6a1fb933d44e0e4d04cc014d0fcd0c8b14.zip | |
Remove more N3DS References
Diffstat (limited to 'src/core/memory.cpp')
| -rw-r--r-- | src/core/memory.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp index 4e34d8334..a9beccb95 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | namespace Memory { | 23 | namespace Memory { |
| 24 | 24 | ||
| 25 | static std::array<u8, Memory::VRAM_SIZE> vram; | 25 | static std::array<u8, Memory::VRAM_SIZE> vram; |
| 26 | static std::array<u8, Memory::N3DS_EXTRA_RAM_SIZE> n3ds_extra_ram; | ||
| 27 | 26 | ||
| 28 | static PageTable* current_page_table = nullptr; | 27 | static PageTable* current_page_table = nullptr; |
| 29 | 28 | ||
| @@ -244,7 +243,6 @@ u8* GetPhysicalPointer(PAddr address) { | |||
| 244 | {IO_AREA_PADDR, IO_AREA_SIZE}, | 243 | {IO_AREA_PADDR, IO_AREA_SIZE}, |
| 245 | {DSP_RAM_PADDR, DSP_RAM_SIZE}, | 244 | {DSP_RAM_PADDR, DSP_RAM_SIZE}, |
| 246 | {FCRAM_PADDR, FCRAM_N3DS_SIZE}, | 245 | {FCRAM_PADDR, FCRAM_N3DS_SIZE}, |
| 247 | {N3DS_EXTRA_RAM_PADDR, N3DS_EXTRA_RAM_SIZE}, | ||
| 248 | }; | 246 | }; |
| 249 | 247 | ||
| 250 | const auto area = | 248 | const auto area = |
| @@ -283,9 +281,6 @@ u8* GetPhysicalPointer(PAddr address) { | |||
| 283 | } | 281 | } |
| 284 | ASSERT_MSG(target_pointer != nullptr, "Invalid FCRAM address"); | 282 | ASSERT_MSG(target_pointer != nullptr, "Invalid FCRAM address"); |
| 285 | break; | 283 | break; |
| 286 | case N3DS_EXTRA_RAM_PADDR: | ||
| 287 | target_pointer = n3ds_extra_ram.data() + offset_into_region; | ||
| 288 | break; | ||
| 289 | default: | 284 | default: |
| 290 | UNREACHABLE(); | 285 | UNREACHABLE(); |
| 291 | } | 286 | } |
| @@ -609,8 +604,6 @@ boost::optional<PAddr> TryVirtualToPhysicalAddress(const VAddr addr) { | |||
| 609 | return addr - DSP_RAM_VADDR + DSP_RAM_PADDR; | 604 | return addr - DSP_RAM_VADDR + DSP_RAM_PADDR; |
| 610 | } else if (addr >= IO_AREA_VADDR && addr < IO_AREA_VADDR_END) { | 605 | } else if (addr >= IO_AREA_VADDR && addr < IO_AREA_VADDR_END) { |
| 611 | return addr - IO_AREA_VADDR + IO_AREA_PADDR; | 606 | return addr - IO_AREA_VADDR + IO_AREA_PADDR; |
| 612 | } else if (addr >= N3DS_EXTRA_RAM_VADDR && addr < N3DS_EXTRA_RAM_VADDR_END) { | ||
| 613 | return addr - N3DS_EXTRA_RAM_VADDR + N3DS_EXTRA_RAM_PADDR; | ||
| 614 | } | 607 | } |
| 615 | 608 | ||
| 616 | return boost::none; | 609 | return boost::none; |
| @@ -637,8 +630,6 @@ boost::optional<VAddr> PhysicalToVirtualAddress(const PAddr addr) { | |||
| 637 | return addr - DSP_RAM_PADDR + DSP_RAM_VADDR; | 630 | return addr - DSP_RAM_PADDR + DSP_RAM_VADDR; |
| 638 | } else if (addr >= IO_AREA_PADDR && addr < IO_AREA_PADDR_END) { | 631 | } else if (addr >= IO_AREA_PADDR && addr < IO_AREA_PADDR_END) { |
| 639 | return addr - IO_AREA_PADDR + IO_AREA_VADDR; | 632 | return addr - IO_AREA_PADDR + IO_AREA_VADDR; |
| 640 | } else if (addr >= N3DS_EXTRA_RAM_PADDR && addr < N3DS_EXTRA_RAM_PADDR_END) { | ||
| 641 | return addr - N3DS_EXTRA_RAM_PADDR + N3DS_EXTRA_RAM_VADDR; | ||
| 642 | } | 633 | } |
| 643 | 634 | ||
| 644 | return boost::none; | 635 | return boost::none; |