more info

cli/wasm-info-cli.cc

@@ -7,6 +7,7 @@
 #include <nlohmann/json.hpp>
 #include <magic_enum.hpp>
 #include <wasm.h>
+#include <wasmer.h>
 
 namespace fs = std::filesystem;
 using namespace std::string_literals;
@@ -35,6 +36,89 @@ std::string error_prefix() {
 	return "\033[31m[ERROR]\033[0m ";
 }
 
+std::string get_last_error() {
+	std::string err_msg;
+	auto err_length = wasmer_last_error_length();
+	err_msg.resize(err_length);
+	if(err_length > 0) {
+		wasmer_last_error_message(err_msg.data(), err_msg.size());
+	}
+
+	return err_msg;
+}
+
+void set_externs_json(const wasm_externtype_t* extern_type, nlohmann::json::value_type& out_json) {
+	auto extern_type_kind = static_cast<wasm_externkind_enum>(
+		wasm_externtype_kind(extern_type)
+	);
+	switch(extern_type_kind) {
+		case WASM_EXTERN_FUNC: {
+			auto func_type = wasm_externtype_as_functype_const(extern_type);
+
+			auto& params_json = (out_json["params"] = "[]"_json);
+			auto params = wasm_functype_params(func_type);
+			for(size_t i=0; params->size > i; ++i) {
+				auto param_valtype = params->data[i];
+				auto param_kind = static_cast<wasm_valkind_enum>(
+					wasm_valtype_kind(param_valtype)
+				);
+
+				params_json.push_back(magic_enum::enum_name(param_kind));
+			}
+
+			auto& results_json = (out_json["results"] = "[]"_json);
+			auto results = wasm_functype_results(func_type);
+			for(size_t i=0; results->size > i; ++i) {
+				auto param_valtype = results->data[i];
+				auto param_kind = static_cast<wasm_valkind_enum>(
+					wasm_valtype_kind(param_valtype)
+				);
+
+				results_json.push_back(magic_enum::enum_name(param_kind));
+			}
+			break;
+		}
+		case WASM_EXTERN_GLOBAL: {
+			auto global_type = wasm_externtype_as_globaltype_const(extern_type);
+			auto mutability = static_cast<wasm_mutability_enum>(
+				wasm_globaltype_mutability(global_type)
+			);
+
+			out_json["mutability"] = magic_enum::enum_name(mutability);
+
+			auto content = wasm_globaltype_content(global_type);
+			auto content_kind = static_cast<wasm_valkind_enum>(
+				wasm_valtype_kind(content)
+			);
+
+			out_json["kind"] = magic_enum::enum_name(content_kind);
+			break;
+		}
+		case WASM_EXTERN_TABLE: {
+			auto table_type = wasm_externtype_as_tabletype_const(extern_type);
+			auto element = wasm_tabletype_element(table_type);
+			auto element_kind = static_cast<wasm_valkind_enum>(
+				wasm_valtype_kind(element)
+			);
+			out_json["kind"] = magic_enum::enum_name(element_kind);
+
+			auto limits = wasm_tabletype_limits(table_type);
+			auto& limits_json = (out_json["limits"] = "{}"_json);
+			limits_json["min"] = limits->min;
+			limits_json["max"] = limits->max;
+			break;
+		}
+		case WASM_EXTERN_MEMORY: {
+			auto memory_type = wasm_externtype_as_memorytype_const(extern_type);
+			auto limits = wasm_memorytype_limits(memory_type);
+			auto& limits_json = (out_json["limits"] = "{}"_json);
+			limits_json["min"] = limits->min;
+			limits_json["max"] = limits->max;
+			break;
+		}
+	}
+}
+
 cli_exit_code cli_entry(const std::vector<std::string_view>& args) {
 	if(args.size() != 1) {
 		return cli_exit_code::invalid_arguments;
@@ -85,7 +169,7 @@ cli_exit_code cli_entry(const std::vector<std::string_view>& args) {
 	wasm_module_exports(wasm_mod, &exports);
 
 	for(size_t expi=0; exports.size > expi; ++expi) {
-		auto export_json = "{}"_json;
+		auto& export_json = exports_json.emplace_back("{}"_json);
 		auto export_name = wasm_exporttype_name(exports.data[expi]);
 		std::string_view export_name_str(export_name->data, export_name->size);
 		auto export_type = wasm_exporttype_type(exports.data[expi]);
@@ -96,14 +180,15 @@ cli_exit_code cli_entry(const std::vector<std::string_view>& args) {
 		export_json["name"] = export_name_str;
 		export_json["type"] = magic_enum::enum_name(export_type_kind);
 
-		exports_json.push_back(export_json);
+		set_externs_json(export_type, export_json);
 	}
 
+	std::vector<wasm_extern_t*> unused_inst_externs;
 	wasm_importtype_vec_t imports;
 	wasm_module_imports(wasm_mod, &imports);
 
 	for(size_t impi=0; imports.size > impi; ++impi) {
-		auto import_json = "{}"_json;
+		auto& import_json = imports_json.emplace_back("{}"_json);
 		auto import_name = wasm_importtype_name(imports.data[impi]);
 		std::string import_name_str(import_name->data, import_name->size);
 		auto import_type = wasm_importtype_type(imports.data[impi]);
@@ -114,7 +199,7 @@ cli_exit_code cli_entry(const std::vector<std::string_view>& args) {
 		import_json["name"] = import_name_str;
 		import_json["type"] = magic_enum::enum_name(import_type_kind);
 
-		imports_json.push_back(import_json);
+		set_externs_json(import_type, import_json);
 	}
 
 	std::cout << json;
@@ -130,9 +215,14 @@ int main(int argc, char* argv[]) {
 	}
 	auto exit_code = cli_entry(args);
 	if(exit_code != cli_exit_code::ok) {
-		std::cerr
-			<< error_prefix() << magic_enum::enum_name(exit_code) << "\n\n"
-			<< USAGE;
+
+		std::cerr << error_prefix() << magic_enum::enum_name(exit_code);
+		auto last_error = get_last_error();
+		if(!last_error.empty()) {
+			std::cerr << ": " << last_error;
+		}
+
+		std::cerr << "\n\n" << USAGE;
 	}
 	return static_cast<int>(exit_code);
 }