Scripting: Add boolean type

mgba-emu · Jul 1, 2022 · d053058 · d053058
1 parent fa985d5
commit d053058
Show file tree

Hide file tree

Showing 6 changed files with 370 additions and 14 deletions.
diff --git a/include/mgba/script/macros.h b/include/mgba/script/macros.h
@@ -459,6 +459,7 @@ CXX_GUARD_START
 #define mSCRIPT_MAKE_S64(VALUE) mSCRIPT_MAKE(S64, VALUE)
 #define mSCRIPT_MAKE_U64(VALUE) mSCRIPT_MAKE(U64, VALUE)
 #define mSCRIPT_MAKE_F64(VALUE) mSCRIPT_MAKE(F64, VALUE)
+#define mSCRIPT_MAKE_BOOL(VALUE) mSCRIPT_MAKE(BOOL, VALUE)
 #define mSCRIPT_MAKE_CHARP(VALUE) mSCRIPT_MAKE(CHARP, VALUE)
 #define mSCRIPT_MAKE_S(STRUCT, VALUE) mSCRIPT_MAKE(S(STRUCT), VALUE)
 #define mSCRIPT_MAKE_CS(STRUCT, VALUE) mSCRIPT_MAKE(CS(STRUCT), VALUE)

diff --git a/include/mgba/script/types.h b/include/mgba/script/types.h
@@ -27,6 +27,7 @@ CXX_GUARD_START
 #define mSCRIPT_TYPE_C_S64 int64_t
 #define mSCRIPT_TYPE_C_U64 uint64_t
 #define mSCRIPT_TYPE_C_F64 double
+#define mSCRIPT_TYPE_C_BOOL bool
 #define mSCRIPT_TYPE_C_STR struct mScriptString*
 #define mSCRIPT_TYPE_C_CHARP const char*
 #define mSCRIPT_TYPE_C_PTR void*
@@ -55,6 +56,7 @@ CXX_GUARD_START
 #define mSCRIPT_TYPE_FIELD_S64 s64
 #define mSCRIPT_TYPE_FIELD_U64 u64
 #define mSCRIPT_TYPE_FIELD_F64 f64
+#define mSCRIPT_TYPE_FIELD_BOOL u32
 #define mSCRIPT_TYPE_FIELD_STR string
 #define mSCRIPT_TYPE_FIELD_CHARP copaque
 #define mSCRIPT_TYPE_FIELD_PTR opaque
@@ -82,6 +84,7 @@ CXX_GUARD_START
 #define mSCRIPT_TYPE_MS_S64 (&mSTSInt64)
 #define mSCRIPT_TYPE_MS_U64 (&mSTUInt64)
 #define mSCRIPT_TYPE_MS_F64 (&mSTFloat64)
+#define mSCRIPT_TYPE_MS_BOOL (&mSTBool)
 #define mSCRIPT_TYPE_MS_STR (&mSTString)
 #define mSCRIPT_TYPE_MS_CHARP (&mSTCharPtr)
 #define mSCRIPT_TYPE_MS_LIST (&mSTList)
@@ -109,6 +112,7 @@ CXX_GUARD_START
 #define mSCRIPT_TYPE_CMP_U64(TYPE) mSCRIPT_TYPE_CMP_GENERIC(mSCRIPT_TYPE_MS_U64, TYPE)
 #define mSCRIPT_TYPE_CMP_S64(TYPE) mSCRIPT_TYPE_CMP_GENERIC(mSCRIPT_TYPE_MS_S64, TYPE)
 #define mSCRIPT_TYPE_CMP_F64(TYPE) mSCRIPT_TYPE_CMP_GENERIC(mSCRIPT_TYPE_MS_F64, TYPE)
+#define mSCRIPT_TYPE_CMP_BOOL(TYPE) mSCRIPT_TYPE_CMP_GENERIC(mSCRIPT_TYPE_MS_BOOL, TYPE)
 #define mSCRIPT_TYPE_CMP_STR(TYPE) mSCRIPT_TYPE_CMP_GENERIC(mSCRIPT_TYPE_MS_STR, TYPE)
 #define mSCRIPT_TYPE_CMP_CHARP(TYPE) mSCRIPT_TYPE_CMP_GENERIC(mSCRIPT_TYPE_MS_CHARP, TYPE)
 #define mSCRIPT_TYPE_CMP_LIST(TYPE) mSCRIPT_TYPE_CMP_GENERIC(mSCRIPT_TYPE_MS_LIST, TYPE)
@@ -165,6 +169,7 @@ extern const struct mScriptType mSTFloat32;
 extern const struct mScriptType mSTSInt64;
 extern const struct mScriptType mSTUInt64;
 extern const struct mScriptType mSTFloat64;
+extern const struct mScriptType mSTBool;
 extern const struct mScriptType mSTString;
 extern const struct mScriptType mSTCharPtr;
 extern const struct mScriptType mSTList;
@@ -329,6 +334,7 @@ bool mScriptPopF32(struct mScriptList* list, float* out);
 bool mScriptPopS64(struct mScriptList* list, int64_t* out);
 bool mScriptPopU64(struct mScriptList* list, uint64_t* out);
 bool mScriptPopF64(struct mScriptList* list, double* out);
+bool mScriptPopBool(struct mScriptList* list, bool* out);
 bool mScriptPopPointer(struct mScriptList* list, void** out);
 
 bool mScriptCast(const struct mScriptType* type, const struct mScriptValue* input, struct mScriptValue* output);

diff --git a/src/core/scripting.c b/src/core/scripting.c
@@ -413,9 +413,9 @@ static void _mScriptCoreTakeScreenshot(struct mCore* core, const char* filename)
 }
 
 // Loading functions
-mSCRIPT_DECLARE_STRUCT_METHOD(mCore, S32, loadFile, mCoreLoadFile, 1, CHARP, path);
-mSCRIPT_DECLARE_STRUCT_METHOD(mCore, S32, autoloadSave, mCoreAutoloadSave, 0);
-mSCRIPT_DECLARE_STRUCT_METHOD(mCore, S32, loadSaveFile, mCoreLoadSaveFile, 2, CHARP, path, S8, temporary);
+mSCRIPT_DECLARE_STRUCT_METHOD(mCore, BOOL, loadFile, mCoreLoadFile, 1, CHARP, path);
+mSCRIPT_DECLARE_STRUCT_METHOD(mCore, BOOL, autoloadSave, mCoreAutoloadSave, 0);
+mSCRIPT_DECLARE_STRUCT_METHOD(mCore, BOOL, loadSaveFile, mCoreLoadSaveFile, 2, CHARP, path, BOOL, temporary);
 
 // Info functions
 mSCRIPT_DECLARE_STRUCT_CD_METHOD(mCore, S32, platform, 0);
@@ -454,12 +454,12 @@ mSCRIPT_DECLARE_STRUCT_METHOD(mCore, WSTR, readRegister, _mScriptCoreReadRegiste
 mSCRIPT_DECLARE_STRUCT_VOID_METHOD(mCore, writeRegister, _mScriptCoreWriteRegister, 2, CHARP, regName, S32, value);
 
 // Savestate functions
-mSCRIPT_DECLARE_STRUCT_METHOD_WITH_DEFAULTS(mCore, S32, saveStateSlot, mCoreSaveState, 2, S32, slot, S32, flags);
+mSCRIPT_DECLARE_STRUCT_METHOD_WITH_DEFAULTS(mCore, BOOL, saveStateSlot, mCoreSaveState, 2, S32, slot, S32, flags);
 mSCRIPT_DECLARE_STRUCT_METHOD_WITH_DEFAULTS(mCore, WSTR, saveStateBuffer, _mScriptCoreSaveState, 1, S32, flags);
-mSCRIPT_DECLARE_STRUCT_METHOD_WITH_DEFAULTS(mCore, S32, saveStateFile, _mScriptCoreSaveStateFile, 2, CHARP, path, S32, flags);
-mSCRIPT_DECLARE_STRUCT_METHOD_WITH_DEFAULTS(mCore, S32, loadStateSlot, mCoreLoadState, 2, S32, slot, S32, flags);
-mSCRIPT_DECLARE_STRUCT_METHOD_WITH_DEFAULTS(mCore, S32, loadStateBuffer, _mScriptCoreLoadState, 2, STR, buffer, S32, flags);
-mSCRIPT_DECLARE_STRUCT_METHOD_WITH_DEFAULTS(mCore, S32, loadStateFile, _mScriptCoreLoadStateFile, 2, CHARP, path, S32, flags);
+mSCRIPT_DECLARE_STRUCT_METHOD_WITH_DEFAULTS(mCore, BOOL, saveStateFile, _mScriptCoreSaveStateFile, 2, CHARP, path, S32, flags);
+mSCRIPT_DECLARE_STRUCT_METHOD_WITH_DEFAULTS(mCore, BOOL, loadStateSlot, mCoreLoadState, 2, S32, slot, S32, flags);
+mSCRIPT_DECLARE_STRUCT_METHOD_WITH_DEFAULTS(mCore, BOOL, loadStateBuffer, _mScriptCoreLoadState, 2, STR, buffer, S32, flags);
+mSCRIPT_DECLARE_STRUCT_METHOD_WITH_DEFAULTS(mCore, BOOL, loadStateFile, _mScriptCoreLoadStateFile, 2, CHARP, path, S32, flags);
 
 // Miscellaneous functions
 mSCRIPT_DECLARE_STRUCT_VOID_METHOD_WITH_DEFAULTS(mCore, screenshot, _mScriptCoreTakeScreenshot, 1, CHARP, filename);

diff --git a/src/script/engines/lua.c b/src/script/engines/lua.c
@@ -335,8 +335,8 @@ struct mScriptValue* _luaCoerce(struct mScriptEngineContextLua* luaContext, bool
 		value->value.f64 = lua_tonumber(luaContext->lua, -1);
 		break;
 	case LUA_TBOOLEAN:
-		value = mScriptValueAlloc(mSCRIPT_TYPE_MS_S32);
-		value->value.s32 = lua_toboolean(luaContext->lua, -1);
+		value = mScriptValueAlloc(mSCRIPT_TYPE_MS_BOOL);
+		value->value.u32 = lua_toboolean(luaContext->lua, -1);
 		break;
 	case LUA_TSTRING:
 		buffer = lua_tolstring(luaContext->lua, -1, &size);
@@ -414,7 +414,9 @@ bool _luaWrap(struct mScriptEngineContextLua* luaContext, struct mScriptValue* v
 		}
 		break;
 	case mSCRIPT_TYPE_UINT:
-		if (value->type->size <= 4) {
+		if (value->type == mSCRIPT_TYPE_MS_BOOL) {
+			lua_pushboolean(luaContext->lua, !!value->value.u32);
+		} else if (value->type->size <= 4) {
 			lua_pushinteger(luaContext->lua, value->value.u32);
 		} else if (value->type->size == 8) {
 			lua_pushinteger(luaContext->lua, value->value.u64);