3 files changed, 56 insertions, 2 deletions
diff --git a/Source/Library/Common/Mutex.class.cpp b/Source/Library/Common/Mutex.class.cpp
index 2e9a63c..d7d7ead 100644
--- a/Source/Library/Common/Mutex.class.cpp
+++ b/Source/Library/Common/Mutex.class.cpp
@@ -41,5 +41,5 @@ void Mutex::unlock() {
 }
 
 bool Mutex::locked() {
-	return m_locked;
+	return m_locked == MUTEX_TRUE;
 }
diff --git a/Source/Library/Common/Rand.ns.cpp b/Source/Library/Common/Rand.ns.cpp
index e568678..6323ccc 100644
--- a/Source/Library/Common/Rand.ns.cpp
+++ b/Source/Library/Common/Rand.ns.cpp
@@ -7,7 +7,7 @@ u64int current = RANDOM_SEED;
 
 u64int rand() {
 	current = (u32int)(a*current + b);
-	while (current > m) current -= m;
+	if (current > m) current = current % m;
 	return current;
 }
 
diff --git a/Source/Library/Common/cppsupport.wtf.cpp b/Source/Library/Common/cppsupport.wtf.cpp
new file mode 100644
index 0000000..06ef1b9
--- /dev/null
+++ b/Source/Library/Common/cppsupport.wtf.cpp
@@ -0,0 +1,54 @@
+//This file just contains a few methods required for some C++ things to work
+#include <types.h>
+
+namespace CMem {
+	u8int* memcpy(u8int*, const u8int*, int);
+};
+
+using namespace CMem;
+
+extern "C" void __cxa_pure_virtual() {}	//Required when using abstract classes
+
+void *__dso_handle;		//Required when using global objects
+extern "C" int __cxa_atexit(void (*f)(void*), void *p, void *d) { return 0; }
+
+extern "C" void * memmove(void* dst, const void* src, size_t len) {
+	memcpy((u8int*)dst, (const u8int*)src, len);
+	return dst;
+}
+
+//Functions for quad divisions/modulo. Taken and arranged from klibc include/asm/div64.h
+//These only work with 32-bit divisors and only return 32-bit remainder.
+//TODO : think of some correct quad div/mod algorithms
+inline u64int doDiv(u64int dividend, u32int divisor, u32int *remainder) {
+	union {
+		u64int v64;
+		u32int v32[2];
+	} d = { dividend };
+	u32int upper;
+
+	upper = d.v32[1];
+	d.v32[1] = 0;
+	if (upper >= divisor) {
+		d.v32[1] = upper / divisor;
+		upper %= divisor;
+	}
+	asm ("divl %2" : "=a" (d.v32[0]), "=d" (*remainder) :
+			"rm" (divisor), "0" (d.v32[0]), "1" (upper));
+	return d.v64;
+}
+
+extern "C" {
+u64int __udivdi3(u64int dividend, u64int b) {
+	u32int divisor, remainder;
+	divisor = b;
+	return doDiv(dividend, divisor, &remainder);
+}
+
+u64int __umoddi3(u64int dividend, u64int b) {
+	u32int divisor, remainder;
+	divisor = b;
+	doDiv(dividend, divisor, &remainder);
+	return remainder;
+}
+}