From 655bc23322d5c5e80532568f14f2d4b0583612db Mon Sep 17 00:00:00 2001 From: hrydgard Date: Fri, 3 Oct 2008 17:22:35 +0000 Subject: [PATCH] fix some comments, some files with mixed line endings, some warnings. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@757 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Core/Src/CoreTiming.cpp | 2 +- .../Interpreter/Interpreter_LoadStore.cpp | 2 +- .../Interpreter_SystemRegisters.cpp | 10 ++++++ Source/Core/Core/Src/PowerPC/PPCTables.cpp | 35 ++++++++++--------- Source/Core/Core/Src/PowerPC/PPCTables.h | 1 + Source/Core/Core/Src/PowerPC/PowerPC.h | 7 ---- Source/Core/Core/Src/State.cpp | 2 +- .../Plugin_PadSimple/Src/PadSimple.cpp | 1 + .../Plugin_VideoDX9/Src/OpcodeDecoding.cpp | 6 ++-- .../Plugin_VideoOGL/Src/DataReader.cpp | 8 ++--- .../Plugins/Plugin_VideoOGL/Src/DataReader.h | 6 ++-- .../Plugin_VideoOGL/Src/VertexLoader.cpp | 2 +- 12 files changed, 45 insertions(+), 37 deletions(-) diff --git a/Source/Core/Core/Src/CoreTiming.cpp b/Source/Core/Core/Src/CoreTiming.cpp index 5c73e92c62..7c79751197 100644 --- a/Source/Core/Core/Src/CoreTiming.cpp +++ b/Source/Core/Core/Src/CoreTiming.cpp @@ -344,7 +344,7 @@ void LogPendingEvents() { Event *ptr = first; while (ptr) - { + { LOG(GEKKO, "PENDING: Now: %lld Pending: %lld Type: %d", globalTimer, ptr->time, ptr->type); ptr = ptr->next; } diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp index bba0762952..80056f65d2 100644 --- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp @@ -308,7 +308,7 @@ void dcbz(UGeckoInstruction _inst) // HACK but works... we think Memory::Memset(Helper_Get_EA_X(_inst) & (~31), 0, 32); } - + void eciwx(UGeckoInstruction _inst) { _assert_msg_(GEKKO,0,"eciwx - Not implemented"); diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp index 009ddc9b0c..9fee923856 100644 --- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp +++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp @@ -382,6 +382,16 @@ void mtspr(UGeckoInstruction _inst) GPFifo::ResetGatherPipe(); break; + case SPR_GQR0: + case SPR_GQR0 + 1: + case SPR_GQR0 + 2: + case SPR_GQR0 + 3: + case SPR_GQR0 + 4: + case SPR_GQR0 + 5: + case SPR_GQR0 + 6: + case SPR_GQR0 + 7: + break; + case SPR_DMAL: // Locked cache<->Memory DMA // Total fake, we ignore that DMAs take time. diff --git a/Source/Core/Core/Src/PowerPC/PPCTables.cpp b/Source/Core/Core/Src/PowerPC/PPCTables.cpp index 608aca1b32..55e4856345 100644 --- a/Source/Core/Core/Src/PowerPC/PPCTables.cpp +++ b/Source/Core/Core/Src/PowerPC/PPCTables.cpp @@ -170,11 +170,6 @@ GekkoOPTemplate primarytable[] = {42, Interpreter::lha, Jit64::lha, {"lha", OPTYPE_LOAD, 0}}, {43, Interpreter::lhau, Jit64::Default, {"lhau", OPTYPE_LOAD, 0}}, - {48, Interpreter::lfs, Jit64::lfs, {"lfs", OPTYPE_LOADFP, 0}}, - {49, Interpreter::lfsu, Jit64::Default, {"lfsu", OPTYPE_LOADFP, 0}}, - {50, Interpreter::lfd, Jit64::lfd, {"lfd", OPTYPE_LOADFP, 0}}, - {51, Interpreter::lfdu, Jit64::Default, {"lfdu", OPTYPE_LOADFP, 0}}, - {44, Interpreter::sth, Jit64::stX, {"sth", OPTYPE_STORE, 0}}, {45, Interpreter::sthu, Jit64::stX, {"sthu", OPTYPE_STORE, 0}}, {36, Interpreter::stw, Jit64::stX, {"stw", OPTYPE_STORE, 0}}, @@ -182,14 +177,19 @@ GekkoOPTemplate primarytable[] = {38, Interpreter::stb, Jit64::stX, {"stb", OPTYPE_STORE, 0}}, {39, Interpreter::stbu, Jit64::stX, {"stbu", OPTYPE_STORE, 0}}, + {46, Interpreter::lmw, Jit64::lmw, {"lmw", OPTYPE_SYSTEM, 0, 10}}, + {47, Interpreter::stmw, Jit64::stmw, {"stmw", OPTYPE_SYSTEM, 0, 10}}, + + {48, Interpreter::lfs, Jit64::lfs, {"lfs", OPTYPE_LOADFP, 0}}, + {49, Interpreter::lfsu, Jit64::Default, {"lfsu", OPTYPE_LOADFP, 0}}, + {50, Interpreter::lfd, Jit64::lfd, {"lfd", OPTYPE_LOADFP, 0}}, + {51, Interpreter::lfdu, Jit64::Default, {"lfdu", OPTYPE_LOADFP, 0}}, + {52, Interpreter::stfs, Jit64::stfs, {"stfs", OPTYPE_STOREFP, 0}}, {53, Interpreter::stfsu, Jit64::stfs, {"stfsu", OPTYPE_STOREFP, 0}}, {54, Interpreter::stfd, Jit64::stfd, {"stfd", OPTYPE_STOREFP, 0}}, {55, Interpreter::stfdu, Jit64::Default, {"stfdu", OPTYPE_STOREFP, 0}}, - {46, Interpreter::lmw, Jit64::lmw, {"lmw", OPTYPE_SYSTEM, 0, 10}}, - {47, Interpreter::stmw, Jit64::stmw, {"stmw", OPTYPE_SYSTEM, 0, 10}}, - {56, Interpreter::psq_l, Jit64::psq_l, {"psq_l", OPTYPE_PS, 0}}, {57, Interpreter::psq_lu, Jit64::psq_l, {"psq_lu", OPTYPE_PS, 0}}, {60, Interpreter::psq_st, Jit64::psq_st, {"psq_st", OPTYPE_PS, 0}}, @@ -328,11 +328,6 @@ GekkoOPTemplate table31[] = {533, Interpreter::lswx, Jit64::Default, {"lswx", OPTYPE_LOAD, FL_IN_A | FL_OUT_D}}, {597, Interpreter::lswi, Jit64::Default, {"lswi", OPTYPE_LOAD, FL_IN_AB | FL_OUT_D}}, - {535, Interpreter::lfsx, Jit64::lfsx, {"lfsx", OPTYPE_LOADFP, FL_IN_A0 | FL_IN_B}}, - {567, Interpreter::lfsux, Jit64::Default, {"lfsux", OPTYPE_LOADFP, FL_IN_A | FL_IN_B}}, - {599, Interpreter::lfdx, Jit64::Default, {"lfdx", OPTYPE_LOADFP, FL_IN_A0 | FL_IN_B}}, - {631, Interpreter::lfdux, Jit64::Default, {"lfdux", OPTYPE_LOADFP, FL_IN_A | FL_IN_B}}, - //store word {151, Interpreter::stwx, Jit64::Default, {"stwx", OPTYPE_STORE, FL_IN_A0 | FL_IN_B}}, {183, Interpreter::stwux, Jit64::Default, {"stwux", OPTYPE_STORE, FL_IN_A | FL_IN_B}}, @@ -352,6 +347,12 @@ GekkoOPTemplate table31[] = {661, Interpreter::stswx, Jit64::Default, {"stswx", OPTYPE_STORE, 0}}, {725, Interpreter::stswi, Jit64::Default, {"stswi", OPTYPE_STORE, 0}}, + // fp load/store + {535, Interpreter::lfsx, Jit64::lfsx, {"lfsx", OPTYPE_LOADFP, FL_IN_A0 | FL_IN_B}}, + {567, Interpreter::lfsux, Jit64::Default, {"lfsux", OPTYPE_LOADFP, FL_IN_A | FL_IN_B}}, + {599, Interpreter::lfdx, Jit64::Default, {"lfdx", OPTYPE_LOADFP, FL_IN_A0 | FL_IN_B}}, + {631, Interpreter::lfdux, Jit64::Default, {"lfdux", OPTYPE_LOADFP, FL_IN_A | FL_IN_B}}, + {663, Interpreter::stfsx, Jit64::Default, {"stfsx", OPTYPE_STOREFP, FL_IN_A0 | FL_IN_B}}, {695, Interpreter::stfsux, Jit64::Default, {"stfsux", OPTYPE_STOREFP, FL_IN_A | FL_IN_B}}, {727, Interpreter::stfdx, Jit64::Default, {"stfdx", OPTYPE_STOREFP, FL_IN_A0 | FL_IN_B}}, @@ -364,15 +365,15 @@ GekkoOPTemplate table31[] = {146, Interpreter::mtmsr, Jit64::mtmsr, {"mtmsr", OPTYPE_SYSTEM, FL_ENDBLOCK}}, {210, Interpreter::mtsr, Jit64::Default, {"mtsr", OPTYPE_SYSTEM, 0}}, {242, Interpreter::mtsrin, Jit64::Default, {"mtsrin", OPTYPE_SYSTEM, 0}}, - {339, Interpreter::mfspr, Jit64::mfspr, {"mfspr", OPTYPE_SYSTEM, 0}}, - {467, Interpreter::mtspr, Jit64::mtspr, {"mtspr", OPTYPE_SYSTEM, 0, 2}}, + {339, Interpreter::mfspr, Jit64::mfspr, {"mfspr", OPTYPE_SPR, 0}}, + {467, Interpreter::mtspr, Jit64::mtspr, {"mtspr", OPTYPE_SPR, 0, 2}}, {371, Interpreter::mftb, Jit64::mftb, {"mftb", OPTYPE_SYSTEM, FL_TIMER}}, {512, Interpreter::mcrxr, Jit64::Default, {"mcrxr", OPTYPE_SYSTEM, 0}}, {595, Interpreter::mfsr, Jit64::Default, {"mfsr", OPTYPE_SYSTEM, 0, 2}}, {659, Interpreter::mfsrin, Jit64::Default, {"mfsrin", OPTYPE_SYSTEM, 0, 2}}, {4, Interpreter::tw, Jit64::Default, {"tw", OPTYPE_SYSTEM, 0, 1}}, - {598, Interpreter::sync, Jit64::Default, {"sync", OPTYPE_SYSTEM, 0, 2}}, + {598, Interpreter::sync, Jit64::DoNothing, {"sync", OPTYPE_SYSTEM, 0, 2}}, {982, Interpreter::icbi, Jit64::Default, {"icbi", OPTYPE_SYSTEM, 0, 3}}, //Unused instructions on GC @@ -459,6 +460,8 @@ bool PPCTables::UsesFPU(UGeckoInstruction _inst) switch (_inst.OPCD) { case 04: // PS + return _inst.SUBOP10 != 1014; + case 48: // lfs case 49: // lfsu case 50: // lfd diff --git a/Source/Core/Core/Src/PowerPC/PPCTables.h b/Source/Core/Core/Src/PowerPC/PPCTables.h index 202bb437b0..8aecbc2115 100644 --- a/Source/Core/Core/Src/PowerPC/PPCTables.h +++ b/Source/Core/Core/Src/PowerPC/PPCTables.h @@ -53,6 +53,7 @@ enum OPTYPE_SUBTABLE, OPTYPE_INTEGER , OPTYPE_CR , + OPTYPE_SPR , OPTYPE_SYSTEM , OPTYPE_SYSTEMFP, OPTYPE_LOAD , diff --git a/Source/Core/Core/Src/PowerPC/PowerPC.h b/Source/Core/Core/Src/PowerPC/PowerPC.h index 96845f65ba..b97b79ee0c 100644 --- a/Source/Core/Core/Src/PowerPC/PowerPC.h +++ b/Source/Core/Core/Src/PowerPC/PowerPC.h @@ -14,13 +14,6 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -// Things that are common between CPU cores -// Plus an abstraction from the cores, to make it possible to switch between them -// - -// CURRENT NASTY BUGS: -// PC Genjin intro video is garbled and it crashes -// Skies of Arcadia only works in DebugFast, not release! And it's glitch hell. #ifndef _POWERPC_H #define _POWERPC_H diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp index 25dbec2cc4..5d352b7e49 100644 --- a/Source/Core/Core/Src/State.cpp +++ b/Source/Core/Core/Src/State.cpp @@ -185,7 +185,7 @@ void LoadStateCallback(u64 userdata, int cyclesLate) } } else { fseek(f, 0, SEEK_END); - sz = ftell(f) - sizeof(int); + sz = (int)(ftell(f) - sizeof(int)); fseek(f, sizeof(int), SEEK_SET); buffer = new u8[sz]; diff --git a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp index ccba85dcdf..e2d126e12c 100644 --- a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp +++ b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp @@ -360,6 +360,7 @@ bool XInput_Read(int xpadplayer, SPADStatus* _pPADStatus) return true; } + return false; #else return false; #endif diff --git a/Source/Plugins/Plugin_VideoDX9/Src/OpcodeDecoding.cpp b/Source/Plugins/Plugin_VideoDX9/Src/OpcodeDecoding.cpp index 138e520bae..95849bf14c 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/OpcodeDecoding.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/OpcodeDecoding.cpp @@ -16,11 +16,11 @@ // http://code.google.com/p/dolphin-emu/ //DL facts: -// Ikaruga uses NO display lists! +// Ikaruga uses (nearly) NO display lists! // Zelda WW uses TONS of display lists // Zelda TP uses almost 100% display lists except menus (we like this!) -// Note that it IS NOT POSSIBLE to precompile display lists! You can compile them as they are +// Note that it IS NOT GENERALLY POSSIBLE to precompile display lists! You can compile them as they are // and hope that the vertex format doesn't change, though, if you do it just when they are // called. The reason is that the vertex format affects the sizes of the vertices. @@ -49,7 +49,7 @@ DecodedVArray tempvarray; // TODO (mb2): all! DataReader inline for DX9 #ifdef DATAREADER_INLINE -u8 *g_pVideoData=0; +u8 *g_pVideoData = 0; #endif void Decode(); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/DataReader.cpp b/Source/Plugins/Plugin_VideoOGL/Src/DataReader.cpp index c5d13eaba2..0963b35484 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/DataReader.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/DataReader.cpp @@ -30,10 +30,10 @@ extern u32 FAKE_ReadFifo32(); extern int FAKE_GetPosition(); extern u8* FAKE_GetFifoCurrentPtr(); extern void FAKE_SkipFifo(u32 skip); - -IDataReader::~IDataReader() -{ -} + +IDataReader::~IDataReader() +{ +} CDataReader_Fifo::CDataReader_Fifo(void) { diff --git a/Source/Plugins/Plugin_VideoOGL/Src/DataReader.h b/Source/Plugins/Plugin_VideoOGL/Src/DataReader.h index e9dd63d791..901fb5e2f7 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/DataReader.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/DataReader.h @@ -27,9 +27,9 @@ // ================================================================================================= class IDataReader -{ -protected: - virtual ~IDataReader(); +{ +protected: + virtual ~IDataReader(); public: virtual void Skip(u32) = 0; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.cpp index 983bb845ac..8d7500cabc 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.cpp @@ -191,7 +191,7 @@ int VertexLoader::ComputeVertexSize() break; } - VertexLoader_Normal::index3 = m_VtxAttr.NormalIndex3; + VertexLoader_Normal::index3 = m_VtxAttr.NormalIndex3 ? true : false; if (m_VtxDesc.Normal != NOT_PRESENT) m_VertexSize += VertexLoader_Normal::GetSize(m_VtxDesc.Normal, m_VtxAttr.NormalFormat, m_VtxAttr.NormalElements);