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

A few quick changes to get Linux compiling again. And the 0x8000000 in vtlb_malloc does turn out to be neccessary... 

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@669 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
arcum42 2009-01-31 03:01:47 +00:00 committed by Gregory Hainaut
parent 5fbaf63663
commit 7adb8c864f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/Linux/Linux.h
View File

@ -84,12 +84,14 @@ extern void SaveConfig();
/* GtkGui */
extern void init_widgets();
extern MemoryAlloc<u8>* g_RecoveryState;
extern bool g_GameInProgress;
extern void SysRestorableReset();
extern void SysDetect();
extern void RunExecute( const char* elf_file, bool use_bios = false);
extern void ExecuteCpu();
extern bool g_ReturnToGui; // set to exit the execution of the emulator and return control to the GUI
extern bool g_EmulationInProgress; // Set TRUE if a game is actively running (set to false on reset)
typedef struct {
char lang[g_MaxPath];
} _langs;

2
pcsx2/vtlb.cpp
View File

@ -571,7 +571,7 @@ void vtlb_Term()
u8* vtlb_malloc( uint size, uint align, uptr tryBaseAddress )
{
#ifdef __LINUX__
return SysMmap( tryBaseAddress, size, "Vtlb" );
return SysMmap( tryBaseAddress, size, 0x80000000, "Vtlb" );
#else
// Win32 just needs this, since malloc always maps below 2GB.
return (u8*)_aligned_malloc(size, align);