ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Second half of __unused removal -- comment out (remove) names on unused parameters as per the guidelines of some C guideline that all compilers adhere to (this suppresses the same warnings __unused used to suppress). 

Minor cleanups to Counters/Gif.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2038 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-10-19 11:53:18 +00:00
parent cf4719019d
commit 2cb8e571cd
9 changed files with 31 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/include/x86emitter/implement/dwshift.h
View File

@ -32,17 +32,17 @@ class DwordShiftImplAll
public: public:
// ---------- 32 Bit Interface ----------- // ---------- 32 Bit Interface -----------
__forceinline void operator()( const xRegister32& to, const xRegister32& from, const xRegisterCL& clreg ) const { xOpWrite0F( 0xa5 | m_shiftop, to, from ); } __forceinline void operator()( const xRegister32& to, const xRegister32& from, const xRegisterCL& /* clreg */ ) const { xOpWrite0F( 0xa5 | m_shiftop, to, from ); }
__forceinline void operator()( void* dest, const xRegister32& from, const xRegisterCL& clreg ) const { xOpWrite0F( 0xa5 | m_shiftop, from, dest ); } __forceinline void operator()( void* dest, const xRegister32& from, const xRegisterCL& /* clreg */ ) const { xOpWrite0F( 0xa5 | m_shiftop, from, dest ); }
__forceinline void operator()( const ModSibBase& dest, const xRegister32& from, const xRegisterCL& clreg ) const { xOpWrite0F( 0xa5 | m_shiftop, from, dest ); } __forceinline void operator()( const ModSibBase& dest, const xRegister32& from, const xRegisterCL& /* clreg */ ) const { xOpWrite0F( 0xa5 | m_shiftop, from, dest ); }
__forceinline void operator()( const xRegister32& to, const xRegister32& from, u8 shiftcnt ) const { if( shiftcnt != 0 ) xOpWrite0F( 0xa4 | m_shiftop, to, from ); } __forceinline void operator()( const xRegister32& to, const xRegister32& from, u8 shiftcnt ) const { if( shiftcnt != 0 ) xOpWrite0F( 0xa4 | m_shiftop, to, from ); }
__forceinline void operator()( void* dest, const xRegister32& from, u8 shiftcnt ) const { if( shiftcnt != 0 ) xOpWrite0F( 0xa4 | m_shiftop, from, dest, shiftcnt ); } __forceinline void operator()( void* dest, const xRegister32& from, u8 shiftcnt ) const { if( shiftcnt != 0 ) xOpWrite0F( 0xa4 | m_shiftop, from, dest, shiftcnt ); }
__forceinline void operator()( const ModSibBase& dest, const xRegister32& from, u8 shiftcnt ) const { if( shiftcnt != 0 ) xOpWrite0F( 0xa4 | m_shiftop, from, dest, shiftcnt ); } __forceinline void operator()( const ModSibBase& dest, const xRegister32& from, u8 shiftcnt ) const { if( shiftcnt != 0 ) xOpWrite0F( 0xa4 | m_shiftop, from, dest, shiftcnt ); }
// ---------- 16 Bit Interface ----------- // ---------- 16 Bit Interface -----------
__forceinline void operator()( const xRegister16& to, const xRegister16& from, const xRegisterCL& clreg ) const { xOpWrite0F( 0x66, 0xa5 | m_shiftop, to, from ); } __forceinline void operator()( const xRegister16& to, const xRegister16& from, const xRegisterCL& /* clreg */ ) const { xOpWrite0F( 0x66, 0xa5 | m_shiftop, to, from ); }
__forceinline void operator()( void* dest, const xRegister16& from, const xRegisterCL& clreg ) const { xOpWrite0F( 0x66, 0xa5 | m_shiftop, from, dest ); } __forceinline void operator()( void* dest, const xRegister16& from, const xRegisterCL& /* clreg */ ) const { xOpWrite0F( 0x66, 0xa5 | m_shiftop, from, dest ); }
__forceinline void operator()( const ModSibBase& dest, const xRegister16& from, const xRegisterCL& clreg ) const { xOpWrite0F( 0x66, 0xa5 | m_shiftop, from, dest ); } __forceinline void operator()( const ModSibBase& dest, const xRegister16& from, const xRegisterCL& /* clreg */ ) const { xOpWrite0F( 0x66, 0xa5 | m_shiftop, from, dest ); }
__forceinline void operator()( const xRegister16& to, const xRegister16& from, u8 shiftcnt ) const { if( shiftcnt != 0 ) xOpWrite0F( 0x66, 0xa4 | m_shiftop, to, from ); } __forceinline void operator()( const xRegister16& to, const xRegister16& from, u8 shiftcnt ) const { if( shiftcnt != 0 ) xOpWrite0F( 0x66, 0xa4 | m_shiftop, to, from ); }
__forceinline void operator()( void* dest, const xRegister16& from, u8 shiftcnt ) const { if( shiftcnt != 0 ) xOpWrite0F( 0x66, 0xa4 | m_shiftop, from, dest, shiftcnt ); } __forceinline void operator()( void* dest, const xRegister16& from, u8 shiftcnt ) const { if( shiftcnt != 0 ) xOpWrite0F( 0x66, 0xa4 | m_shiftop, from, dest, shiftcnt ); }
__forceinline void operator()( const ModSibBase& dest, const xRegister16& from, u8 shiftcnt ) const { if( shiftcnt != 0 ) xOpWrite0F( 0x66, 0xa4 | m_shiftop, from, dest, shiftcnt ); } __forceinline void operator()( const ModSibBase& dest, const xRegister16& from, u8 shiftcnt ) const { if( shiftcnt != 0 ) xOpWrite0F( 0x66, 0xa4 | m_shiftop, from, dest, shiftcnt ); }

4
common/include/x86emitter/implement/group2.h
View File

@ -39,14 +39,14 @@ template< G2Type InstType >
class Group2ImplAll class Group2ImplAll
{ {
public: public:
template< typename T > __forceinline void operator()( const xRegister<T>& to, const xRegisterCL& from ) const template< typename T > __forceinline void operator()( const xRegister<T>& to, const xRegisterCL& /* from */ ) const
{ {
prefix16<T>(); prefix16<T>();
xWrite8( Is8BitOp<T>() ? 0xd2 : 0xd3 ); xWrite8( Is8BitOp<T>() ? 0xd2 : 0xd3 );
EmitSibMagic( InstType, to ); EmitSibMagic( InstType, to );
} }
template< typename T > __noinline void operator()( const ModSibStrict<T>& sibdest, const xRegisterCL& from ) const template< typename T > __noinline void operator()( const ModSibStrict<T>& sibdest, const xRegisterCL& /* from */ ) const
{ {
prefix16<T>(); prefix16<T>();
xWrite8( Is8BitOp<T>() ? 0xd2 : 0xd3 ); xWrite8( Is8BitOp<T>() ? 0xd2 : 0xd3 );

13
common/src/Utilities/ThreadTools.cpp
View File

@ -144,8 +144,6 @@ void Threading::PersistentThread::Start()
if( pthread_create( &m_thread, NULL, _internal_callback, this ) != 0 ) if( pthread_create( &m_thread, NULL, _internal_callback, this ) != 0 )
throw Exception::ThreadCreationError(); throw Exception::ThreadCreationError();
m_detached = false;
} }
// Returns: TRUE if the detachment was performed, or FALSE if the thread was // Returns: TRUE if the detachment was performed, or FALSE if the thread was
@ -383,6 +381,7 @@ wxString Threading::PersistentThread::GetName() const
void Threading::PersistentThread::OnStartInThread() void Threading::PersistentThread::OnStartInThread()
{ {
m_running = true; m_running = true;
m_detached = false;
} }
void Threading::PersistentThread::_internal_execute() void Threading::PersistentThread::_internal_execute()
@ -433,7 +432,7 @@ void Threading::PersistentThread::_DoSetThreadName( const char* name )
#if defined(_WINDOWS_) && defined (_MSC_VER) #if defined(_WINDOWS_) && defined (_MSC_VER)
// This code sample was borrowed form some obscure MSDN article. // This code sample was borrowed form some obscure MSDN article.
// In a rare bout of sanity, it's an actual Micrsoft-published hack // In a rare bout of sanity, it's an actual Microsoft-published hack
// that actually works! // that actually works!
static const int MS_VC_EXCEPTION = 0x406D1388; static const int MS_VC_EXCEPTION = 0x406D1388;
@ -454,13 +453,9 @@ void Threading::PersistentThread::_DoSetThreadName( const char* name )
info.dwThreadID = GetCurrentThreadId(); info.dwThreadID = GetCurrentThreadId();
info.dwFlags = 0; info.dwFlags = 0;
__try __try {
{
RaiseException( MS_VC_EXCEPTION, 0, sizeof(info)/sizeof(ULONG_PTR), (ULONG_PTR*)&info ); RaiseException( MS_VC_EXCEPTION, 0, sizeof(info)/sizeof(ULONG_PTR), (ULONG_PTR*)&info );
} } __except(EXCEPTION_EXECUTE_HANDLER) { }
__except(EXCEPTION_EXECUTE_HANDLER)
{
}
#endif #endif
} }

2
pcsx2/CDVD/CDVDaccess.cpp
View File

@ -497,7 +497,7 @@ s32 CALLBACK NODISCdummyS32()
return 0; return 0;
} }
void CALLBACK NODISCnewDiskCB( void (*callback)()) void CALLBACK NODISCnewDiskCB(void (* /* callback */)())
{ {
} }

2
pcsx2/CDVD/CDVDisoReader.cpp
View File

@ -396,7 +396,7 @@ s32 CALLBACK ISOdummyS32()
return 0; return 0;
} }
void CALLBACK ISOnewDiskCB( void(*callback)()) void CALLBACK ISOnewDiskCB(void(* /* callback */)())
{ {
} }

3
pcsx2/Counters.cpp
View File

@ -334,8 +334,7 @@ static __forceinline void frameLimit()
// //
while( true ) while( true )
{ {
iEnd = GetCPUTicks(); sDeltaTime = GetCPUTicks() - uExpectedEnd;
sDeltaTime = iEnd - uExpectedEnd;
if( sDeltaTime >= 0 ) break; if( sDeltaTime >= 0 ) break;
Timeslice(); Timeslice();
} }

10
pcsx2/Gif.h
View File

@ -239,10 +239,10 @@ struct GIFregisters
extern Path3Modes Path3progress; extern Path3Modes Path3progress;
extern void gsInterrupt(); extern void gsInterrupt();
int _GIFchain(); extern int _GIFchain();
void GIFdma(); extern void GIFdma();
void dmaGIF(); extern void dmaGIF();
void mfifoGIFtransfer(int qwc); extern void mfifoGIFtransfer(int qwc);
void gifMFIFOInterrupt(); extern void gifMFIFOInterrupt();
#endif #endif

4
pcsx2/gui/Dialogs/ImportSettingsDialog.cpp
View File

@ -53,14 +53,14 @@ Dialogs::ImportSettingsDialog::ImportSettingsDialog( wxWindow* parent ) :
Connect( b_over->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ImportSettingsDialog::OnOverwrite_Click) ); Connect( b_over->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ImportSettingsDialog::OnOverwrite_Click) );
} }
void Dialogs::ImportSettingsDialog::OnImport_Click( wxCommandEvent& evt ) void Dialogs::ImportSettingsDialog::OnImport_Click( wxCommandEvent& /* evt */ )
{ {
AppConfig_OnChangedSettingsFolder( false ); // ... and import existing settings AppConfig_OnChangedSettingsFolder( false ); // ... and import existing settings
g_Conf->Folders.Bios.Mkdir(); g_Conf->Folders.Bios.Mkdir();
EndModal( wxID_OK ); EndModal( wxID_OK );
} }
void Dialogs::ImportSettingsDialog::OnOverwrite_Click( wxCommandEvent& evt ) void Dialogs::ImportSettingsDialog::OnOverwrite_Click( wxCommandEvent& /* evt */ )
{ {
AppConfig_OnChangedSettingsFolder( true ); // ... and overwrite any existing settings AppConfig_OnChangedSettingsFolder( true ); // ... and overwrite any existing settings
g_Conf->Folders.Bios.Mkdir(); g_Conf->Folders.Bios.Mkdir();

2
pcsx2/gui/Panels/PathsPanel.cpp
View File

@ -37,7 +37,7 @@ Panels::DirPickerPanel& Panels::BasePathsPanel::AddDirPicker( wxBoxSizer& sizer,
} }
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
Panels::StandardPathsPanel::StandardPathsPanel( wxWindow& parent, int idealWidth ) : Panels::StandardPathsPanel::StandardPathsPanel( wxWindow& parent, int /* idealWidth */ ) :
BasePathsPanel( parent ) BasePathsPanel( parent )
{ {
s_main.AddSpacer( BetweenFolderSpace ); s_main.AddSpacer( BetweenFolderSpace );