Core: Add some utility functions

src/core/core.c

@@ -9,9 +9,6 @@
 #include "core/serialize.h"
 #include "util/vfs.h"
 
-#if !defined(MINIMAL_CORE) || MINIMAL_CORE < 2
-#include "util/png-io.h"
-
 #ifdef M_CORE_GB
 #include "gb/core.h"
 #include "gb/gb.h"
@@ -21,26 +18,59 @@
 #include "gba/gba.h"
 #endif
 
+static struct mCoreFilter {
+	bool (*filter)(struct VFile*);
+	struct mCore* (*open)(void);
+	enum mPlatform platform;
+} _filters[] = {
+#ifdef M_CORE_GBA
+	{ GBAIsROM, GBACoreCreate, PLATFORM_GBA },
+#endif
+#ifdef M_CORE_GB
+	{ GBIsROM, GBCoreCreate, PLATFORM_GB },
+#endif
+	{ 0, 0, PLATFORM_NONE }
+};
+
+struct mCore* mCoreFindVF(struct VFile* vf) {
+	if (!vf) {
+		return NULL;
+	}
+	struct mCoreFilter* filter;
+	for (filter = &_filters[0]; filter->filter; ++filter) {
+		if (filter->filter(vf)) {
+			break;
+		}
+	}
+	if (filter->open) {
+		return filter->open();
+	}
+	return NULL;
+}
+
+enum mPlatform mCoreIsCompatible(struct VFile* vf) {
+	if (!vf) {
+		return false;
+	}
+	struct mCoreFilter* filter;
+	for (filter = &_filters[0]; filter->filter; ++filter) {
+		if (filter->filter(vf)) {
+			return filter->platform;
+		}
+	}
+	return PLATFORM_NONE;
+}
+
+#if !defined(MINIMAL_CORE) || MINIMAL_CORE < 2
+#include "util/png-io.h"
+
 #ifdef PSP2
 #include <psp2/photoexport.h>
 #endif
 
-static struct mCoreFilter {
-	bool (*filter)(struct VFile*);
-	struct mCore* (*open)(void);
-} _filters[] = {
-#ifdef M_CORE_GBA
-	{ GBAIsROM, GBACoreCreate },
-#endif
-#ifdef M_CORE_GB
-	{ GBIsROM, GBCoreCreate },
-#endif
-	{ 0, 0 }
-};
-
 struct mCore* mCoreFind(const char* path) {
 	struct VDir* archive = VDirOpenArchive(path);
-	struct mCore* (*open)(void) = NULL;
+	struct mCore* core = NULL;
 	if (archive) {
 		struct VDirEntry* dirent = archive->listNext(archive);
 		while (dirent) {
@@ -49,15 +79,9 @@ struct mCore* mCoreFind(const char* path) {
 				dirent = archive->listNext(archive);
 				continue;
 			}
-			struct mCoreFilter* filter;
+			core = mCoreFindVF(vf);
-			for (filter = &_filters[0]; filter->filter; ++filter) {
-				if (filter->filter(vf)) {
-					break;
-				}
-			}
 			vf->close(vf);
-			if (filter->open) {
+			if (core) {
-				open = filter->open;
 				break;
 			}
 			dirent = archive->listNext(archive);
@@ -68,19 +92,11 @@ struct mCore* mCoreFind(const char* path) {
 		if (!vf) {
 			return NULL;
 		}
-		struct mCoreFilter* filter;
+		core = mCoreFindVF(vf);
-		for (filter = &_filters[0]; filter->filter; ++filter) {
-			if (filter->filter(vf)) {
-				break;
-			}
-		}
 		vf->close(vf);
-		if (filter->open) {
-			open = filter->open;
-		}
 	}
-	if (open) {
+	if (core) {
-		return open();
+		return core;
 	}
 	return NULL;
 }

src/core/core.h

@@ -142,6 +142,9 @@ void mCoreDeleteState(struct mCore* core, int slot);
 void mCoreTakeScreenshot(struct mCore* core);
 #endif
 
+struct mCore* mCoreFindVF(struct VFile* vf);
+enum mPlatform mCoreIsCompatible(struct VFile* vf);
+
 void mCoreInitConfig(struct mCore* core, const char* port);
 void mCoreLoadConfig(struct mCore* core);
 void mCoreLoadForeignConfig(struct mCore* core, const struct mCoreConfig* config);

src/platform/libretro/libretro.c

@@ -294,17 +294,7 @@ bool retro_load_game(const struct retro_game_info* game) {
 		return false;
 	}
 
-	core = NULL;
+	core = mCoreFindVF(rom);
-#ifdef M_CORE_GBA
-	if (!core && GBAIsROM(rom)) {
-		core = GBACoreCreate();
-	}
-#endif
-#ifdef M_CORE_GB
-	if (!core && GBIsROM(rom)) {
-		core = GBCoreCreate();
-	}
-#endif
 	if (!core) {
 		rom->close(rom);
 		mappedMemoryFree(data, game->size);