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

Change a few project options and get rid of _unused. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2036 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-10-19 10:42:36 +00:00
parent 54f1409090
commit 29e8fe94e9
14 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/build/Utilities/Utilities.cbp
View File

@ -58,6 +58,17 @@
</Target> </Target>
</Build> </Build>
<Compiler> <Compiler>
<Add option="-march=i486" />
<Add option="-Wno-format" />
<Add option="-Wno-unused-parameter" />
<Add option="-Wno-unused-value" />
<Add option="-Wunused-variable" />
<Add option="-fno-guess-branch-probability" />
<Add option="-fno-dse" />
<Add option="-fno-tree-dse" />
<Add option="-pipe -msse -msse2" />
<Add option="-mpreferred-stack-boundary=2" />
<Add option="-m32" />
<Add directory="../../include/Utilities" /> <Add directory="../../include/Utilities" />
<Add directory="../../include" /> <Add directory="../../include" />
<Add directory="../../../3rdparty" /> <Add directory="../../../3rdparty" />

3
common/build/x86emitter/x86emitter.cbp
View File

@ -59,6 +59,7 @@
</Target> </Target>
</Build> </Build>
<Compiler> <Compiler>
<Add option="-march=i486" />
<Add option="-Wno-format" /> <Add option="-Wno-format" />
<Add option="-Wno-unused-parameter" /> <Add option="-Wno-unused-parameter" />
<Add option="-Wno-unused-value" /> <Add option="-Wno-unused-value" />
@ -67,6 +68,8 @@
<Add option="-fno-dse" /> <Add option="-fno-dse" />
<Add option="-fno-tree-dse" /> <Add option="-fno-tree-dse" />
<Add option="-pipe -msse -msse2" /> <Add option="-pipe -msse -msse2" />
<Add option="-mpreferred-stack-boundary=2" />
<Add option="-m32" />
<Add directory="../../include/x86emitter" /> <Add directory="../../include/x86emitter" />
<Add directory="../../include" /> <Add directory="../../include" />
</Compiler> </Compiler>

2
common/include/Pcsx2Defs.h
View File

@ -189,7 +189,6 @@
# define PCSX2_ALIGNED16_EXTERN(x) extern __declspec(align(16)) x # define PCSX2_ALIGNED16_EXTERN(x) extern __declspec(align(16)) x
# define __naked __declspec(naked) # define __naked __declspec(naked)
# define __unused /*unused*/
# define __noinline __declspec(noinline) # define __noinline __declspec(noinline)
# define __threadlocal __declspec(thread) # define __threadlocal __declspec(thread)
@ -244,7 +243,6 @@ This theoretically unoptimizes. Not having much luck so far.
// happens *by design* like all the friggen time >_<) // happens *by design* like all the friggen time >_<)
# define __fastcall __attribute__((fastcall)) # define __fastcall __attribute__((fastcall))
# define __unused __attribute__((unused))
# define _inline __inline__ __attribute__((unused)) # define _inline __inline__ __attribute__((unused))
# ifdef NDEBUG # ifdef NDEBUG
# define __forceinline __attribute__((always_inline,unused)) # define __forceinline __attribute__((always_inline,unused))

2
common/include/Utilities/Threading.h
View File

@ -314,7 +314,7 @@ namespace Threading
// Section of methods for internal use only. // Section of methods for internal use only.
void _DoSetThreadName( const wxString& name ); void _DoSetThreadName( const wxString& name );
void _DoSetThreadName( __unused const char* name ); void _DoSetThreadName( const char* name );
void _internal_execute(); void _internal_execute();
void _try_virtual_invoke( void (PersistentThread::*method)() ); void _try_virtual_invoke( void (PersistentThread::*method)() );
void _ThreadCleanup(); void _ThreadCleanup();

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, __unused 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, __unused 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, __unused 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, __unused 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, __unused 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, __unused 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, __unused 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, __unused 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 );

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

@ -424,7 +424,7 @@ void Threading::PersistentThread::_DoSetThreadName( const wxString& name )
_DoSetThreadName( name.ToUTF8() ); _DoSetThreadName( name.ToUTF8() );
} }
void Threading::PersistentThread::_DoSetThreadName( __unused const char* name ) void Threading::PersistentThread::_DoSetThreadName( const char* name )
{ {
pxAssertMsg( IsSelf(), "Thread affinity error." ); // only allowed from our own thread, thanks. pxAssertMsg( IsSelf(), "Thread affinity error." ); // only allowed from our own thread, thanks.

6
pcsx2/CDVD/CDVD_internal.h
View File

@ -129,9 +129,9 @@ static const uint PSX_DVD_READSPEED = 1382400 + 256000; // normal is 1 Byte Time
static const uint Cdvd_FullSeek_Cycles = (PSXCLK*100) / 1000; // average number of cycles per fullseek (100ms) static const uint Cdvd_FullSeek_Cycles = (PSXCLK*100) / 1000; // average number of cycles per fullseek (100ms)
static const uint Cdvd_FastSeek_Cycles = (PSXCLK*30) / 1000; // average number of cycles per fastseek (37ms) static const uint Cdvd_FastSeek_Cycles = (PSXCLK*30) / 1000; // average number of cycles per fastseek (37ms)
static const __unused char *mg_zones[8] = {"Japan", "USA", "Europe", "Oceania", "Asia", "Russia", "China", "Mexico"}; static const char *mg_zones[8] = {"Japan", "USA", "Europe", "Oceania", "Asia", "Russia", "China", "Mexico"};
static const __unused char *nCmdName[0x100]= { static const char *nCmdName[0x100]= {
"CdSync", "CdSync",
"CdNop", "CdNop",
"CdStandby", "CdStandby",
@ -168,7 +168,7 @@ enum nCmds
N_CD_CHG_SPDL_CTRL = 0x0F, // CdChgSpdlCtrl N_CD_CHG_SPDL_CTRL = 0x0F, // CdChgSpdlCtrl
}; };
static const __unused char *sCmdName[0x100]= { static const char *sCmdName[0x100]= {
"", "sceCdGetDiscType", "sceCdReadSubQ", "subcommands",//sceCdGetMecaconVersion, read/write console id, read renewal date "", "sceCdGetDiscType", "sceCdReadSubQ", "subcommands",//sceCdGetMecaconVersion, read/write console id, read renewal date
"", "sceCdTrayState", "sceCdTrayCtrl", "", "", "sceCdTrayState", "sceCdTrayCtrl", "",
"sceCdReadClock", "sceCdWriteClock", "sceCdReadNVM", "sceCdWriteNVM", "sceCdReadClock", "sceCdWriteClock", "sceCdReadNVM", "sceCdWriteNVM",

2
pcsx2/CDVD/CDVDaccess.cpp
View File

@ -497,7 +497,7 @@ s32 CALLBACK NODISCdummyS32()
return 0; return 0;
} }
void CALLBACK NODISCnewDiskCB(__unused 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(__unused void(*callback)()) void CALLBACK ISOnewDiskCB( void(*callback)())
{ {
} }

6
pcsx2/Linux/pcsx2.cbp
View File

@ -16,6 +16,7 @@
<Option type="0" /> <Option type="0" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-march=i486" />
<Add option="-g" /> <Add option="-g" />
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --cflags`" /> <Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --cflags`" />
<Add option="-DPCSX2_DEVBUILD" /> <Add option="-DPCSX2_DEVBUILD" />
@ -88,8 +89,6 @@
</Environment> </Environment>
</Build> </Build>
<Compiler> <Compiler>
<Add option="-march=pentium4" />
<Add option="-march=i486" />
<Add option="-Wno-format" /> <Add option="-Wno-format" />
<Add option="-Wno-unused-parameter" /> <Add option="-Wno-unused-parameter" />
<Add option="-Wno-unused-value" /> <Add option="-Wno-unused-value" />
@ -98,7 +97,8 @@
<Add option="-fno-dse" /> <Add option="-fno-dse" />
<Add option="-fno-tree-dse" /> <Add option="-fno-tree-dse" />
<Add option="-pipe -msse -msse2" /> <Add option="-pipe -msse -msse2" />
<Add option="-march=native" /> <Add option="-mpreferred-stack-boundary=2" />
<Add option="-m32" />
<Add option="-DWX_PRECOMP" /> <Add option="-DWX_PRECOMP" />
<Add directory="$(SvnRootDir)/common/include/" /> <Add directory="$(SvnRootDir)/common/include/" />
<Add directory="$(SvnRootDir)/3rdparty/" /> <Add directory="$(SvnRootDir)/3rdparty/" />

2
pcsx2/System.h
View File

@ -70,7 +70,7 @@ extern void vSyncDebugStuff( uint frame );
extern void SysPageFaultExceptionFilter( int signal, siginfo_t *info, void * ); extern void SysPageFaultExceptionFilter( int signal, siginfo_t *info, void * );
extern void __fastcall InstallLinuxExceptionHandler(); extern void __fastcall InstallLinuxExceptionHandler();
extern void __fastcall ReleaseLinuxExceptionHandler(); extern void __fastcall ReleaseLinuxExceptionHandler();
static void __unused NTFS_CompressFile( const wxString& file, bool compressStatus=true ) {} static void NTFS_CompressFile( const wxString& file, bool compressStatus=true ) {}
# define PCSX2_MEM_PROTECT_BEGIN() InstallLinuxExceptionHandler() # define PCSX2_MEM_PROTECT_BEGIN() InstallLinuxExceptionHandler()
# define PCSX2_MEM_PROTECT_END() ReleaseLinuxExceptionHandler() # define PCSX2_MEM_PROTECT_END() ReleaseLinuxExceptionHandler()

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( __unused 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( __unused 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, __unused int idealWidth ) : Panels::StandardPathsPanel::StandardPathsPanel( wxWindow& parent, int idealWidth ) :
BasePathsPanel( parent ) BasePathsPanel( parent )
{ {
s_main.AddSpacer( BetweenFolderSpace ); s_main.AddSpacer( BetweenFolderSpace );