The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-10 08:09:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Small build fix, re-add CPU check

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@313 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard 2008-08-25 20:43:37 +00:00
parent fd188ec09e
commit ab4333ebac
4 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp
View File

@ -15,8 +15,6 @@
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
#include <float.h>
#include "../../HW/Memmap.h"
#include "../../HW/CPU.h"
#include "../PPCTables.h"
@ -98,11 +96,6 @@ void SingleStepInner(void)
NPC = PC + sizeof(UGeckoInstruction);
instCode.hex = Memory::ReadFast32(PC); // Memory::ReadUnchecked_U32(PC);
//Memory::Read_Instruction(PC); // use the memory functions to read from the memory !!!!!!
//if (PowerPC::ppcState.DebugCount > 0x10f233a) { // 50721ef253a
// printf("> %08x - %08x - %s\n", PC, instCode.hex, DisassembleGekko(instCode.hex, PC));
//}
UReg_MSR& msr = (UReg_MSR&)MSR;
if (msr.FP) //If FPU is enabled, just execute
m_opTable[instCode.OPCD](instCode);

6
Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Integer.cpp
View File

@ -438,7 +438,7 @@ void addex(UGeckoInstruction _inst)
int a = m_GPR[_inst.RA];
int b = m_GPR[_inst.RB];
m_GPR[_inst.RD] = a + b + carry;
SetCarry(Helper_Carry(a,b) || (carry != 0 && Helper_Carry(a + b, carry)));
SetCarry(Helper_Carry(a, b) || (carry != 0 && Helper_Carry(a + b, carry)));
if (_inst.OE) PanicAlert("OE: addex");
if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RD]);
@ -449,7 +449,7 @@ void addmex(UGeckoInstruction _inst)
int carry = GetCarry();
int a = m_GPR[_inst.RA];
m_GPR[_inst.RD] = a + carry - 1;
SetCarry(Helper_Carry(a, carry-1));
SetCarry(Helper_Carry(a, carry - 1));
if (_inst.OE) PanicAlert("OE: addmex");
if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RD]);
@ -505,7 +505,7 @@ void mulhwx(UGeckoInstruction _inst)
{
u32 a = m_GPR[_inst.RA];
u32 b = m_GPR[_inst.RB];
u32 d = (u32)((u64)(((s64)(s32)a * (s64)(s32)b) ) >> 32); //wheeee
u32 d = (u32)((u64)(((s64)(s32)a * (s64)(s32)b) ) >> 32); // This can be done better. Not in plain C/C++ though.
m_GPR[_inst.RD] = d;
if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RD]);
}

2
Source/Core/Core/Src/PowerPC/PowerPC.cpp
View File

@ -15,9 +15,7 @@
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
#ifdef _WIN32
#include <float.h>
#endif
#include "Common.h"
#include "ChunkFile.h"

21
Source/Core/DolphinWX/src/Main.cpp
View File

@ -45,26 +45,21 @@ bool DolphinApp::OnInit()
#ifdef _WIN32
// TODO: if First Boot
/*
if (!cpu_info.bSSE2)
{
MessageBox(0, _T("Hi,\n\nDolphin requires that your CPU has support for SSE2 extensions.\n"
"Unfortunately your CPU does not support them, so Dolphin will not run.\n\n"
"Sayonara!\n"), "Dolphin", MB_ICONINFORMATION);
return false;
}*/
/*
#ifdef _M_IX86
if (cpu_info.CPU64bit && cpu_info.OS64bit)
{
MessageBox(0, _T("This is the 32-bit version of Dolphin. This computer is running a 64-bit OS.\n"
"Thus, this computer is capable of running Dolphin 64-bit, which is considerably "
"faster than Dolphin 32-bit. So, why are you running Dolphin 32-bit? :-)"), "Dolphin", MB_ICONINFORMATION);
}
// missing check
#endif
*/
#else
if (!cpu_info.bSSE2)
{
printf("%s", "Hi,\n\nDolphin requires that your CPU has support for SSE2 extensions.\n"
"Unfortunately your CPU does not support them, so Dolphin will not run.\n\n"
"Sayonara!\n");
exit(0);
}
#endif
bool UseDebugger = false;