More linux work. Getting a bit closer, but JIT does still not work.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@119 8ced0084-cf51-0410-be5f-012b33b47a6e

5 files changed, 10 insertions, 6 deletions

diff --git a/Source/Core/Common/Src/ABI.cpp b/Source/Core/Common/Src/ABI.cpp
index 78162f61f9..e45b93fbe2 100644
--- a/Source/Core/Common/Src/ABI.cpp
+++ b/Source/Core/Common/Src/ABI.cpp
@@ -134,4 +134,5 @@ void ABI_PopAllCalleeSavedRegsAndAdjustStack() {
 

 #endif

 

-#endif
\ No newline at end of file
+#endif

+

diff --git a/Source/Core/Common/Src/ABI.h b/Source/Core/Common/Src/ABI.h
index 5bfcae59e1..3386913834 100644
--- a/Source/Core/Common/Src/ABI.h
+++ b/Source/Core/Common/Src/ABI.h
@@ -52,7 +52,6 @@
 

 // === 32-bit bog standard cdecl, shared between linux and windows ============================

 // MacOSX 32-bit is same as System V with a few exceptions that we probably don't care much about.

-

 #else

 // 64 bit calling convention

 

@@ -63,7 +62,6 @@
 #define ABI_PARAM2 RDX

 #define ABI_PARAM3 R8

 #define ABI_PARAM4 R9

-

 #else

 // === 64-bit Unix (hopefully MacOSX too) =====================================================

 

@@ -91,4 +89,5 @@ void ABI_CallFunctionR(void *func, Gen::X64Reg reg1);
 void ABI_PushAllCalleeSavedRegsAndAdjustStack();

 void ABI_PopAllCalleeSavedRegsAndAdjustStack();

 

-#endif  // _JIT_ABI_H
\ No newline at end of file
+#endif  // _JIT_ABI_H

+

diff --git a/Source/Core/Common/Src/Common.cpp b/Source/Core/Common/Src/Common.cpp
index 3b562a717c..0cce42c703 100644
--- a/Source/Core/Common/Src/Common.cpp
+++ b/Source/Core/Common/Src/Common.cpp
@@ -52,6 +52,7 @@ void PanicAlert(const char* format, ...)
 		//#error Do a messagebox!

 		vprintf(format, args);

 		printf("\n");

+        asm ("int $3") ;

 #endif

 	}

 

diff --git a/Source/Core/Common/Src/MemArena.cpp b/Source/Core/Common/Src/MemArena.cpp
index 11a87d524c..6753ebb851 100644
--- a/Source/Core/Common/Src/MemArena.cpp
+++ b/Source/Core/Common/Src/MemArena.cpp
@@ -40,7 +40,6 @@ void MemArena::GrabLowMemSpace(size_t size)
 	ftruncate(fd, size);

 	return;

 #endif

-

 }

 

 

diff --git a/Source/Core/Common/Src/MemoryUtil.cpp b/Source/Core/Common/Src/MemoryUtil.cpp
index 5b6ff6f11b..d5681481d3 100644
--- a/Source/Core/Common/Src/MemoryUtil.cpp
+++ b/Source/Core/Common/Src/MemoryUtil.cpp
@@ -53,7 +53,11 @@ void* AllocateExecutableMemory(int size)
 

 #else

 	void* retval = mmap(0, size, PROT_READ | PROT_WRITE | PROT_EXEC,

-			MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);  // | MAP_FIXED

+		MAP_ANONYMOUS | MAP_PRIVATE

+#ifdef __x86_64__

+		 | MAP_32BIT 	

+#endif

+         , -1, 0);  // | MAP_FIXED

 	printf("mappah exe %p %i\n", retval, size);

 

 	if (!retval)