Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Memmap: Fix switch fallthroughs #2012

Merged
merged 1 commit into from Feb 6, 2015
Merged

Memmap: Fix switch fallthroughs #2012

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions Source/Core/Core/HW/Memmap.cpp
View file
Open in desktop
Expand Up @@ -278,6 +278,7 @@ u8* GetPointer(const u32 address)
case 0xcc:
case 0xcd:
_dbg_assert_msg_(MEMMAP, 0, "GetPointer from IO Bridge doesnt work");
break;
case 0xc8:
// EFB. We don't want to return a pointer here since we have no memory mapped for it.
break;
Expand All @@ -286,6 +287,7 @@ u8* GetPointer(const u32 address)
if ((address & 0xfffffff) < REALRAM_SIZE)
return m_pRAM + (address & RAM_MASK);
}
break;

case 0x1:
case 0x9:
Expand All @@ -295,8 +297,7 @@ u8* GetPointer(const u32 address)
if ((address & 0xfffffff) < EXRAM_SIZE)
return m_pEXRAM + (address & EXRAM_MASK);
}
else
break;
break;

case 0xe:
if (address < (0xE0000000 + L1_CACHE_SIZE))
Expand All @@ -307,6 +308,7 @@ u8* GetPointer(const u32 address)
default:
if (bFakeVMEM)
return m_pFakeVMEM + (address & FAKEVMEM_MASK);
break;

This comment was marked as off-topic.

Sign in to view

}

ERROR_LOG(MEMMAP, "Unknown Pointer %#8x PC %#8x LR %#8x", address, PC, LR);
Expand Down