From a4ac678154a7b6bc7e15513f00f0e248d09cb7e0 Mon Sep 17 00:00:00 2001
From: Deukhoofd <Deukhoofd@gmail.com>
Date: Sun, 22 May 2022 13:00:53 +0200
Subject: [PATCH] Adds a lot more WASM type registry

---
 .../Library/WASMAbilityRegistry.cpp           |  13 ++++++++++++
 .../Library/WASMAbilityRegistry.hpp           |  10 +++++++++
 .../Library/WASMEffectParameter.cpp           |  16 ++++++++++++++
 .../Library/WASMEffectParameter.hpp           |  10 +++++++++
 .../Library/WASMFormeRegistry.hpp             |   3 +--
 .../WASM/InterfaceMethods/TypeRegistry.hpp    |  10 +++++++--
 .../WASM/InterfaceMethods/WASMHelperFile.hpp  |   8 ++++++-
 .../InterfaceMethods/WASMListRegistry.cpp     |  20 ++++++++++++++++++
 .../InterfaceMethods/WASMListRegistry.hpp     |  10 +++++++++
 .../WASM/InterfaceMethods/WASMStringView.cpp  |   4 ++--
 .../{pkmn_lib.wit => pkmn_lib_host.wit}       |  15 ++++++++-----
 .../WASM/WebAssemblyBattleScript.cpp          |   7 +++---
 tests/ScriptTests/WASM/gen7_scripts_rs.wasm   | Bin 28446 -> 32142 bytes
 13 files changed, 111 insertions(+), 15 deletions(-)
 create mode 100644 src/ScriptResolving/WASM/InterfaceMethods/Library/WASMAbilityRegistry.cpp
 create mode 100644 src/ScriptResolving/WASM/InterfaceMethods/Library/WASMAbilityRegistry.hpp
 create mode 100644 src/ScriptResolving/WASM/InterfaceMethods/Library/WASMEffectParameter.cpp
 create mode 100644 src/ScriptResolving/WASM/InterfaceMethods/Library/WASMEffectParameter.hpp
 create mode 100644 src/ScriptResolving/WASM/InterfaceMethods/WASMListRegistry.cpp
 create mode 100644 src/ScriptResolving/WASM/InterfaceMethods/WASMListRegistry.hpp
 rename src/ScriptResolving/WASM/InterfaceMethods/{pkmn_lib.wit => pkmn_lib_host.wit} (93%)

diff --git a/src/ScriptResolving/WASM/InterfaceMethods/Library/WASMAbilityRegistry.cpp b/src/ScriptResolving/WASM/InterfaceMethods/Library/WASMAbilityRegistry.cpp
new file mode 100644
index 0000000..0b01454
--- /dev/null
+++ b/src/ScriptResolving/WASM/InterfaceMethods/Library/WASMAbilityRegistry.cpp
@@ -0,0 +1,13 @@
+#include "WASMAbilityRegistry.hpp"
+#include "../WASMHelperFile.hpp"
+#include "wasm.h"
+
+using namespace CreatureLib::Library;
+using namespace PkmnLib::Library;
+
+void WASMAbilityRegistry::Register(ArbUt::Dictionary<std::string, wasm_func_t*>& externs,
+                                   WebAssemblyScriptResolver* resolver) {
+    REGISTER_GETTER("ability_get_name", Talent, GetName, resolver);
+    REGISTER_GETTER("ability_get_effect", Talent, GetEffect, resolver);
+    REGISTER_GETTER("ability_get_parameters", Talent, GetParameters, resolver);
+}
diff --git a/src/ScriptResolving/WASM/InterfaceMethods/Library/WASMAbilityRegistry.hpp b/src/ScriptResolving/WASM/InterfaceMethods/Library/WASMAbilityRegistry.hpp
new file mode 100644
index 0000000..75e4837
--- /dev/null
+++ b/src/ScriptResolving/WASM/InterfaceMethods/Library/WASMAbilityRegistry.hpp
@@ -0,0 +1,10 @@
+#ifndef PKMNLIB_WASMABILITYREGISTRY_HPP
+#define PKMNLIB_WASMABILITYREGISTRY_HPP
+#include "../../WebAssemblyScriptResolver.hpp"
+
+class WASMAbilityRegistry {
+public:
+    static void Register(ArbUt::Dictionary<std::string, wasm_func_t*>& externs, WebAssemblyScriptResolver* resolver);
+};
+
+#endif // PKMNLIB_WASMABILITYREGISTRY_HPP
diff --git a/src/ScriptResolving/WASM/InterfaceMethods/Library/WASMEffectParameter.cpp b/src/ScriptResolving/WASM/InterfaceMethods/Library/WASMEffectParameter.cpp
new file mode 100644
index 0000000..612e105
--- /dev/null
+++ b/src/ScriptResolving/WASM/InterfaceMethods/Library/WASMEffectParameter.cpp
@@ -0,0 +1,16 @@
+#include "WASMEffectParameter.hpp"
+#include "../../../../Battling/Library/BattleLibrary.hpp"
+#include "../../WebAssemblyScriptResolver.hpp"
+#include "../WASMHelperFile.hpp"
+#include "wasm.h"
+
+using namespace CreatureLib::Library;
+
+void WASMEffectParameter::Register(ArbUt::Dictionary<std::string, wasm_func_t*>& externs,
+                                   WebAssemblyScriptResolver* resolver) {
+    REGISTER_GETTER("effect_parameter_get_type", EffectParameter, GetType, resolver)
+    REGISTER_GETTER("effect_parameter_as_bool", EffectParameter, AsBool, resolver)
+    REGISTER_GETTER("effect_parameter_as_int", EffectParameter, AsInt, resolver)
+    REGISTER_GETTER("effect_parameter_as_float", EffectParameter, AsFloat, resolver)
+    REGISTER_GETTER("effect_parameter_as_string", EffectParameter, AsString, resolver)
+}
diff --git a/src/ScriptResolving/WASM/InterfaceMethods/Library/WASMEffectParameter.hpp b/src/ScriptResolving/WASM/InterfaceMethods/Library/WASMEffectParameter.hpp
new file mode 100644
index 0000000..2793ed0
--- /dev/null
+++ b/src/ScriptResolving/WASM/InterfaceMethods/Library/WASMEffectParameter.hpp
@@ -0,0 +1,10 @@
+#ifndef PKMNLIB_WASMEFFECTPARAMETER_HPP
+#define PKMNLIB_WASMEFFECTPARAMETER_HPP
+#include "../../WebAssemblyScriptResolver.hpp"
+
+class WASMEffectParameter {
+public:
+    static void Register(ArbUt::Dictionary<std::string, wasm_func_t*>& externs, WebAssemblyScriptResolver* resolver);
+};
+
+#endif // PKMNLIB_WASMEFFECTPARAMETER_HPP
diff --git a/src/ScriptResolving/WASM/InterfaceMethods/Library/WASMFormeRegistry.hpp b/src/ScriptResolving/WASM/InterfaceMethods/Library/WASMFormeRegistry.hpp
index 9dd74cc..3ccdd55 100644
--- a/src/ScriptResolving/WASM/InterfaceMethods/Library/WASMFormeRegistry.hpp
+++ b/src/ScriptResolving/WASM/InterfaceMethods/Library/WASMFormeRegistry.hpp
@@ -7,8 +7,7 @@ class WebAssemblyScriptResolver;
 
 class WASMFormeRegistry {
 public:
-    static void Register(ArbUt::Dictionary<std::string, wasm_func_t*>& externs,
-                         WebAssemblyScriptResolver* resolver);
+    static void Register(ArbUt::Dictionary<std::string, wasm_func_t*>& externs, WebAssemblyScriptResolver* resolver);
 };
 
 #endif // PKMNLIB_WASMFORMEREGISTRY_HPP
diff --git a/src/ScriptResolving/WASM/InterfaceMethods/TypeRegistry.hpp b/src/ScriptResolving/WASM/InterfaceMethods/TypeRegistry.hpp
index c27fdd9..664c563 100644
--- a/src/ScriptResolving/WASM/InterfaceMethods/TypeRegistry.hpp
+++ b/src/ScriptResolving/WASM/InterfaceMethods/TypeRegistry.hpp
@@ -5,11 +5,14 @@
 #include "../WebAssemblyScriptResolver.hpp"
 #include "Arbutils/Collections/Dictionary.hpp"
 #include "Library/LibraryMethods.hpp"
+#include "Library/WASMAbilityRegistry.hpp"
+#include "Library/WASMEffectParameter.hpp"
+#include "Library/WASMFormeRegistry.hpp"
 #include "Library/WASMItemRegistry.hpp"
 #include "Library/WASMMoveDataRegistry.hpp"
 #include "Library/WASMSpeciesRegistry.hpp"
-#include "Library/WASMFormeRegistry.hpp"
 #include "WASMCoreMethods.hpp"
+#include "WASMListRegistry.hpp"
 #include "WASMStringView.hpp"
 
 class TypeRegistry {
@@ -17,12 +20,15 @@ public:
     static void Register(ArbUt::Dictionary<std::string, wasm_func_t*>& externs, WebAssemblyScriptResolver* resolver) {
         WASMCoreMethods::Register(externs, resolver);
         WASMStringView::Register(externs, resolver);
+        WASMListRegistry::Register(externs, resolver);
+
         LibraryMethods::Register(externs, resolver);
+        WASMEffectParameter::Register(externs, resolver);
         WASMMoveDataRegistry::Register(externs, resolver);
         WASMItemRegistry::Register(externs, resolver);
         WASMSpeciesRegistry::Register(externs, resolver);
         WASMFormeRegistry::Register(externs, resolver);
-
+        WASMAbilityRegistry::Register(externs, resolver);
     }
 };
 
diff --git a/src/ScriptResolving/WASM/InterfaceMethods/WASMHelperFile.hpp b/src/ScriptResolving/WASM/InterfaceMethods/WASMHelperFile.hpp
index a6f2cd1..95af186 100644
--- a/src/ScriptResolving/WASM/InterfaceMethods/WASMHelperFile.hpp
+++ b/src/ScriptResolving/WASM/InterfaceMethods/WASMHelperFile.hpp
@@ -1,6 +1,7 @@
 #ifndef PKMNLIB_HELPERFILE_H
 #define PKMNLIB_HELPERFILE_H
 #include <Arbutils/Memory/Memory.hpp>
+#include <cxxabi.h>
 #include <memory>
 #include <sstream>
 #include <type_traits>
@@ -122,8 +123,10 @@ private:
             }
         } else if constexpr (std::is_same<T, const ArbUt::StringView&>()) {
             return wasm_valtype_new_i64();
+        } else if constexpr (is_specialization<T, ArbUt::List>()) {
+            return wasm_valtype_new_i64();
         }
-        THROW("Unhandled value type: ", std::string(typeid(T).name()));
+        THROW("Unhandled value type: ", std::string(abi::__cxa_demangle(typeid(T).name(), 0, 0, 0)));
     }
 
     template <typename T> inline static wasm_val_t ToVal(const T& val) {
@@ -150,6 +153,9 @@ private:
         } else if constexpr (std::is_same<T, const ArbUt::StringView&>()) {
             auto v = &val;
             return WASM_I64_VAL(reinterpret_cast<i64>(v));
+        } else if constexpr (is_specialization<T, ArbUt::List>()) {
+            auto v = &val;
+            return WASM_I64_VAL(reinterpret_cast<i64>(v));
         }
         THROW("Unhandled value type: ", typeid(T).name());
     }
diff --git a/src/ScriptResolving/WASM/InterfaceMethods/WASMListRegistry.cpp b/src/ScriptResolving/WASM/InterfaceMethods/WASMListRegistry.cpp
new file mode 100644
index 0000000..eab5e08
--- /dev/null
+++ b/src/ScriptResolving/WASM/InterfaceMethods/WASMListRegistry.cpp
@@ -0,0 +1,20 @@
+#include "WASMListRegistry.hpp"
+#include "WASMHelperFile.hpp"
+
+wasm_func_t* List_GetLength(WebAssemblyScriptResolver* resolver) {
+    return WasmHelpers::CreateFunc<size_t, const ArbUt::List<void*>*>(
+        resolver, {[](WebAssemblyScriptResolver*, const ArbUt::List<void*>* list) -> size_t { return list->Count(); }});
+}
+
+wasm_func_t* List_GetValue(WebAssemblyScriptResolver* resolver) {
+    return WasmHelpers::CreateFunc<void*, const ArbUt::List<void*>*, size_t>(
+        resolver, {[](WebAssemblyScriptResolver*, const ArbUt::List<void*>* list, size_t index) -> void* {
+            return list->At(index);
+        }});
+}
+
+void WASMListRegistry::Register(ArbUt::Dictionary<std::string, wasm_func_t*>& externs,
+                                WebAssemblyScriptResolver* resolver) {
+    externs.Insert("list_get_length", List_GetLength(resolver));
+    externs.Insert("list_get_at", List_GetValue(resolver));
+}
diff --git a/src/ScriptResolving/WASM/InterfaceMethods/WASMListRegistry.hpp b/src/ScriptResolving/WASM/InterfaceMethods/WASMListRegistry.hpp
new file mode 100644
index 0000000..b327356
--- /dev/null
+++ b/src/ScriptResolving/WASM/InterfaceMethods/WASMListRegistry.hpp
@@ -0,0 +1,10 @@
+#ifndef PKMNLIB_WASMLISTREGISTRY_HPP
+#define PKMNLIB_WASMLISTREGISTRY_HPP
+#include "../WebAssemblyScriptResolver.hpp"
+
+class WASMListRegistry {
+public:
+    static void Register(ArbUt::Dictionary<std::string, wasm_func_t*>& externs, WebAssemblyScriptResolver* resolver);
+};
+
+#endif // PKMNLIB_WASMLISTREGISTRY_HPP
diff --git a/src/ScriptResolving/WASM/InterfaceMethods/WASMStringView.cpp b/src/ScriptResolving/WASM/InterfaceMethods/WASMStringView.cpp
index 4628c17..e0fcab6 100644
--- a/src/ScriptResolving/WASM/InterfaceMethods/WASMStringView.cpp
+++ b/src/ScriptResolving/WASM/InterfaceMethods/WASMStringView.cpp
@@ -23,6 +23,6 @@ wasm_func_t* ConstString_GetStr(WebAssemblyScriptResolver* resolver) {
 
 void WASMStringView::Register(ArbUt::Dictionary<std::string, wasm_func_t*>& externs,
                               WebAssemblyScriptResolver* resolver) {
-    externs.Insert("arbutils_const_string_get_hash", ConstString_GetHash(resolver));
-    externs.Insert("arbutils_const_string_get_str", ConstString_GetStr(resolver));
+    externs.Insert("const_string_get_hash", ConstString_GetHash(resolver));
+    externs.Insert("const_string_get_str", ConstString_GetStr(resolver));
 }
diff --git a/src/ScriptResolving/WASM/InterfaceMethods/pkmn_lib.wit b/src/ScriptResolving/WASM/InterfaceMethods/pkmn_lib_host.wit
similarity index 93%
rename from src/ScriptResolving/WASM/InterfaceMethods/pkmn_lib.wit
rename to src/ScriptResolving/WASM/InterfaceMethods/pkmn_lib_host.wit
index a60bb5d..c17bea1 100644
--- a/src/ScriptResolving/WASM/InterfaceMethods/pkmn_lib.wit
+++ b/src/ScriptResolving/WASM/InterfaceMethods/pkmn_lib_host.wit
@@ -1,4 +1,5 @@
-// This file documents the entire interface API currently used by the WebAssembly script resolver.
+// This file documents the entire Host interface API currently used by the WebAssembly script resolver, so the methods
+// that can be used from the client wasm.
 // Currently, we only define a bunch of functions, but in the future when interface types are actually implemented,
 // we'd like to implement those as well.
 
@@ -11,10 +12,15 @@ _print: function(i32 message_pointer, s32 message_length)
 
 // StringView class
 type const_string = u64;
-arbutils_const_string_get_hash: function(const_string ptr) -> u32
+const_string_get_hash: function(const_string ptr) -> u32
 // Returns a pointer to the WASM memory where the string can be found.
 // NOTE: This requires us to copy the string into WASM memory.
-arbutils_const_string_get_str: function(const_string ptr) -> s32
+const_string_get_str: function(const_string ptr) -> s32
+
+// List class
+type list = u64
+list_get_length: function(list) -> u64
+list_get_at: function(list, u64) -> u64
 
 // Library types
 type pokemon_library = u64
@@ -149,5 +155,4 @@ forme_get_hidden_ability_count: function(forme) -> u64
 forme_get_ability: function(forme, bool hidden, u8 index) -> ability
 forme_has_flag_by_hash: function(forme, u32) -> bool
 
-
-
+// Ability class
diff --git a/src/ScriptResolving/WASM/WebAssemblyBattleScript.cpp b/src/ScriptResolving/WASM/WebAssemblyBattleScript.cpp
index faa276e..63d14bf 100644
--- a/src/ScriptResolving/WASM/WebAssemblyBattleScript.cpp
+++ b/src/ScriptResolving/WASM/WebAssemblyBattleScript.cpp
@@ -22,15 +22,16 @@ WebAssemblyBattleScript::~WebAssemblyBattleScript() {
     if (!funcOpt.has_value()) {                                                                                        \
         return;                                                                                                        \
     }                                                                                                                  \
-    auto& func = funcOpt.value();                                                                                       \
+    auto& func = funcOpt.value();                                                                                      \
     parameter_setup;                                                                                                   \
     func.Call();
 
 void WebAssemblyBattleScript::OnInitialize(const CreatureLib::Battling::BattleLibrary* library,
-                                           const ArbUt::List<CreatureLib::Library::EffectParameter*>&) {
-    WASM_CALL(Initialize, "script_on_initialize", 2, 0, {
+                                           const ArbUt::List<CreatureLib::Library::EffectParameter*>& parameters) {
+    WASM_CALL(Initialize, "script_on_initialize", 3, 0, {
         func.Loadi32(0, _wasmPtr);
         func.LoadExternRef(1, library);
+        func.LoadExternRef(2, &parameters);
     });
 }
 
diff --git a/tests/ScriptTests/WASM/gen7_scripts_rs.wasm b/tests/ScriptTests/WASM/gen7_scripts_rs.wasm
index 7ef8adae8c99345c7d1d4fc57b670fdfad4864bd..b4e087553d942361cef285262297be63665033df 100755
GIT binary patch
delta 7865
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
L9G2r<L+}1Sbt&AZ

delta 5075
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
Kt$23#2mc1F=%H5t