mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-09-29 07:21:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various fixes

Browse Source 
Fixes to dead code and a couple self-assignings
This commit is contained in:
Raul Tambre 2015-01-24 21:50:26 +02:00
parent 94c81c73c5
commit be50130c3f
7 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Utilities/StrFmt.h
View File

@ -338,8 +338,6 @@ namespace fmt
{
throw "Invalid formatting (s32): " + std::string(fmt, len);
}
return{};
}
};
@ -360,8 +358,6 @@ namespace fmt
{
throw "Invalid formatting (s64): " + std::string(fmt, len);
}
return{};
}
};
@ -448,8 +444,6 @@ namespace fmt
{
throw "Invalid formatting (const char*): " + std::string(fmt, len);
}
return{};
}
};

3
rpcs3/Emu/Cell/PPUThread.h
View File

@ -363,6 +363,7 @@ struct PPCdouble
case _FPCLASS_PD: return FPR_PD;
case _FPCLASS_PN: return FPR_PN;
case _FPCLASS_PINF: return FPR_PINF;
default: throw fmt::Format("PPCdouble::UpdateType() -> unknown fpclass (0x%04x).", fpc);
}
#else
switch (fpc)
@ -374,8 +375,6 @@ struct PPCdouble
default: return std::signbit(_double) ? FPR_NN : FPR_PN;
}
#endif
throw fmt::Format("PPCdouble::UpdateType() -> unknown fpclass (0x%04x).", fpc);
}
FPRType GetType() const

6
rpcs3/Emu/FS/vfsDirBase.h
View File

@ -62,14 +62,12 @@ public:
public:
iterator(vfsDirBase* parent)
: parent(parent)
, data(parent->First())
: data(parent->First())
{
}
iterator(const DirEntryInfo* data)
: parent(parent)
, data(data)
: data(data)
{
}

2
rpcs3/Emu/RSX/RSXTexture.cpp
View File

@ -295,7 +295,7 @@ u8 RSXVertexTexture::GetWrapS() const
u8 RSXVertexTexture::GetWrapT() const
{
return 1;
return ((methodRegisters[NV4097_SET_VERTEX_TEXTURE_ADDRESS + (m_index * 32)] >> 8) & 0xf);
//return ((methodRegisters[NV4097_SET_VERTEX_TEXTURE_ADDRESS + (m_index * 32)] >> 8) & 0xf);
}
u8 RSXVertexTexture::GetWrapR() const

7
rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
View File

@ -542,12 +542,11 @@ int cellGcmSetSecondVFrequency(u32 freq)
switch (freq)
{
case CELL_GCM_DISPLAY_FREQUENCY_59_94HZ:
cellGcmSys->Todo("Unimplemented display frequency: 59.94Hz");
cellGcmSys->Todo("Unimplemented display frequency: 59.94Hz"); break;
case CELL_GCM_DISPLAY_FREQUENCY_SCANOUT:
cellGcmSys->Todo("Unimplemented display frequency: Scanout");
cellGcmSys->Todo("Unimplemented display frequency: Scanout"); break;
case CELL_GCM_DISPLAY_FREQUENCY_DISABLE:
Emu.GetGSManager().GetRender().m_frequency_mode = freq;
break;
Emu.GetGSManager().GetRender().m_frequency_mode = freq; break;
default: return CELL_EINVAL;
}

2
rpcs3/Emu/SysCalls/Modules/cellSync.cpp
View File

@ -1062,7 +1062,6 @@ s32 syncLFQueueGetPushPointer(vm::ptr<CellSyncLFQueue> queue, s32& pointer, u32
{
return res;
}
break;
}
else if (!useEventQueue)
{
@ -1439,7 +1438,6 @@ s32 syncLFQueueGetPopPointer(vm::ptr<CellSyncLFQueue> queue, s32& pointer, u32 i
{
return res;
}
break;
}
else if (!useEventQueue)
{

6
rpcs3/Gui/CompilerELF.cpp
View File

@ -210,7 +210,7 @@ void CompilerELF::OnUpdate(wxCommandEvent& event)
DoAnalyzeCode(false);
return;
asm_list->Freeze();
/*asm_list->Freeze();
asm_list->SetStyle(0, asm_list->GetValue().Len(), wxTextAttr("Black"));
/*
@ -220,7 +220,7 @@ void CompilerELF::OnUpdate(wxCommandEvent& event)
}
*/
SetOpStyle(".int", "Blue");
/*SetOpStyle(".int", "Blue");
SetOpStyle(".string", "Blue");
SetOpStyle(".strlen", "Blue");
SetOpStyle(".buf", "Blue");
@ -294,7 +294,7 @@ void CompilerELF::OnUpdate(wxCommandEvent& event)
asm_list->Thaw();
UpdateScroll(true, wxVERTICAL);
UpdateScroll(true, wxVERTICAL);*/
}
void CompilerELF::OnScroll(wxScrollWinEvent& event)