Sysdep code for Android/ARM

This was SVN commit r11075.

source/lib/sysdep/arch/arm/arm.cpp

@@ -0,0 +1,64 @@
+/* Copyright (c) 2012 Wildfire Games
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * routines specific to ARM
+ */
+
+#include "precompiled.h"
+
+#include "lib/sysdep/cpu.h"
+
+#include <android/log.h>
+intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment)
+{
+	return __sync_fetch_and_add(location, increment);
+}
+
+bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue)
+{
+	return __sync_bool_compare_and_swap(location, expected, newValue);
+}
+
+bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue)
+{
+	// Current versions of GCC don't implement this on ARM:
+	//   return __sync_bool_compare_and_swap(location, expected, newValue);
+	
+	// http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=40fb79c8a88625504857d44de1bc89dc0341e618
+	// adds support for
+	//   return __kernel_cmpxchg64(&expected, &newValue, (long long*)location) == 0;
+	// but only for Linux kernel 3.1
+	
+	// Maybe we can do it with user-space assembly assuming a modern-enough CPU?
+	// That sounds non-trivial so let's just cheat
+#warning TODO: atomic cpu_CAS64 on ARM
+	if (*location != expected)
+		return false;
+	*location = newValue;
+	return true;
+}
+
+const char* cpu_IdentifierString()
+{
+	return "unknown"; // TODO
+}

source/lib/sysdep/os/android/android.cpp

@@ -0,0 +1,63 @@
+/* Copyright (c) 2012 Wildfire Games
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "precompiled.h"
+
+#include "lib/sysdep/sysdep.h"
+
+Status sys_clipboard_set(const wchar_t* UNUSED(text))
+{
+	return INFO::OK;
+}
+
+wchar_t* sys_clipboard_get()
+{
+	return NULL;
+}
+
+Status sys_clipboard_free(wchar_t* UNUSED(copy))
+{
+	return INFO::OK;
+}
+
+namespace gfx {
+
+Status GetVideoMode(int* xres, int* yres, int* bpp, int* freq)
+{
+#warning TODO: implement gfx::GetVideoMode properly for Android
+
+	if(xres)
+		*xres = 800;
+
+	if(yres)
+		*yres = 480;
+
+	if(bpp)
+		*bpp = 32;
+
+	if(freq)
+		*freq = 0;
+
+	return INFO::OK;
+}
+
+}

source/main.cpp

@@ -540,6 +540,7 @@ static void RunGameOrAtlas(int argc, const char* argv[])
 // so rename main() to a different symbol that the wrapper library can load
 #undef main
 #define main pyrogenesis_main
+extern "C" __attribute__((visibility ("default"))) int main(int argc, char* argv[]);
 #endif
 
 extern "C" int main(int argc, char* argv[])