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

wxGui branch: [linux] Added workspaces and projects for Code::Blocks IDE. Main workspace is currently located in pcsx2/linux/ (will move it to a top level later), and only Pcsx2/zlib projects are tested (and working!). Haven't gotten to any plugins yet. 

The CodeBlocks project is tested for Debug builds only, and will generate the executable binary to /yoursvnroot/bin/ [same as the MSVC/Win32 build does].

* Note: The 'regular' build script is currently broken and I haven't a darnedest clue how to fix it, since my knowledge of Automake doesn't extend past the end of this sentence.

git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1079 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-04-28 05:56:22 +00:00
parent d9f367f03f
commit 01c01e9c34
23 changed files with 985 additions and 329 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
3rdparty/zlib/zlib.cbp vendored Normal file
View File

@ -0,0 +1,100 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_project_file>
<FileVersion major="1" minor="6" />
<Project>
<Option title="zlib" />
<Option pch_mode="2" />
<Option compiler="gcc" />
<Build>
<Target title="Debug">
<Option output="../../deps/zlib-dbg" prefix_auto="0" extension_auto="1" />
<Option working_dir="" />
<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/zlib/.objs" />
<Option type="2" />
<Option compiler="gcc" />
<Option createDefFile="1" />
<Compiler>
<Add option="-W" />
<Add option="-g" />
<Add option="-O0" />
</Compiler>
</Target>
<Target title="Release">
<Option output="../../deps/zlib" prefix_auto="0" extension_auto="1" />
<Option working_dir="" />
<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/zlib/.objs" />
<Option type="2" />
<Option compiler="gcc" />
<Option createDefFile="1" />
<Compiler>
<Add option="-W" />
<Add option="-O2" />
</Compiler>
</Target>
<Target title="Devel">
<Option output="../../deps/libzlib-dev" prefix_auto="1" extension_auto="1" />
<Option working_dir="" />
<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/zlib/.objs" />
<Option type="2" />
<Option compiler="gcc" />
<Option createDefFile="1" />
<Compiler>
<Add option="-W" />
<Add option="-O2" />
</Compiler>
</Target>
</Build>
<Unit filename="adler32.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="compress.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="crc32.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="crc32.h" />
<Unit filename="deflate.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="deflate.h" />
<Unit filename="gzio.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="infback.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="inffast.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="inffast.h" />
<Unit filename="inffixed.h" />
<Unit filename="inflate.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="inflate.h" />
<Unit filename="inftrees.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="inftrees.h" />
<Unit filename="trees.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="trees.h" />
<Unit filename="uncompr.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="zconf.h" />
<Unit filename="zlib.h" />
<Unit filename="zutil.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="zutil.h" />
<Extensions>
<envvars />
<code_completion />
<lib_finder disable_auto="1" />
<debugger />
</Extensions>
</Project>
</CodeBlocks_project_file>

4
pcsx2/Elfheader.cpp
View File

@ -551,8 +551,8 @@ int loadElfFile(const wxString& filename)
if( elfobj.proghead == NULL )
{
throw Exception::CpuStateShutdown(
wxsFormat( wxT("Invalid ELF header encountered in file:\n\t%s"), elfobj.filename ),
wxsFormat(_("Invalid ELF header, file: %s"), elfobj.filename )
wxsFormat( wxT("Invalid ELF header encountered in file:\n\t%s"), elfobj.filename.c_str() ),
wxsFormat(_("Invalid ELF header, file: %s"), elfobj.filename.c_str() )
);
}

7
pcsx2/Exceptions.cpp
View File

@ -51,7 +51,7 @@ namespace Exception
// I'll rip this out once I get Linux to actually catch these exceptions. Say, in BeginExecution or StartGui, like I would expect.
// -- arcum42
#ifdef __LINUX__
printf(msg.c_str());
wxLogError( msg_eng.c_str() );
#endif
}
@ -62,6 +62,7 @@ namespace Exception
m_message( GetTranslation( msg_eng ) ),
m_stacktrace( wxEmptyString ) // unsupported yet
{
wxLogError( m_message_eng.c_str() );
}
wxString BaseException::LogMessage() const
@ -74,7 +75,7 @@ namespace Exception
{
return wxsFormat(
wxT("Stream exception: %s\n\tObject name: %s"),
m_message_eng, StreamName.c_str()
m_message_eng.c_str(), StreamName.c_str()
) + m_stacktrace;
}
@ -94,7 +95,7 @@ namespace Exception
wxString PluginFailure::DisplayMessage() const
{
return wxsFormat( m_message, plugin_name );
return wxsFormat( m_message, plugin_name.c_str() );
}
// ------------------------------------------------------------------------

2
pcsx2/GS.cpp
View File

@ -196,7 +196,7 @@ s32 gsOpen()
GSsetBaseMem( PS2MEM_GS );
GSirqCallback( gsIrq );
m_gsOpened = !GSopen((void *)&pDsp, "PCSX2", 0);
m_gsOpened = !GSopen( &pDsp, "PCSX2", 0 );
}
/*if( m_gsOpened )

2
pcsx2/IPU/mpeg2lib/Idct.cpp
View File

@ -25,7 +25,7 @@
#include "PrecompiledHeader.h"
#include "Common.h"
#include "IPU.h"
#include "IPU/IPU.h"
#define W1 2841 /* 2048*sqrt (2)*cos (1*pi/16) */
#define W2 2676 /* 2048*sqrt (2)*cos (2*pi/16) */

4
pcsx2/IPU/mpeg2lib/Mpeg.cpp
View File

@ -29,10 +29,10 @@
#include "PrecompiledHeader.h"
#include "Common.h"
#include "IPU.h"
#include "IPU/IPU.h"
#include "IPU/coroutine.h"
#include "Mpeg.h"
#include "Vlc.h"
#include "coroutine.h"
int non_linear_quantizer_scale [] = {
0, 1, 2, 3, 4, 5, 6, 7,

2
pcsx2/IPU/mpeg2lib/Vlc.h
View File

@ -25,7 +25,7 @@
#ifndef __VLC_H__
#define __VLC_H__
#include "coroutine.h"
#include "IPU/coroutine.h"
static u8 data[2];
static u8 dword[4];

103
pcsx2/Linux/HostGui.cpp Normal file
View File

@ -0,0 +1,103 @@
/* Pcsx2 - Pc Ps2 Emulator
* Copyright (C) 2002-2009 Pcsx2 Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "PrecompiledHeader.h"
#include <sys/mman.h>
#include <signal.h>
#include "Common.h"
//#include "x86/iR5900.h"
extern void SysPageFaultExceptionFilter( int signal, siginfo_t *info, void * );
extern void __fastcall InstallLinuxExceptionHandler();
extern void __fastcall ReleaseLinuxExceptionHandler();
#define PCSX2_MEM_PROTECT_BEGIN() InstallLinuxExceptionHandler()
#define PCSX2_MEM_PROTECT_END() ReleaseLinuxExceptionHandler()
extern void SignalExit(int sig);
static const uptr m_pagemask = getpagesize()-1;
void InstallLinuxExceptionHandler()
{
struct sigaction sa;
sigemptyset(&sa.sa_mask);
sa.sa_flags = SA_SIGINFO;
sa.sa_sigaction = &SysPageFaultExceptionFilter;
sigaction(SIGSEGV, &sa, NULL);
}
void ReleaseLinuxExceptionHandler()
{
// Code this later.
}
// Linux implementation of SIGSEGV handler. Bind it using sigaction().
void SysPageFaultExceptionFilter( int signal, siginfo_t *info, void * )
{
// get bad virtual address
uptr offset = (u8*)info->si_addr - psM;
DevCon::Status( "Protected memory cleanup. Offset 0x%x", params offset );
if (offset>=Ps2MemSize::Base)
{
// Bad mojo! Completely invalid address.
// Instigate a crash or abort emulation or something.
assert( false );
}
mmap_ClearCpuBlock( offset & ~m_pagemask );
}
namespace HostSys
{
void *Mmap(uptr base, u32 size)
{
u8 *Mem;
Mem = (u8*)mmap((uptr*)base, size, PROT_EXEC | PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
if (Mem == MAP_FAILED) Console::Notice("Mmap Failed!");
return Mem;
}
void Munmap(uptr base, u32 size)
{
munmap((uptr*)base, size);
}
void MemProtect( void* baseaddr, size_t size, PageProtectionMode mode, bool allowExecution )
{
int lnxmode = 0;
// make sure size is aligned to the system page size:
size = (size + m_pagemask) & ~m_pagemask;
switch( mode )
{
case Protect_NoAccess: break;
case Protect_ReadOnly: lnxmode = PROT_READ; break;
case Protect_ReadWrite: lnxmode = PROT_READ | PROT_WRITE; break;
}
if( allowExecution ) lnxmode |= PROT_EXEC;
mprotect( baseaddr, size, lnxmode );
}
}

4
pcsx2/Linux/LnxThreads.cpp
View File

@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "Linux.h"
#include "../x86/ix86/ix86.h"
#include "PrecompiledHeader.h"
#include "ix86/ix86.h"
// Note: assuming multicore is safer because it forces the interlocked routines to use
// the LOCK prefix. The prefix works on single core CPUs fine (but is slow), but not

22
pcsx2/Linux/pcsx2-codeblocks.workspace Normal file
View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_workspace_file>
<Workspace title="pcsx2_suite_2008 workspace">
<Project filename="../../plugins/zerogs/dx/Windows/zerogs_2008.cbp" />
<Project filename="../../plugins/CDVDiso/src/Windows/CDVDiso_vs2008.cbp" />
<Project filename="../../plugins/spu2-x/src/Windows/Spu2-X_vs2008.cbp" />
<Project filename="../../3rdparty/SoundTouch/SoundTouch.cbp" />
<Project filename="../../3rdparty/zlib/zlib.cbp" />
<Project filename="../../3rdparty/bzip2/bzip2.cbp" />
<Project filename="../../plugins/LilyPad/LilyPad_VC2008.cbp" />
<Project filename="../../plugins/zerospu2/Windows/ZeroSPU2_2008.cbp" />
<Project filename="../../plugins/xpad/xpad_vs2008.cbp" />
<Project filename="../../plugins/CDVDnull/Src/CDVDnull_vs2008.cbp" />
<Project filename="../../plugins/USBnull/Windows/USBnull_vc2008.cbp" />
<Project filename="../../plugins/FWnull/Windows/FWnull_vc2008.cbp" />
<Project filename="../../plugins/dev9null/src/DEV9null_vc2008.cbp" />
<Project filename="../../plugins/zeropad/Windows/ZeroPAD_2008.cbp" />
<Project filename="pcsx2.cbp" active="1">
<Depends filename="../../3rdparty/zlib/zlib.cbp" />
</Project>
</Workspace>
</CodeBlocks_workspace_file>

435
pcsx2/Linux/pcsx2.cbp Normal file
View File

@ -0,0 +1,435 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_project_file>
<FileVersion major="1" minor="6" />
<Project>
<Option title="pcsx2" />
<Option platforms="Windows;Unix;" />
<Option pch_mode="2" />
<Option compiler="gcc" />
<Build>
<Target title="Debug">
<Option platforms="Windows;Unix;" />
<Option output="$(SvnRootDir)/bin/pcsx2-dbg" prefix_auto="1" extension_auto="1" />
<Option working_dir="$(SvnRootDir)/bin/" />
<Option object_output="./.objs/Debug" />
<Option type="0" />
<Option compiler="gcc" />
<Compiler>
<Add option="-g" />
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --cflags`" />
<Add option="-DPCSX2_DEVBUILD" />
</Compiler>
<ResourceCompiler>
<Add directory="$(ProjectRootDir)/NewGUI" />
</ResourceCompiler>
<Linker>
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --libs`" />
<Add library="$(SvnRootDir)/deps/zlib-dbg.a" />
</Linker>
</Target>
<Target title="Devel">
<Option platforms="Windows;Unix;" />
<Option output="$(SvnRootDir)/bin/pcsx2-dev" prefix_auto="1" extension_auto="1" />
<Option working_dir="$(SvnRootDir)/bin/" />
<Option object_output="./.objs/Devel" />
<Option type="0" />
<Option compiler="gcc" />
<Compiler>
<Add option="-O2" />
<Add option="-W" />
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --cflags`" />
<Add option="-DNDEBUG" />
<Add option="-DPCSX2_DEVBUILD" />
</Compiler>
<ResourceCompiler>
<Add directory="$(ProjectRootDir)/NewGUI" />
</ResourceCompiler>
<Linker>
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --libs`" />
<Add library="$(SvnRootDir)/deps/zlib-dev.a" />
</Linker>
</Target>
<Target title="Release">
<Option platforms="Windows;Unix;" />
<Option output="$(SvnRootDir)/bin/pcsx2" prefix_auto="1" extension_auto="1" />
<Option working_dir="$(SvnRootDir)/bin/" />
<Option object_output="./.objs/Release" />
<Option type="0" />
<Option compiler="gcc" />
<Compiler>
<Add option="-O2" />
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=no --cflags`" />
<Add option="-DNDEBUG" />
</Compiler>
<ResourceCompiler>
<Add directory="$(ProjectRootDir)/NewGUI" />
</ResourceCompiler>
<Linker>
<Add option="-s" />
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=no --libs`" />
<Add library="$(SvnRootDir)/deps/zlib.a" />
</Linker>
</Target>
<Environment>
<Variable name="SvnRootDir" value="../../" />
<Variable name="ProjectRootDir" value='&quot;$(SvnRootDir)/pcsx2/&quot;' />
<Variable name="CommonDir" value='&quot;$(SvnRootDir)/common/&quot;' />
</Environment>
</Build>
<Compiler>
<Add option="-march=athlon" />
<Add option="-march=pentium4" />
<Add option="-fno-guess-branch-probability" />
<Add option="-fno-dse -fno-tree-dse" />
<Add option="-DWX_PRECOMP" />
<Add option="-D_DEBUG" />
<Add directory="$(SvnRootDir)/common/include/" />
<Add directory="$(SvnRootDir)/3rdparty/" />
<Add directory="$(ProjectRootDir)" />
<Add directory="$(ProjectRootDir)/NewGUI" />
<Add directory="$(ProjectRootDir)/x86" />
</Compiler>
<Linker>
<Add option="-Xlinker -zmuldefs" />
</Linker>
<Unit filename="../../common/include/Pcsx2Config.h" />
<Unit filename="../../common/include/Pcsx2Defs.h" />
<Unit filename="../../common/include/Pcsx2Types.h" />
<Unit filename="../AlignedMalloc.cpp" />
<Unit filename="../CDVD.cpp" />
<Unit filename="../CDVD.h" />
<Unit filename="../CDVDiso.cpp" />
<Unit filename="../CDVDiso.h" />
<Unit filename="../CDVDisodrv.cpp" />
<Unit filename="../CDVDisodrv.h" />
<Unit filename="../COP0.cpp" />
<Unit filename="../COP2.cpp" />
<Unit filename="../Cache.cpp" />
<Unit filename="../Cache.h" />
<Unit filename="../CdRom.cpp" />
<Unit filename="../CdRom.h" />
<Unit filename="../Common.h" />
<Unit filename="../Config.h" />
<Unit filename="../Console.cpp" />
<Unit filename="../Counters.cpp" />
<Unit filename="../Counters.h" />
<Unit filename="../DebugTools/Debug.h" />
<Unit filename="../DebugTools/DisASM.h" />
<Unit filename="../DebugTools/DisR3000A.cpp" />
<Unit filename="../DebugTools/DisR3000asm.cpp" />
<Unit filename="../DebugTools/DisR5900.cpp" />
<Unit filename="../DebugTools/DisR5900asm.cpp" />
<Unit filename="../DebugTools/DisVU0Micro.cpp" />
<Unit filename="../DebugTools/DisVU1Micro.cpp" />
<Unit filename="../DebugTools/DisVUmicro.h" />
<Unit filename="../DebugTools/DisVUops.h" />
<Unit filename="../Docs/ChangeLog.txt" />
<Unit filename="../Docs/License.txt" />
<Unit filename="../Docs/PS2Edefs.txt" />
<Unit filename="../Docs/RemoteDebugging.txt" />
<Unit filename="../Docs/devblog.txt" />
<Unit filename="../Docs/readme 0.9.4.txt" />
<Unit filename="../Docs/readme Playground.txt" />
<Unit filename="../Dump.cpp" />
<Unit filename="../Dump.h" />
<Unit filename="../EEregs.h" />
<Unit filename="../Elfheader.cpp" />
<Unit filename="../Elfheader.h" />
<Unit filename="../Exceptions.cpp" />
<Unit filename="../Exceptions.h" />
<Unit filename="../FPU.cpp" />
<Unit filename="../FiFo.cpp" />
<Unit filename="../GS.cpp" />
<Unit filename="../GS.h" />
<Unit filename="../Gif.cpp" />
<Unit filename="../HashMap.h" />
<Unit filename="../HostGui.h" />
<Unit filename="../Hw.cpp" />
<Unit filename="../Hw.h" />
<Unit filename="../HwRead.cpp" />
<Unit filename="../HwWrite.cpp" />
<Unit filename="../IPU/IPU.cpp" />
<Unit filename="../IPU/IPU.h" />
<Unit filename="../IPU/acoroutine.S" />
<Unit filename="../IPU/coroutine.cpp" />
<Unit filename="../IPU/coroutine.h" />
<Unit filename="../IPU/mpeg2lib/Idct.cpp" />
<Unit filename="../IPU/mpeg2lib/Mpeg.cpp" />
<Unit filename="../IPU/mpeg2lib/Mpeg.h" />
<Unit filename="../IPU/mpeg2lib/Vlc.h" />
<Unit filename="../IPU/yuv2rgb.cpp" />
<Unit filename="../IPU/yuv2rgb.h" />
<Unit filename="../Interpreter.cpp" />
<Unit filename="../IopBios.cpp" />
<Unit filename="../IopBios.h" />
<Unit filename="../IopBios2.h" />
<Unit filename="../IopCommon.h" />
<Unit filename="../IopCounters.cpp" />
<Unit filename="../IopCounters.h" />
<Unit filename="../IopDma.cpp" />
<Unit filename="../IopDma.h" />
<Unit filename="../IopHw.cpp" />
<Unit filename="../IopHw.h" />
<Unit filename="../IopMem.cpp" />
<Unit filename="../IopMem.h" />
<Unit filename="../IopSio2.cpp" />
<Unit filename="../IopSio2.h" />
<Unit filename="../Linux/HostGui.cpp" />
<Unit filename="../Linux/LnxMisc.cpp" />
<Unit filename="../Linux/LnxThreads.cpp" />
<Unit filename="../Linux/memzero.h" />
<Unit filename="../MMI.cpp" />
<Unit filename="../MTGS.cpp" />
<Unit filename="../MemcpyFast.h" />
<Unit filename="../Memory.cpp" />
<Unit filename="../Memory.h" />
<Unit filename="../MemoryCard.cpp" />
<Unit filename="../MemoryCard.h" />
<Unit filename="../Misc.cpp" />
<Unit filename="../Misc.h" />
<Unit filename="../NakedAsm.h" />
<Unit filename="../NewGUI/AboutBoxDialog.cpp" />
<Unit filename="../NewGUI/AboutBoxDialog.h" />
<Unit filename="../NewGUI/App.h" />
<Unit filename="../NewGUI/AppConfig.cpp" />
<Unit filename="../NewGUI/CheckedStaticBox.cpp" />
<Unit filename="../NewGUI/CheckedStaticBox.h" />
<Unit filename="../NewGUI/ConsoleLogger.cpp" />
<Unit filename="../NewGUI/GameFixesDialog.cpp" />
<Unit filename="../NewGUI/GameFixesDialog.h" />
<Unit filename="../NewGUI/HostGui.cpp" />
<Unit filename="../NewGUI/IniInterface.cpp" />
<Unit filename="../NewGUI/IniInterface.h" />
<Unit filename="../NewGUI/LogOptionsDialog.cpp" />
<Unit filename="../NewGUI/LogOptionsDialog.h" />
<Unit filename="../NewGUI/MainFrame.cpp" />
<Unit filename="../NewGUI/MainFrame.h" />
<Unit filename="../NewGUI/main.cpp" />
<Unit filename="../NewGUI/wxHelpers.cpp" />
<Unit filename="../NewGUI/wxHelpers.h" />
<Unit filename="../Patch.cpp" />
<Unit filename="../Patch.h" />
<Unit filename="../PathUtils.cpp" />
<Unit filename="../Paths.h" />
<Unit filename="../Plugins.cpp" />
<Unit filename="../Plugins.h" />
<Unit filename="../PrecompiledHeader.cpp" />
<Unit filename="../PrecompiledHeader.h" />
<Unit filename="../R3000A.cpp" />
<Unit filename="../R3000A.h" />
<Unit filename="../R3000AInterpreter.cpp" />
<Unit filename="../R3000AOpcodeTables.cpp" />
<Unit filename="../R5900.cpp" />
<Unit filename="../R5900.h" />
<Unit filename="../R5900Exceptions.h" />
<Unit filename="../R5900OpcodeImpl.cpp" />
<Unit filename="../R5900OpcodeTables.cpp" />
<Unit filename="../R5900OpcodeTables.h" />
<Unit filename="../RecoverySystem.cpp" />
<Unit filename="../RedtapeWindows.h" />
<Unit filename="../Resources/AppIcon.h" />
<Unit filename="../Resources/BackgroundLogo.h" />
<Unit filename="../Resources/EmbeddedImage.h" />
<Unit filename="../Resources/ps2_silver.h" />
<Unit filename="../SPR.cpp" />
<Unit filename="../SPR.h" />
<Unit filename="../SafeArray.h" />
<Unit filename="../SamplProf.h" />
<Unit filename="../SaveState.cpp" />
<Unit filename="../SaveState.h" />
<Unit filename="../Saveslots.cpp" />
<Unit filename="../Sif.cpp" />
<Unit filename="../Sif.h" />
<Unit filename="../Sifcmd.h" />
<Unit filename="../Sio.cpp" />
<Unit filename="../Sio.h" />
<Unit filename="../SourceLog.cpp" />
<Unit filename="../Stats.cpp" />
<Unit filename="../Stats.h" />
<Unit filename="../StringUtils.cpp" />
<Unit filename="../StringUtils.h" />
<Unit filename="../System.cpp" />
<Unit filename="../System.h" />
<Unit filename="../ThreadTools.cpp" />
<Unit filename="../Threading.h" />
<Unit filename="../Utilities/AsciiFile.h" />
<Unit filename="../Utilities/FileUtils.cpp" />
<Unit filename="../Utilities/folderdesc.txt" />
<Unit filename="../VU.h" />
<Unit filename="../VU0.cpp" />
<Unit filename="../VU0micro.cpp" />
<Unit filename="../VU0microInterp.cpp" />
<Unit filename="../VU1micro.cpp" />
<Unit filename="../VU1microInterp.cpp" />
<Unit filename="../VUflags.cpp" />
<Unit filename="../VUflags.h" />
<Unit filename="../VUmicro.h" />
<Unit filename="../VUmicroMem.cpp" />
<Unit filename="../VUops.cpp" />
<Unit filename="../VUops.h" />
<Unit filename="../Vif.cpp" />
<Unit filename="../Vif.h" />
<Unit filename="../VifDma.cpp" />
<Unit filename="../VifDma.h" />
<Unit filename="../pcsxAbout.bmp" />
<Unit filename="../rdebug/deci2.cpp">
<Option target="&lt;{~None~}&gt;" />
</Unit>
<Unit filename="../rdebug/deci2.h">
<Option target="&lt;{~None~}&gt;" />
</Unit>
<Unit filename="../rdebug/deci2_dbgp.cpp">
<Option target="&lt;{~None~}&gt;" />
</Unit>
<Unit filename="../rdebug/deci2_dbgp.h">
<Option target="&lt;{~None~}&gt;" />
</Unit>
<Unit filename="../rdebug/deci2_dcmp.cpp">
<Option target="&lt;{~None~}&gt;" />
</Unit>
<Unit filename="../rdebug/deci2_dcmp.h">
<Option target="&lt;{~None~}&gt;" />
</Unit>
<Unit filename="../rdebug/deci2_drfp.h">
<Option target="&lt;{~None~}&gt;" />
</Unit>
<Unit filename="../rdebug/deci2_iloadp.cpp">
<Option target="&lt;{~None~}&gt;" />
</Unit>
<Unit filename="../rdebug/deci2_iloadp.h">
<Option target="&lt;{~None~}&gt;" />
</Unit>
<Unit filename="../rdebug/deci2_netmp.cpp">
<Option target="&lt;{~None~}&gt;" />
</Unit>
<Unit filename="../rdebug/deci2_netmp.h">
<Option target="&lt;{~None~}&gt;" />
</Unit>
<Unit filename="../rdebug/deci2_ttyp.cpp">
<Option target="&lt;{~None~}&gt;" />
</Unit>
<Unit filename="../rdebug/deci2_ttyp.h">
<Option target="&lt;{~None~}&gt;" />
</Unit>
<Unit filename="../tinyxml/tinystr.cpp" />
<Unit filename="../tinyxml/tinystr.h" />
<Unit filename="../tinyxml/tinyxml.cpp" />
<Unit filename="../tinyxml/tinyxml.h" />
<Unit filename="../tinyxml/tinyxmlerror.cpp" />
<Unit filename="../tinyxml/tinyxmlparser.cpp" />
<Unit filename="../vssprintf.cpp" />
<Unit filename="../vtlb.cpp" />
<Unit filename="../vtlb.h" />
<Unit filename="../x86/BaseblockEx.cpp" />
<Unit filename="../x86/BaseblockEx.h" />
<Unit filename="../x86/aMicroVU.S">
<Option target="&lt;{~None~}&gt;" />
</Unit>
<Unit filename="../x86/aR3000A.S" />
<Unit filename="../x86/aVUzerorec.S" />
<Unit filename="../x86/aVif.S" />
<Unit filename="../x86/fast_routines.S" />
<Unit filename="../x86/iCOP0.cpp" />
<Unit filename="../x86/iCOP0.h" />
<Unit filename="../x86/iCOP2.cpp" />
<Unit filename="../x86/iCore.cpp" />
<Unit filename="../x86/iCore.h" />
<Unit filename="../x86/iFPU.cpp" />
<Unit filename="../x86/iFPU.h" />
<Unit filename="../x86/iFPUd.cpp" />
<Unit filename="../x86/iMMI.cpp" />
<Unit filename="../x86/iMMI.h" />
<Unit filename="../x86/iR3000A.cpp" />
<Unit filename="../x86/iR3000A.h" />
<Unit filename="../x86/iR3000Atables.cpp" />
<Unit filename="../x86/iR5900.h" />
<Unit filename="../x86/iR5900Arit.h" />
<Unit filename="../x86/iR5900AritImm.h" />
<Unit filename="../x86/iR5900Branch.h" />
<Unit filename="../x86/iR5900Jump.h" />
<Unit filename="../x86/iR5900LoadStore.h" />
<Unit filename="../x86/iR5900Misc.cpp" />
<Unit filename="../x86/iR5900Move.h" />
<Unit filename="../x86/iR5900MultDiv.h" />
<Unit filename="../x86/iR5900Shift.h" />
<Unit filename="../x86/iVU0micro.cpp" />
<Unit filename="../x86/iVU1micro.cpp" />
<Unit filename="../x86/iVUmicro.cpp" />
<Unit filename="../x86/iVUmicro.h" />
<Unit filename="../x86/iVUmicroLower.cpp" />
<Unit filename="../x86/iVUmicroUpper.cpp" />
<Unit filename="../x86/iVUops.h" />
<Unit filename="../x86/iVUzerorec.cpp" />
<Unit filename="../x86/iVUzerorec.h" />
<Unit filename="../x86/iVif.cpp" />
<Unit filename="../x86/ir5900tables.cpp" />
<Unit filename="../x86/ix86-32/aR5900-32.S" />
<Unit filename="../x86/ix86-32/iCore-32.cpp" />
<Unit filename="../x86/ix86-32/iR5900-32.cpp" />
<Unit filename="../x86/ix86-32/iR5900Arit.cpp" />
<Unit filename="../x86/ix86-32/iR5900AritImm.cpp" />
<Unit filename="../x86/ix86-32/iR5900Branch.cpp" />
<Unit filename="../x86/ix86-32/iR5900Jump.cpp" />
<Unit filename="../x86/ix86-32/iR5900LoadStore.cpp" />
<Unit filename="../x86/ix86-32/iR5900Move.cpp" />
<Unit filename="../x86/ix86-32/iR5900MultDiv.cpp" />
<Unit filename="../x86/ix86-32/iR5900Shift.cpp" />
<Unit filename="../x86/ix86-32/iR5900Templates.cpp" />
<Unit filename="../x86/ix86-32/recVTLB.cpp" />
<Unit filename="../x86/ix86/implement/dwshift.h" />
<Unit filename="../x86/ix86/implement/group1.h" />
<Unit filename="../x86/ix86/implement/group2.h" />
<Unit filename="../x86/ix86/implement/group3.h" />
<Unit filename="../x86/ix86/implement/incdec.h" />
<Unit filename="../x86/ix86/implement/jmpcall.h" />
<Unit filename="../x86/ix86/implement/movs.h" />
<Unit filename="../x86/ix86/implement/test.h" />
<Unit filename="../x86/ix86/implement/xchg.h" />
<Unit filename="../x86/ix86/implement/xmm/arithmetic.h" />
<Unit filename="../x86/ix86/implement/xmm/basehelpers.h" />
<Unit filename="../x86/ix86/implement/xmm/comparisons.h" />
<Unit filename="../x86/ix86/implement/xmm/moremovs.h" />
<Unit filename="../x86/ix86/implement/xmm/shufflepack.h" />
<Unit filename="../x86/ix86/ix86.cpp" />
<Unit filename="../x86/ix86/ix86.h" />
<Unit filename="../x86/ix86/ix86_3dnow.cpp" />
<Unit filename="../x86/ix86/ix86_cpudetect.cpp" />
<Unit filename="../x86/ix86/ix86_fpu.cpp" />
<Unit filename="../x86/ix86/ix86_inlines.inl" />
<Unit filename="../x86/ix86/ix86_instructions.h" />
<Unit filename="../x86/ix86/ix86_internal.h" />
<Unit filename="../x86/ix86/ix86_jmp.cpp" />
<Unit filename="../x86/ix86/ix86_legacy.cpp" />
<Unit filename="../x86/ix86/ix86_legacy_instructions.h" />
<Unit filename="../x86/ix86/ix86_legacy_internal.h" />
<Unit filename="../x86/ix86/ix86_legacy_sse.cpp" />
<Unit filename="../x86/ix86/ix86_legacy_types.h" />
<Unit filename="../x86/ix86/ix86_simd.cpp" />
<Unit filename="../x86/ix86/ix86_sse_helpers.h" />
<Unit filename="../x86/ix86/ix86_tools.cpp" />
<Unit filename="../x86/ix86/ix86_types.h" />
<Unit filename="../x86/ix86/ix86_writers.inl" />
<Unit filename="../x86/microVU.cpp" />
<Unit filename="../x86/microVU.h" />
<Unit filename="../x86/microVU_Alloc.h" />
<Unit filename="../x86/microVU_Alloc.inl" />
<Unit filename="../x86/microVU_Analyze.inl" />
<Unit filename="../x86/microVU_Compile.inl" />
<Unit filename="../x86/microVU_Execute.inl" />
<Unit filename="../x86/microVU_Log.inl" />
<Unit filename="../x86/microVU_Lower.inl" />
<Unit filename="../x86/microVU_Misc.h" />
<Unit filename="../x86/microVU_Misc.inl" />
<Unit filename="../x86/microVU_Tables.inl" />
<Unit filename="../x86/microVU_Upper.inl" />
<Unit filename="../xmlpatchloader.cpp" />
<Extensions>
<envvars />
<code_completion>
<search_path add="/usr/include/wx-2.8" />
</code_completion>
<lib_finder disable_auto="1" />
<debugger />
</Extensions>
</Project>
</CodeBlocks_project_file>

2
pcsx2/Memory.cpp
View File

@ -93,7 +93,7 @@ void loadBiosRom( const wxChar *ext, u8 *dest, long maxSize )
// Try first a basic extension concatenation (normally results in something like name.bin.rom1)
const wxString Bios( g_Conf.Files.Bios() );
Bios1.Printf( wxS("%s.%s"), Bios.c_str(), ext);
Bios1.Printf( wxT("%s.%s"), Bios.c_str(), ext);
if( (filesize=Path::GetFileSize( Bios1 ) ) <= 0 )
{

2
pcsx2/Misc.cpp
View File

@ -283,7 +283,7 @@ void SaveGSState(const wxString& file)
if( g_SaveGSStream ) return;
Console::WriteLn( "Saving GS State..." );
Console::WriteLn( "\t%s", params file.mb_str() );
Console::WriteLn( wxsFormat( L"\t%s", file.c_str() ) );
g_fGSSave = new gzSavingState( file );

2
pcsx2/NakedAsm.h
View File

@ -20,7 +20,7 @@
#ifndef NAKED_ASM_H
#define NAKED_ASM_H
#include "coroutine.h"
#include "IPU/coroutine.h"
// Common to Windows and Linux
extern "C"

2
pcsx2/NewGUI/Makefile.am
View File

@ -7,7 +7,7 @@ bin_PROGRAMS = pcsx2
pcsx2_SOURCES = \
CheckedStaticBox.cpp ConsoleLogger.cpp MainFrame.cpp wxHelpers.cpp AppConfig.cpp main.cpp \
App.h CheckedStaticBox.h MainFrame.h wxHelpers.h \
AboutBoxDialog.cpp GameFixesDialog.cpp LogOptionsDialog.cpp \
IniInterface.cpp AboutBoxDialog.cpp GameFixesDialog.cpp LogOptionsDialog.cpp \
AboutBoxDialog.h GameFixesDialog.h LogOptionsDialog.h
pcsx2_LDFLAGS =

4
pcsx2/PrecompiledHeader.h
View File

@ -1,9 +1,5 @@
#pragma once
#ifndef _PCSX2_PRECOMPILED_HEADER_
#define _PCSX2_PRECOMPILED_HEADER_
#endif // pragma once
//////////////////////////////////////////////////////////////////////////////////////////
// Microsoft specific STL extensions for bounds checking and stuff: Enabled in devbuilds,
// disabled in release builds. :)

2
pcsx2/Saveslots.cpp
View File

@ -105,7 +105,7 @@ void States_Load(int num)
}
catch( Exception::StateLoadError_Recoverable& ex)
{
Console::Notice( wxsFormat( L"Could not load savestate slot %d.\n\n%s", num, ex.LogMessage() ) );
Console::Notice( wxsFormat( L"Could not load savestate slot %d.\n\n%s", num, ex.LogMessage().c_str() ) );
// At this point the cpu hasn't been reset, so we can return
// control to the user safely... (that's why we use a console notice instead of a popup)

8
pcsx2/vssprintf.cpp
View File

@ -748,9 +748,11 @@ repeat:
else
{
s32 num;
if (qualifier == 'h')
num = va_arg(args, s16);
else // 'l' qualifier or no qualifier means 32 bits on all our std target platforms.
// Modern 32 bit compilers pass parameters into va_arg by 32 bit scale always,
// so no point in using or checking for the 'h' parameter.
/*if (qualifier == 'h')
num = va_arg(args, int);
else*/ // 'l' qualifier or no qualifier means 32 bits on all our std target platforms.
num = va_arg(args, s32);
number(dest, num, base, field_width, precision, flags);

20
pcsx2/vtlb.cpp
View File

@ -346,17 +346,17 @@ vtlbHandler vtlb_RegisterHandler( vtlbMemR8FP* r8,vtlbMemR16FP* r16,vtlbMemR32FP
//write the code :p
vtlbHandler rv=vtlbHandlerCount++;
vtlbdata.RWFT[0][0][rv] = (r8!=0) ? r8:vtlbDefaultPhyRead8;
vtlbdata.RWFT[1][0][rv] = (r16!=0) ? r16:vtlbDefaultPhyRead16;
vtlbdata.RWFT[2][0][rv] = (r32!=0) ? r32:vtlbDefaultPhyRead32;
vtlbdata.RWFT[3][0][rv] = (r64!=0) ? r64:vtlbDefaultPhyRead64;
vtlbdata.RWFT[4][0][rv] = (r128!=0) ? r128:vtlbDefaultPhyRead128;
vtlbdata.RWFT[0][0][rv] = (r8!=0) ? (void*)r8:(void*)vtlbDefaultPhyRead8;
vtlbdata.RWFT[1][0][rv] = (r16!=0) ? (void*)r16:(void*)vtlbDefaultPhyRead16;
vtlbdata.RWFT[2][0][rv] = (r32!=0) ? (void*)r32:(void*)vtlbDefaultPhyRead32;
vtlbdata.RWFT[3][0][rv] = (r64!=0) ? (void*)r64:(void*)vtlbDefaultPhyRead64;
vtlbdata.RWFT[4][0][rv] = (r128!=0) ? (void*)r128:(void*)vtlbDefaultPhyRead128;
vtlbdata.RWFT[0][1][rv] = (w8!=0) ? w8:vtlbDefaultPhyWrite8;
vtlbdata.RWFT[1][1][rv] = (w16!=0) ? w16:vtlbDefaultPhyWrite16;
vtlbdata.RWFT[2][1][rv] = (w32!=0) ? w32:vtlbDefaultPhyWrite32;
vtlbdata.RWFT[3][1][rv] = (w64!=0) ? w64:vtlbDefaultPhyWrite64;
vtlbdata.RWFT[4][1][rv] = (w128!=0) ? w128:vtlbDefaultPhyWrite128;
vtlbdata.RWFT[0][1][rv] = (void*)((w8!=0) ? w8:vtlbDefaultPhyWrite8);
vtlbdata.RWFT[1][1][rv] = (void*)((w16!=0) ? w16:vtlbDefaultPhyWrite16);
vtlbdata.RWFT[2][1][rv] = (void*)((w32!=0) ? w32:vtlbDefaultPhyWrite32);
vtlbdata.RWFT[3][1][rv] = (void*)((w64!=0) ? w64:vtlbDefaultPhyWrite64);
vtlbdata.RWFT[4][1][rv] = (void*)((w128!=0) ? w128:vtlbDefaultPhyWrite128);
return rv;
}

23
pcsx2/x86/iR3000A.cpp
View File

@ -119,10 +119,8 @@ static void iIopDumpBlock( int startpc, u8 * ptr )
Console::WriteLn( "dump1 %x:%x, %x", params startpc, psxpc, psxRegs.cycle );
Path::CreateDirectory( L"dumps" );
AsciiFile f(
Path::Combine( g_Conf.Folders.Dumps, wxsFormat( L"psxdump%.8X.txt", startpc ) ),
wxFile::write
);
wxString filename( Path::Combine( g_Conf.Folders.Dumps, wxsFormat( L"psxdump%.8X.txt", startpc ) ) );
AsciiFile f( filename, wxFile::write );
for ( i = startpc; i < s_nEndBlock; i += 4 ) {
f.Printf("%s\n", disR3000Fasm( iopMemRead32( i ), i ) );
@ -169,14 +167,17 @@ static void iIopDumpBlock( int startpc, u8 * ptr )
#ifdef __LINUX__
char command[256];
// dump the asm
f = fopen( "mydump1", "wb" );
fwrite( ptr, 1, (uptr)x86Ptr - (uptr)ptr, f );
fclose( f );
sprintf( command, "objdump -D --target=binary --architecture=i386 -M intel mydump1 | cat %s - > tempdump", filename );
{
AsciiFile f2( L"mydump1", wxFile::write );
f2.Write( ptr, (uptr)x86Ptr - (uptr)ptr );
}
wxCharBuffer buf( filename.ToAscii() );
const char* filenamea = buf.data();
sprintf( command, "objdump -D --target=binary --architecture=i386 -M intel mydump1 | cat %s - > tempdump", filenamea );
system( command );
sprintf(command, "mv tempdump %s", filename);
system(command);
f = fopen( filename.c_str(), "a+" );
sprintf( command, "mv tempdump %s", filenamea );
system( command );
//f = fopen( filename.c_str(), "a+" );
#endif
}
#endif

4
pcsx2/x86/ix86/implement/xmm/moremovs.h
View File

@ -67,8 +67,8 @@ public:
template< u8 Prefix, bool isAligned >
class SimdImpl_MoveSSE
{
static const u16 OpcodeA = 0x28; // Aligned [aps] form
static const u16 OpcodeU = 0x10; // unaligned [ups] form
static const uint OpcodeA = 0x28; // Aligned [aps] form
static const uint OpcodeU = 0x10; // unaligned [ups] form
public:
SimdImpl_MoveSSE() {} //GCC.

4
pcsx2/x86/microVU.h
View File

@ -136,11 +136,7 @@ microVUt(void) mVUcacheProg(microVU* mVU, int progIndex);
void* __fastcall mVUexecuteVU0(u32 startPC, u32 cycles);
void* __fastcall mVUexecuteVU1(u32 startPC, u32 cycles);
#ifndef __LINUX__
typedef void (__fastcall *mVUrecCall)(u32, u32);
#else
typedef void (*mVUrecCall)(u32, u32) __attribute__((__fastcall)); // Not sure if this is correct syntax (should be close xD)
#endif
// Include all the *.inl files (Needed because C++ sucks with templates and *.cpp files)
#include "microVU_Misc.inl"

2
pcsx2/xmlpatchloader.cpp
View File

@ -85,7 +85,7 @@ int LoadPatch( const wxString& crc )
}
else
{
Console::WriteLn("XML Patch Loader: '%s' Found", params pfile);
Console::WriteLn("XML Patch Loader: '%s' Found", params pfile.c_str() );
}
TiXmlNode *root = doc.FirstChild("GAME");