piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-30 09:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix recent D3D plugin issue. Fix bug in debugger *<:-)

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@198 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard
2008-08-14 19:57:46 +00:00
parent 6d887ea18a
commit 870194db21
6 changed files with 81 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp
View File

@ -83,8 +83,8 @@ namespace Jit64
if (!Core::GetStartupParameter().bUseDualCore &&
inst.OPCD == 32 &&
(inst.hex & 0xFFFF0000) == 0x800D0000 &&
Memory::ReadUnchecked_U32(js.compilerPC+4) == 0x28000000 &&
Memory::ReadUnchecked_U32(js.compilerPC+8) == 0x4182fff8)
Memory::ReadUnchecked_U32(js.compilerPC + 4) == 0x28000000 &&
Memory::ReadUnchecked_U32(js.compilerPC + 8) == 0x4182fff8)
{
gpr.Flush(FLUSH_ALL);
fpr.Flush(FLUSH_ALL);
@ -209,6 +209,8 @@ namespace Jit64
if (gpr.R(a).IsImm() && !update)
{
// If we already know the address through constant folding, we can do some
// fun tricks...
u32 addr = (u32)gpr.R(a).offset;
addr += offset;
if ((addr & 0xFFFFF000) == 0xCC008000 && jo.optimizeGatherPipe)
@ -219,6 +221,7 @@ namespace Jit64
switch (accessSize)
{
// No need to protect these, they don't touch any state
// question - should we inline them instead? Pro: Lose a CALL Con: Code bloat
case 8: CALL((void *)Asm::fifoDirectWrite8); break;
case 16: CALL((void *)Asm::fifoDirectWrite16); break;
case 32: CALL((void *)Asm::fifoDirectWrite32); break;
@ -240,7 +243,7 @@ namespace Jit64
}
// Optimized stack access?
if (accessSize == 32 && !gpr.R(a).IsImm() && a == 1 && js.st.isFirstBlockOfFunction && jo.optimizeStack) //Zelda does not like this
if (accessSize == 32 && !gpr.R(a).IsImm() && a == 1 && js.st.isFirstBlockOfFunction && jo.optimizeStack)
{
gpr.FlushLockX(ABI_PARAM1);
MOV(32, R(ABI_PARAM1), gpr.R(a));
@ -272,14 +275,7 @@ namespace Jit64
}
TEST(32, R(ABI_PARAM2), Imm32(0x0C000000));
FixupBranch unsafe_addr = J_CC(CC_NZ);
if (accessSize == 32)
BSWAP(32, ABI_PARAM1);
else if (accessSize == 16)
{
// TODO(ector): xchg ch, cl?
BSWAP(32, ABI_PARAM1);
SHR(32, R(ABI_PARAM1), Imm8(16));
}
BSWAP(accessSize, ABI_PARAM1);
#ifdef _M_X64
MOV(accessSize, MComplex(RBX, ABI_PARAM2, SCALE_1, 0), R(ABI_PARAM1));
#else

4
Source/Core/DebuggerWX/src/CodeWindow.cpp
View File

@ -420,8 +420,6 @@ void CCodeWindow::Update()
UpdateButtonStates();
codeview->Center(PC);
Host_UpdateLogDisplay();
}
@ -676,7 +674,7 @@ void CCodeWindow::PopulateToolbar(wxToolBar* toolBar)
toolBar->AddTool(IDM_STEPOVER, _T("Step Over"), m_Bitmaps[Toolbar_StepOver]);
toolBar->AddTool(IDM_SKIP, _T("Skip"), m_Bitmaps[Toolbar_Skip]);
toolBar->AddSeparator();
toolBar->AddTool(IDM_GOTOPC, _T("Goto PC"), m_Bitmaps[Toolbar_GotoPC]);
toolBar->AddTool(IDM_GOTOPC, _T("Show PC"), m_Bitmaps[Toolbar_GotoPC]);
toolBar->AddTool(IDM_SETPC, _T("Set PC"), m_Bitmaps[Toolbar_SetPC]);
toolBar->AddSeparator();
toolBar->AddControl(new wxTextCtrl(toolBar, IDM_ADDRBOX, _T("")));

2
Source/Core/DolphinWX/src/Frame.cpp
View File

@ -368,6 +368,8 @@ CFrame::InitBitmaps()
void
CFrame::OnOpen(wxCommandEvent& WXUNUSED (event))
{
if (Core::GetState() != Core::CORE_UNINITIALIZED)
return;
wxString path = wxFileSelector(
_T("Select the file to load"),
wxEmptyString, wxEmptyString, wxEmptyString,