Update to mGBA 0.7.0

Author: clobber

Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.6.3</string>
+	<string>0.7.0</string>
 	<key>NSPrincipalClass</key>
 	<string>OEGameCoreController</string>
 	<key>OEGameCoreClass</key>

include/mgba-util/arm-algo.h

@@ -7,12 +7,10 @@
 #define ARM_ALGO_H
 
 #ifdef __arm__
-void _to16Bit(uint16_t* dest, uint32_t* src, size_t words);
-
 #if defined(__ARM_NEON)
 void _neon2x(void* dest, void* src, int width, int height);
 void _neon4x(void* dest, void* src, int width, int height);
 #endif
 #endif
 
-#endif
+#endif

include/mgba-util/common.h

@@ -119,13 +119,13 @@ typedef intptr_t ssize_t;
 #define STORE_32LE(SRC, ADDR, ARR) { \
 	uint32_t _addr = (ADDR); \
 	void* _ptr = (ARR); \
-	__asm__("stwbrx %0, %1, %2" : : "r"(SRC), "b"(_ptr), "r"(_addr)); \
+	__asm__("stwbrx %0, %1, %2" : : "r"(SRC), "b"(_ptr), "r"(_addr) : "memory"); \
 }
 
 #define STORE_16LE(SRC, ADDR, ARR) { \
 	uint32_t _addr = (ADDR); \
 	void* _ptr = (ARR); \
-	__asm__("sthbrx %0, %1, %2" : : "r"(SRC), "b"(_ptr), "r"(_addr)); \
+	__asm__("sthbrx %0, %1, %2" : : "r"(SRC), "b"(_ptr), "r"(_addr) : "memory"); \
 }
 
 #define LOAD_64LE(DEST, ADDR, ARR) { \
@@ -136,12 +136,13 @@ typedef intptr_t ssize_t;
 			uint32_t lo; \
 		}; \
 		uint64_t b64; \
-	} *bswap = (void*) &DEST; \
+	} bswap; \
 	const void* _ptr = (ARR); \
 	__asm__( \
 		"lwbrx %0, %2, %3 \n" \
 		"lwbrx %1, %2, %4 \n" \
-		: "=r"(bswap->lo), "=r"(bswap->hi) : "b"(_ptr), "r"(_addr), "r"(_addr + 4)); \
+		: "=&r"(bswap.lo), "=&r"(bswap.hi) : "b"(_ptr), "r"(_addr), "r"(_addr + 4)) ; \
+	DEST = bswap.b64; \
 }
 
 #define STORE_64LE(SRC, ADDR, ARR) { \
@@ -152,12 +153,12 @@ typedef intptr_t ssize_t;
 			uint32_t lo; \
 		}; \
 		uint64_t b64; \
-	} *bswap = (void*) &SRC; \
+	} bswap = { .b64 = SRC }; \
 	const void* _ptr = (ARR); \
 	__asm__( \
 		"stwbrx %0, %2, %3 \n" \
 		"stwbrx %1, %2, %4 \n" \
-		: : "r"(bswap->hi), "r"(bswap->lo), "b"(_ptr), "r"(_addr), "r"(_addr + 4)); \
+		: : "r"(bswap.hi), "r"(bswap.lo), "b"(_ptr), "r"(_addr), "r"(_addr + 4) : "memory"); \
 }
 
 #elif defined(__llvm__) || (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)
@@ -177,8 +178,12 @@ typedef intptr_t ssize_t;
 #define STORE_64LE(SRC, ADDR, ARR) *(uint64_t*) ((uintptr_t) (ARR) + (size_t) (ADDR)) = SRC
 #define STORE_32LE(SRC, ADDR, ARR) *(uint32_t*) ((uintptr_t) (ARR) + (size_t) (ADDR)) = SRC
 #define STORE_16LE(SRC, ADDR, ARR) *(uint16_t*) ((uintptr_t) (ARR) + (size_t) (ADDR)) = SRC
+#ifdef _MSC_VER
+#define LOAD_32BE(DEST, ADDR, ARR) DEST = _byteswap_ulong(((uint32_t*) ARR)[(ADDR) >> 2])
+#else
 #define LOAD_32BE(DEST, ADDR, ARR) DEST = __builtin_bswap32(((uint32_t*) ARR)[(ADDR) >> 2])
 #endif
+#endif
 
 #define MAKE_MASK(START, END) (((1 << ((END) - (START))) - 1) << (START))
 #define CHECK_BITS(SRC, START, END) ((SRC) & MAKE_MASK(START, END))
@@ -191,9 +196,11 @@ typedef intptr_t ssize_t;
 #ifdef _MSC_VER
 #define ATTRIBUTE_UNUSED
 #define ATTRIBUTE_FORMAT(X, Y, Z)
+#define ATTRIBUTE_NOINLINE
 #else
 #define ATTRIBUTE_UNUSED __attribute__((unused))
 #define ATTRIBUTE_FORMAT(X, Y, Z) __attribute__((format(X, Y, Z)))
+#define ATTRIBUTE_NOINLINE __attribute__((noinline))
 #endif
 
 #define DECL_BITFIELD(NAME, TYPE) typedef TYPE NAME

include/mgba-util/crc32.h

@@ -12,8 +12,13 @@ CXX_GUARD_START
 
 struct VFile;
 
+#ifndef HAVE_CRC32
+uint32_t crc32(uint32_t crc, const void* buf, size_t size);
+#else
+#include <zlib.h>
+#endif
+
 uint32_t doCrc32(const void* buf, size_t size);
-uint32_t updateCrc32(uint32_t crc, const void* buf, size_t size);
 uint32_t fileCrc32(struct VFile* file, size_t endOffset);
 
 CXX_GUARD_END

include/mgba-util/elf-read.h

@@ -0,0 +1,45 @@
+/* Copyright (c) 2013-2017 Jeffrey Pfau
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+#ifndef ELF_READ_H
+#define ELF_READ_H
+
+#include <mgba-util/common.h>
+
+CXX_GUARD_START
+
+#ifdef USE_ELF
+
+#include <libelf.h>
+
+#include <mgba-util/vector.h>
+
+struct ELF;
+struct VFile;
+
+DECLARE_VECTOR(ELFProgramHeaders, Elf32_Phdr);
+DECLARE_VECTOR(ELFSectionHeaders, Elf32_Shdr);
+
+struct ELF* ELFOpen(struct VFile*);
+void ELFClose(struct ELF*);
+
+void* ELFBytes(struct ELF*, size_t* size);
+
+uint16_t ELFMachine(struct ELF*);
+uint32_t ELFEntry(struct ELF*);
+
+void ELFGetProgramHeaders(struct ELF*, struct ELFProgramHeaders*);
+
+size_t ELFFindSection(struct ELF*, const char* name);
+void ELFGetSectionHeaders(struct ELF*, struct ELFSectionHeaders*);
+Elf32_Shdr* ELFGetSectionHeader(struct ELF*, size_t index);
+
+const char* ELFGetString(struct ELF*, size_t section, size_t string);
+
+#endif
+
+CXX_GUARD_END
+
+#endif

include/mgba-util/formatting.h

@@ -12,8 +12,8 @@ CXX_GUARD_START
 
 #include "locale.h"
 
-#if defined(__APPLE__) || defined(__FreeBSD__)
-#include "xlocale.h"
+#ifdef HAVE_XLOCALE
+#include <xlocale.h>
 #elif !defined(HAVE_LOCALE)
 typedef const char* locale_t;
 #endif

include/mgba-util/gui.h

@@ -47,7 +47,8 @@ enum {
 	BATTERY_HIGH = 3,
 	BATTERY_FULL = 4,
 
-	BATTERY_CHARGING = 8
+	BATTERY_CHARGING = 8,
+	BATTERY_NOT_PRESENT = 16
 };
 
 struct GUIBackground {

include/mgba-util/gui/file-select.h

@@ -14,7 +14,7 @@ CXX_GUARD_START
 
 struct VFile;
 
-bool GUISelectFile(struct GUIParams*, char* outPath, size_t outLen, bool (*filter)(struct VFile*));
+bool GUISelectFile(struct GUIParams*, char* outPath, size_t outLen, bool (*filterName)(const char* name), bool (*filterContents)(struct VFile*));
 
 CXX_GUARD_END
 

include/mgba-util/gui/menu.h

@@ -12,12 +12,37 @@ CXX_GUARD_START
 
 #include <mgba-util/vector.h>
 
+#define GUI_V_V (struct GUIVariant) { .type = GUI_VARIANT_VOID }
+#define GUI_V_U(U) (struct GUIVariant) { .type = GUI_VARIANT_UNSIGNED, .v.u = (U) }
+#define GUI_V_I(I) (struct GUIVariant) { .type = GUI_VARIANT_INT, .v.i = (I) }
+#define GUI_V_F(F) (struct GUIVariant) { .type = GUI_VARIANT_FLOAT, .v.f = (F) }
+#define GUI_V_S(S) (struct GUIVariant) { .type = GUI_VARIANT_STRING, .v.s = (S) }
+
+enum GUIVariantType {
+	GUI_VARIANT_VOID = 0,
+	GUI_VARIANT_UNSIGNED,
+	GUI_VARIANT_INT,
+	GUI_VARIANT_FLOAT,
+	GUI_VARIANT_STRING
+};
+
+struct GUIVariant {
+	enum GUIVariantType type;
+	union {
+		unsigned u;
+		int i;
+		float f;
+		const char* s;
+	} v;
+};
+
 struct GUIMenu;
 struct GUIMenuItem {
 	const char* title;
 	void* data;
 	unsigned state;
 	const char* const* validStates;
+	const struct GUIVariant* stateMappings;
 	unsigned nStates;
 	struct GUIMenu* submenu;
 };

include/mgba-util/platform/3ds/threading.h

@@ -11,18 +11,9 @@
 #include <3ds.h>
 #include <malloc.h>
 
-#ifdef _3DS
-// ctrulib already has a type called Thread
-#define Thread CustomThread
-#endif
-
 #define THREAD_ENTRY void
 typedef ThreadFunc ThreadEntry;
 
-typedef struct {
-	Handle handle;
-	u8* stack;
-} Thread;
 typedef LightLock Mutex;
 typedef struct {
 	Mutex mutex;
@@ -103,22 +94,12 @@ static inline int ThreadCreate(Thread* thread, ThreadEntry entry, void* context)
 	if (!entry || !thread) {
 		return 1;
 	}
-	thread->stack = memalign(8, 0x8000);
-	if (!thread->stack) {
-		return 1;
-	}
-	bool isNew3DS;
-	APT_CheckNew3DS(&isNew3DS);
-	if (isNew3DS && svcCreateThread(&thread->handle, entry, (u32) context, (u32*) &thread->stack[0x8000], 0x18, 2) == 0) {
-		return 0;
-	}
-	return svcCreateThread(&thread->handle, entry, (u32) context, (u32*) &thread->stack[0x8000], 0x18, -1);
+	*thread = threadCreate(entry, context, 0x8000, 0x18, 2, true);
+	return !*thread;
 }
 
 static inline int ThreadJoin(Thread thread) {
-	svcWaitSynchronization(thread.handle, U64_MAX);
-	free(thread.stack);
-	return 0;
+	return threadJoin(thread, U64_MAX);
 }
 
 static inline void ThreadSetName(const char* name) {

include/mgba-util/platform/switch/threading.h

@@ -0,0 +1,87 @@
+/* Copyright (c) 2013-2018 Jeffrey Pfau
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+#ifndef SWITCH_THREADING_H
+#define SWITCH_THREADING_H
+
+#include <mgba-util/common.h>
+
+#include <switch.h>
+
+#define THREAD_ENTRY void
+typedef ThreadFunc ThreadEntry;
+typedef CondVar Condition;
+
+static inline int MutexInit(Mutex* mutex) {
+	mutexInit(mutex);
+	return 0;
+}
+
+static inline int MutexDeinit(Mutex* mutex) {
+	UNUSED(mutex);
+	return 0;
+}
+
+static inline int MutexLock(Mutex* mutex) {
+	mutexLock(mutex);
+	return 0;
+}
+
+static inline int MutexTryLock(Mutex* mutex) {
+	return mutexTryLock(mutex);
+}
+
+static inline int MutexUnlock(Mutex* mutex) {
+	mutexUnlock(mutex);
+	return 0;
+}
+
+static inline int ConditionInit(Condition* cond) {
+	condvarInit(cond);
+	return 0;
+}
+
+static inline int ConditionDeinit(Condition* cond) {
+	UNUSED(cond);
+	return 0;
+}
+
+static inline int ConditionWait(Condition* cond, Mutex* mutex) {
+	return condvarWait(cond, mutex);
+}
+
+static inline int ConditionWaitTimed(Condition* cond, Mutex* mutex, int32_t timeoutMs) {
+	return condvarWaitTimeout(cond, mutex, timeoutMs * 1000000LL);
+}
+
+static inline int ConditionWake(Condition* cond) {
+	return condvarWakeOne(cond);
+}
+
+static inline int ThreadCreate(Thread* thread, ThreadEntry entry, void* context) {
+	if (!entry || !thread) {
+		return 1;
+	}
+	int res = threadCreate(thread, entry, context, 0x8000, 0x3B, 1);
+	if(R_FAILED(res)) {
+		return res;
+	}
+	return threadStart(thread);
+}
+
+static inline int ThreadJoin(Thread thread) {
+	int res = threadWaitForExit(&thread);
+	if(R_FAILED(res)) {
+		return res;
+	}
+	return threadClose(&thread);
+}
+
+static inline void ThreadSetName(const char* name) {
+	UNUSED(name);
+	// Unimplemented
+}
+
+#endif

include/mgba-util/png-io.h

@@ -26,9 +26,11 @@ enum {
 
 png_structp PNGWriteOpen(struct VFile* source);
 png_infop PNGWriteHeader(png_structp png, unsigned width, unsigned height);
+png_infop PNGWriteHeaderA(png_structp png, unsigned width, unsigned height);
 png_infop PNGWriteHeader8(png_structp png, unsigned width, unsigned height);
 bool PNGWritePalette(png_structp png, png_infop info, const uint32_t* palette, unsigned entries);
 bool PNGWritePixels(png_structp png, unsigned width, unsigned height, unsigned stride, const void* pixels);
+bool PNGWritePixelsA(png_structp png, unsigned width, unsigned height, unsigned stride, const void* pixels);
 bool PNGWritePixels8(png_structp png, unsigned width, unsigned height, unsigned stride, const void* pixels);
 bool PNGWriteCustomChunk(png_structp png, const char* name, size_t size, void* data);
 void PNGWriteClose(png_structp png, png_infop info);
@@ -40,6 +42,8 @@ png_structp PNGReadOpen(struct VFile* source, unsigned offset);
 bool PNGInstallChunkHandler(png_structp png, void* context, ChunkHandler handler, const char* chunkName);
 bool PNGReadHeader(png_structp png, png_infop info);
 bool PNGReadPixels(png_structp png, png_infop info, void* pixels, unsigned width, unsigned height, unsigned stride);
+bool PNGReadPixelsA(png_structp png, png_infop info, void* pixels, unsigned width, unsigned height, unsigned stride);
+bool PNGReadPixels8(png_structp png, png_infop info, void* pixels, unsigned width, unsigned height, unsigned stride);
 bool PNGIgnorePixels(png_structp png, png_infop info);
 bool PNGReadFooter(png_structp png, png_infop end);
 void PNGReadClose(png_structp png, png_infop info, png_infop end);

include/mgba-util/ring-fifo.h

@@ -20,6 +20,7 @@ struct RingFIFO {
 void RingFIFOInit(struct RingFIFO* buffer, size_t capacity);
 void RingFIFODeinit(struct RingFIFO* buffer);
 size_t RingFIFOCapacity(const struct RingFIFO* buffer);
+size_t RingFIFOSize(const struct RingFIFO* buffer);
 void RingFIFOClear(struct RingFIFO* buffer);
 size_t RingFIFOWrite(struct RingFIFO* buffer, const void* value, size_t length);
 size_t RingFIFORead(struct RingFIFO* buffer, void* output, size_t length);