aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xbruiser/autogen/wasm/ft.sh2
-rwxr-xr-xbruiser/autogen/wasm/ltg.sh2
-rw-r--r--bruiser/bruiser.cpp158
m---------bruiser/faultreiber0
m---------bruiser/tablegen0
5 files changed, 97 insertions, 65 deletions
diff --git a/bruiser/autogen/wasm/ft.sh b/bruiser/autogen/wasm/ft.sh
index ce72011..4910ff7 100755
--- a/bruiser/autogen/wasm/ft.sh
+++ b/bruiser/autogen/wasm/ft.sh
@@ -1,5 +1,5 @@
#!/bin/sh
cd $(dirname $0)
-"../../faultreiber/faultreiber.py" --name wasm --outdir ./ft/ --datetime --xml ./ft/wasm.xml --calloc
+"../../faultreiber/faultreiber.py" --name wasm --outdir ./ft/ --datetime --xml ./ft/wasm.xml --calloc --voidtraininitsize 60 --voidtrainfactor 1.9
#"clang-format" -i ./test/read.c ./test/structs.c ./test/structs.h ./test/aggregate.c ./test/aggregate.h ./test/read.h
#"less" ./test/structs.h
diff --git a/bruiser/autogen/wasm/ltg.sh b/bruiser/autogen/wasm/ltg.sh
index 69e0a73..48643b9 100755
--- a/bruiser/autogen/wasm/ltg.sh
+++ b/bruiser/autogen/wasm/ltg.sh
@@ -1,6 +1,6 @@
#!/bin/sh
cd $(dirname $0)
-"../../tablegen/luatablegen.py" --out ./ltg/ --luaheader ../../../lua-5.3.4/src --headeraggr ./ltg/wasm_tables.h --lualibpath ./ltg/wasm.lua --docpath ./ltg/wasm.md --xml ./ltg/wasm.xml --tbldefs ./ltg/ --name wasm --anon
+"../../tablegen/luatablegen.py" --out ./ltg/ --luaheader ../../../lua-5.3.4/src --headeraggr ./ltg/wasm_tables.h --lualibpath ./ltg/wasm.lua --docpath ./ltg/wasm.md --xml ./ltg/luwasm.xml --tbldefs ./ltg/ --name wasm --anon
clang-format ./ltg/*.c ./ltg/*.h -i
for filename in ./ltg/*.c; do
gcc -c $filename > /dev/null 2>&1
diff --git a/bruiser/bruiser.cpp b/bruiser/bruiser.cpp
index 17cb0db..39dc664 100644
--- a/bruiser/bruiser.cpp
+++ b/bruiser/bruiser.cpp
@@ -1683,14 +1683,15 @@ class LuaWrapper
std::string obj_path = lua_tostring(__ls, 1);
int wasm_file = open(obj_path.c_str(), O_RDONLY);
if (wasm_file < 0) {PRINT_WITH_COLOR_LB(RED, "bad file.");return 0;}
- else {PRINT_WITH_COLOR_LB(GREEN, "good file");}
+ else {
+ if (Verbose) PRINT_WITH_COLOR_LB(GREEN, "good file");
+ }
wasm_lib_ret_t* lib_ret = read_aggr_wasm(wasm_file);
- std::cout << RED << std::hex << lib_ret->obj->magic_number_container->magic_number << "\n";
- std::cout << lib_ret->obj->version_container->version << NORMAL << "\n";
- std::cout << "die die die\n";
+ //std::cout << RED << std::hex << lib_ret->obj->magic_number_container->magic_number << "\n";
+ //std::cout << lib_ret->obj->version_container->version << NORMAL << "\n";
+ //std::cout << "die die die\n";
close(wasm_file);
- //if (Verbose) {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wall"
#pragma clang diagnostic ignored "-Wextra"
@@ -1821,80 +1822,111 @@ class LuaWrapper
#pragma clang diagnostic pop
lua_newtable(__ls);
- lua_pushstring(__ls, "magic");
- magic_number_push_args(__ls, lib_ret->obj->magic_number_container);
- new_magic_number(__ls);
- lua_settable(__ls, -3);
+
+ if (lib_ret->obj->magic_number_container != NULL) {
+ lua_pushstring(__ls, "magic");
+ magic_number_push_args(__ls, lib_ret->obj->magic_number_container);
+ new_magic_number(__ls);
+ lua_settable(__ls, -3);
+ }
PRINT_WITH_COLOR_LB(BLUE, "magic");
- lua_pushstring(__ls, "version");
- version_push_args(__ls, lib_ret->obj->version_container);
- new_version(__ls);
- lua_settable(__ls, -3);
+ if (lib_ret->obj->version_container != NULL) {
+ lua_pushstring(__ls, "version");
+ version_push_args(__ls, lib_ret->obj->version_container);
+ new_version(__ls);
+ lua_settable(__ls, -3);
+ }
PRINT_WITH_COLOR_LB(BLUE, "version");
- lua_pushstring(__ls, "type_section");
- std::cout << "1\n";
- W_Type_Section_push_args(__ls, lib_ret->obj->W_Type_Section_container);
- std::cout << "2\n";
- new_W_Type_Section(__ls);
- std::cout << "3\n";
- lua_settable(__ls, -3);
+ if (lib_ret->obj->W_Type_Section_container != NULL) {
+ lua_pushstring(__ls, "type_section");
+ W_Type_Section_push_args(__ls, lib_ret->obj->W_Type_Section_container);
+ new_W_Type_Section(__ls);
+ lua_settable(__ls, -3);
+ }
PRINT_WITH_COLOR_LB(BLUE, "type section");
- return 1;
-#if 0
- lua_pushstring(__ls, "import_section");
- W_Import_Section_push_args(__ls, lib_ret->obj->W_Import_Section_container);
- new_W_Import_Section(__ls);
- lua_settable(__ls, -3);
+
+ if (lib_ret->obj->W_Import_Section_container != NULL) {
+ lua_pushstring(__ls, "import_section");
+ W_Import_Section_push_args(__ls, lib_ret->obj->W_Import_Section_container);
+ new_W_Import_Section(__ls);
+ lua_settable(__ls, -3);
+ }
PRINT_WITH_COLOR_LB(BLUE, "import section");
- lua_pushstring(__ls, "function_section");
- W_Function_Section_push_args(__ls, lib_ret->obj->W_Function_Section_container);
- new_W_Function_Section(__ls);
- lua_settable(__ls, -3);
+
+ if (lib_ret->obj->W_Function_Section_container != NULL) {
+ lua_pushstring(__ls, "function_section");
+ W_Function_Section_push_args(__ls, lib_ret->obj->W_Function_Section_container);
+ new_W_Function_Section(__ls);
+ lua_settable(__ls, -3);
+ }
PRINT_WITH_COLOR_LB(BLUE, "function section");
- lua_pushstring(__ls, "table_section");
- W_Table_Section_push_args(__ls, lib_ret->obj->W_Table_Section_container);
- new_W_Table_Section(__ls);
- lua_settable(__ls, -3);
+
+ if (lib_ret->obj->W_Table_Section_container != NULL) {
+ lua_pushstring(__ls, "table_section");
+ W_Table_Section_push_args(__ls, lib_ret->obj->W_Table_Section_container);
+ new_W_Table_Section(__ls);
+ lua_settable(__ls, -3);
+ }
PRINT_WITH_COLOR_LB(BLUE, "table section");
- lua_pushstring(__ls, "memory_section");
- W_Memory_Section_push_args(__ls, lib_ret->obj->W_Memory_Section_container);
- new_W_Memory_Section(__ls);
- lua_settable(__ls, -3);
+
+ if (lib_ret->obj->W_Memory_Section_container != NULL) {
+ lua_pushstring(__ls, "memory_section");
+ W_Memory_Section_push_args(__ls, lib_ret->obj->W_Memory_Section_container);
+ new_W_Memory_Section(__ls);
+ lua_settable(__ls, -3);
+ }
PRINT_WITH_COLOR_LB(BLUE, "memory section");
- lua_pushstring(__ls, "global_section");
- W_Global_Section_push_args(__ls, lib_ret->obj->W_Global_Section_container);
- new_W_Global_Section(__ls);
- lua_settable(__ls, -3);
+
+ if (lib_ret->obj->W_Global_Section_container != NULL) {
+ lua_pushstring(__ls, "global_section");
+ W_Global_Section_push_args(__ls, lib_ret->obj->W_Global_Section_container);
+ new_W_Global_Section(__ls);
+ lua_settable(__ls, -3);
+ }
PRINT_WITH_COLOR_LB(BLUE, "global section");
- lua_pushstring(__ls, "export_section");
- W_Export_Section_push_args(__ls, lib_ret->obj->W_Export_Section_container);
- new_W_Export_Section(__ls);
- lua_settable(__ls, -3);
+
+ if (lib_ret->obj->W_Export_Section_container != NULL) {
+ lua_pushstring(__ls, "export_section");
+ W_Export_Section_push_args(__ls, lib_ret->obj->W_Export_Section_container);
+ new_W_Export_Section(__ls);
+ lua_settable(__ls, -3);
+ }
PRINT_WITH_COLOR_LB(BLUE, "export section");
- lua_pushstring(__ls, "start_section");
- W_Start_Section_push_args(__ls, lib_ret->obj->W_Start_Section_container);
- new_W_Start_Section(__ls);
- lua_settable(__ls, -3);
+
+ if (lib_ret->obj->W_Start_Section_container != NULL) {
+ lua_pushstring(__ls, "start_section");
+ W_Start_Section_push_args(__ls, lib_ret->obj->W_Start_Section_container);
+ new_W_Start_Section(__ls);
+ lua_settable(__ls, -3);
+ }
PRINT_WITH_COLOR_LB(BLUE, "start section");
- lua_pushstring(__ls, "element_section");
- W_Element_Section_push_args(__ls, lib_ret->obj->W_Element_Section_container);
- new_W_Element_Section(__ls);
- lua_settable(__ls, -3);
+
+ if (lib_ret->obj->W_Element_Section_container != NULL) {
+ lua_pushstring(__ls, "element_section");
+ W_Element_Section_push_args(__ls, lib_ret->obj->W_Element_Section_container);
+ new_W_Element_Section(__ls);
+ lua_settable(__ls, -3);
+ }
PRINT_WITH_COLOR_LB(BLUE, "element section");
- lua_pushstring(__ls, "code_section");
- W_Code_Section_push_args(__ls, lib_ret->obj->W_Code_Section_container);
- new_W_Code_Section(__ls);
- lua_settable(__ls, -3);
+
+ if (lib_ret->obj->W_Code_Section_container != NULL) {
+ lua_pushstring(__ls, "code_section");
+ W_Code_Section_push_args(__ls, lib_ret->obj->W_Code_Section_container);
+ new_W_Code_Section(__ls);
+ lua_settable(__ls, -3);
+ }
PRINT_WITH_COLOR_LB(BLUE, "code section");
- lua_pushstring(__ls, "data_section");
- W_Data_Section_push_args(__ls, lib_ret->obj->W_Data_Section_container);
- new_W_Data_Section(__ls);
- lua_settable(__ls, -3);
+
+ if (lib_ret->obj->W_Data_Section_container != NULL) {
+ lua_pushstring(__ls, "data_section");
+ W_Data_Section_push_args(__ls, lib_ret->obj->W_Data_Section_container);
+ new_W_Data_Section(__ls);
+ lua_settable(__ls, -3);
+ }
PRINT_WITH_COLOR_LB(BLUE, "data section");
return 1;
-#endif
}
int BruiserLuaXObjAllocGlobal(lua_State* __ls) {
diff --git a/bruiser/faultreiber b/bruiser/faultreiber
-Subproject a5c29b77f877aa33d63439e104952dd57286ccb
+Subproject a9ba7c19941ae6b47390a8f130a80edc4bad1df
diff --git a/bruiser/tablegen b/bruiser/tablegen
-Subproject dc20e9040f652dd327af9aef3a66a4a6f106333
+Subproject 51ec417dbc9ea2f4b0b1cec4df8f6c339c94d97
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-19 16:23:04 +0000