[turbine] Add some type safety to application data

src/olympic/turbine/include/turbine/context.hpp

@@ -37,15 +37,37 @@ inline ox::FileSystem *rom(Context &ctx) noexcept {
 	return keelCtx(ctx).rom.get();
 }
 
-void setApplicationData(Context &ctx, void *applicationData) noexcept;
+struct WrapBase {
+	virtual ~WrapBase() = default;
+};
+
+template<typename T>
+struct Wrap: public WrapBase {
+	T *data{};
+};
+
+void setApplicationDataRaw(Context &ctx, void *applicationData) noexcept;
+
+template<typename T>
+void setApplicationData(Context &ctx, T *applicationData) noexcept {
+	Wrap<T> w;
+	w.data = applicationData;
+	setApplicationDataRaw(ctx, &w);
+}
 
 [[nodiscard]]
-void *applicationDataRaw(Context &ctx) noexcept;
+WrapBase *applicationDataRaw(Context &ctx) noexcept;
 
 template<typename T>
 [[nodiscard]]
 T *applicationData(Context &ctx) noexcept {
-	return static_cast<T*>(applicationDataRaw(ctx));
+#ifdef OX_BARE_METAL
+	return static_cast<Wrap<T>*>(applicationDataRaw(ctx))->data;
+#else
+	auto const out = dynamic_cast<Wrap<T>*>(applicationDataRaw(ctx));
+	oxAssert(out, "Cast failed - wrong type");
+	return out->data;
+#endif
 }
 
 void setKeyEventHandler(Context &ctx, KeyEventHandler h) noexcept;

src/olympic/turbine/src/gba/context.cpp

@@ -18,12 +18,20 @@ keel::Context &keelCtx(Context &ctx) noexcept {
 	return ctx.keelCtx;
 }
 
-void setApplicationData(Context &ctx, void *applicationData) noexcept {
+void setApplicationDataRaw(Context &ctx, void const*applicationData) noexcept {
-	ctx.applicationData = applicationData;
+	if (applicationData) {
+		ctx.applicationData.emplace();
+		memcpy(&ctx.applicationData.value(), applicationData, sizeof(Wrap<void>));
+	} else {
+		ctx.applicationData.reset();
+	}
 }
 
-void *applicationDataRaw(Context &ctx) noexcept {
+WrapBase *applicationDataRaw(Context &ctx) noexcept {
-	return ctx.applicationData;
+	if (!ctx.applicationData) {
+		return nullptr;
+	}
+	return std::bit_cast<WrapBase*>(&*ctx.applicationData);
 }
 
 }

src/olympic/turbine/src/gba/context.hpp

@@ -17,7 +17,7 @@ class Context {
 		UpdateHandler updateHandler = [](Context&) -> int {return 0;};
 		keel::Context keelCtx;
 		KeyEventHandler keyEventHandler = nullptr;
-		void *applicationData = nullptr;
+		ox::Optional<std::array<char, sizeof(WrapBase) + sizeof(uintptr_t)>> applicationData;
 
 		// GBA impl data /////////////////////////////////////////////////////////
 		bool running = true;

src/olympic/turbine/src/glfw/context.cpp

@@ -20,12 +20,20 @@ keel::Context &keelCtx(Context &ctx) noexcept {
 	return ctx.keelCtx;
 }
 
-void setApplicationData(Context &ctx, void *applicationData) noexcept {
+void setApplicationDataRaw(Context &ctx, void *applicationData) noexcept {
-	ctx.applicationData = applicationData;
+	if (applicationData) {
+		ctx.applicationData.emplace();
+		memcpy(&ctx.applicationData.value(), applicationData, sizeof(Wrap<void>));
+	} else {
+		ctx.applicationData.reset();
+	}
 }
 
-void *applicationDataRaw(Context &ctx) noexcept {
+WrapBase *applicationDataRaw(Context &ctx) noexcept {
-	return ctx.applicationData;
+	if (!ctx.applicationData) {
+		return nullptr;
+	}
+	return std::bit_cast<WrapBase*>(&*ctx.applicationData);
 }
 
 }

src/olympic/turbine/src/glfw/context.hpp

@@ -16,7 +16,7 @@ class Context {
 		UpdateHandler updateHandler = [](Context&) -> int {return 0;};
 		keel::Context keelCtx;
 		KeyEventHandler keyEventHandler = nullptr;
-		void *applicationData = nullptr;
+		ox::Optional<std::array<char, sizeof(WrapBase) + sizeof(uintptr_t)>> applicationData;
 
 		// GLFW impl data ////////////////////////////////////////////////////////
 		int uninterruptedRefreshes = 3;