Merge branch 'master' into powerpc

Conflicts:

	makefile
	src/assembler.h
	src/binaryToMacho.cpp
	src/compile.cpp
	src/compiler.cpp
	src/x86.cpp

src/common.h

@@ -287,6 +287,15 @@ difference(void* a, void* b)
   return reinterpret_cast<intptr_t>(a) - reinterpret_cast<intptr_t>(b);
 }
 
+template <class T>
+inline void*
+voidPointer(T function)
+{
+  void* p;
+  memcpy(&p, &function, sizeof(void*));
+  return p;
+}
+
 class Machine;
 class Thread;