summaryrefslogtreecommitdiff
path: root/Source/Core/Common
diff options
context:
space:
mode:
authorhrydgard <hrydgard@gmail.com>2008-08-08 19:46:04 +0000
committerhrydgard <hrydgard@gmail.com>2008-08-08 19:46:04 +0000
commit9626b3bc42d336e5ac6efc56cacbfbbdb947c2da (patch)
treefd6341bd25d220dfd14553d4293974dc2412afa7 /Source/Core/Common
parentc8c1d2d905e4ff1e0265e43f767464648f100363 (diff)
Fix shader cache bugs, improving linux speed. Remove some unnecessary printfs.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@153 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/Common')
-rw-r--r--Source/Core/Common/Src/Common.h13
-rw-r--r--Source/Core/Common/Src/DynamicLibrary.cpp6
-rw-r--r--Source/Core/Common/Src/MemoryUtil.cpp4
3 files changed, 9 insertions, 14 deletions
diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h
index ddee157b53..043d051433 100644
--- a/Source/Core/Common/Src/Common.h
+++ b/Source/Core/Common/Src/Common.h
@@ -100,15 +100,10 @@ typedef union _LARGE_INTEGER
} LARGE_INTEGER;
#endif
-#if defined (__MINGW32__) || defined (_WIN32)
-#define GC_ALIGNED16(x) __declspec(align(16)) x
-#define GC_ALIGNED16_DECL(x) x
-#else
-#define GC_ALIGNED16(x) x
-#define GC_ALIGNED64(x) x
-#define GC_ALIGNED16_DECL(x) x __attribute((aligned(16)))
-#define GC_ALIGNED64_DECL(x) x
-#endif
+#define GC_ALIGNED16(x) __attribute((aligned(16))) x
+#define GC_ALIGNED64(x) __attribute((aligned(64))) x
+#define GC_ALIGNED16_DECL(x) __attribute((aligned(16))) x
+#define GC_ALIGNED64_DECL(x) __attribute((aligned(64))) x
#ifndef __forceinline
#define __forceinline inline
diff --git a/Source/Core/Common/Src/DynamicLibrary.cpp b/Source/Core/Common/Src/DynamicLibrary.cpp
index 8097e16a2c..407dcc494b 100644
--- a/Source/Core/Common/Src/DynamicLibrary.cpp
+++ b/Source/Core/Common/Src/DynamicLibrary.cpp
@@ -86,7 +86,7 @@ bool DynamicLibrary::Load(const char* filename)
if (library) {
library_file = filename;
}
- return(library != 0);
+ return library != 0;
}
@@ -121,14 +121,14 @@ void* DynamicLibrary::Get(const char* funcname) const
//PanicAlert("Did not find function %s in library %s.", funcname, library_file.c_str());
//}
- return(retval);
+ return retval;
#else
retval = dlsym(library, funcname);
if (!retval)
{
- printf("%s\n", dlerror());
+ printf("Symbol %s missing in %s (error: %s)\n", funcname, library_file.c_str(), dlerror());
}
#endif
}
diff --git a/Source/Core/Common/Src/MemoryUtil.cpp b/Source/Core/Common/Src/MemoryUtil.cpp
index bd94eaf012..39e550452e 100644
--- a/Source/Core/Common/Src/MemoryUtil.cpp
+++ b/Source/Core/Common/Src/MemoryUtil.cpp
@@ -58,7 +58,7 @@ void* AllocateExecutableMemory(int size, bool low)
| (low ? MAP_32BIT : 0)
#endif
, -1, 0); // | MAP_FIXED
- printf("mappah exe %p %i\n", retval, size);
+ // printf("Mapped executable memory at %p (size %i)\n", retval, size);
if (!retval)
{
@@ -86,7 +86,7 @@ void* AllocateMemoryPages(int size)
#else
void* retval = mmap(0, size, PROT_READ | PROT_WRITE,
MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); // | MAP_FIXED
- printf("mappah %p %i\n", retval, size);
+ // printf("Mapped memory at %p (size %i)\n", retval, size);
if (!retval)
{