From 69360b15987798dfbffbc4c5688d1a8108945ff1 Mon Sep 17 00:00:00 2001 From: bloodstalker Date: Mon, 10 Sep 2018 18:31:59 +0430 Subject: begenning to integrate and test both the codegens. run git pull for faultreiber and tablegen. --- bruiser/asmrewriter.c | 4 +- bruiser/autogen/wasm/ft.sh | 5 ++ bruiser/autogen/wasm/ft/autowasm.c | 173 ++++++++++++++++++++++++++++++++++++ bruiser/autogen/wasm/ft/makefile | 143 ++++++++++++++++++++++++++++++ bruiser/autogen/wasm/ft/wasm.xml | 174 +++++++++++++++++++++++++++++++++++++ bruiser/autogen/wasm/ltg.sh | 11 +++ bruiser/autogen/wasm/ltg/makefile | 51 +++++++++++ bruiser/autogen/wasm/ltg/wasm.xml | 174 +++++++++++++++++++++++++++++++++++++ bruiser/faultreiber | 2 +- bruiser/lua-scripts/asmtest.lua | 10 +++ bruiser/tablegen | 2 +- 11 files changed, 746 insertions(+), 3 deletions(-) create mode 100755 bruiser/autogen/wasm/ft.sh create mode 100644 bruiser/autogen/wasm/ft/autowasm.c create mode 100644 bruiser/autogen/wasm/ft/makefile create mode 100644 bruiser/autogen/wasm/ft/wasm.xml create mode 100755 bruiser/autogen/wasm/ltg.sh create mode 100644 bruiser/autogen/wasm/ltg/makefile create mode 100644 bruiser/autogen/wasm/ltg/wasm.xml (limited to 'bruiser') diff --git a/bruiser/asmrewriter.c b/bruiser/asmrewriter.c index 12d358a..f5743c1 100644 --- a/bruiser/asmrewriter.c +++ b/bruiser/asmrewriter.c @@ -298,6 +298,7 @@ static const luaL_Reg jmpt_meta[] = { }; int jmpt_register(lua_State* __ls) { + lua_checkstack(__ls, 4); lua_newtable(__ls); luaL_setfuncs(__ls, jmpt_methods, 0); luaL_newmetatable(__ls, "jmp_s_t"); @@ -308,7 +309,8 @@ int jmpt_register(lua_State* __ls) { lua_pushliteral(__ls, "__metatable"); lua_pushvalue(__ls, -3); lua_rawset(__ls, -3); - return 1; + lua_setglobal(__ls, "jmp_s_t"); + return 0; #if 0 luaL_openlib(__ls, "jmp_s_t", jmpt_methods, 0); luaL_newmetatable(__ls, "jmp_s_t"); diff --git a/bruiser/autogen/wasm/ft.sh b/bruiser/autogen/wasm/ft.sh new file mode 100755 index 0000000..e5a1e05 --- /dev/null +++ b/bruiser/autogen/wasm/ft.sh @@ -0,0 +1,5 @@ +#!/bin/sh +cd $(dirname $0) +"../../faultreiber/faultreiber.py" --name wasm --outdir ./ft/ --datetime --xml ./ft/wasm.xml +#"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/ft/autowasm.c b/bruiser/autogen/wasm/ft/autowasm.c new file mode 100644 index 0000000..30442ba --- /dev/null +++ b/bruiser/autogen/wasm/ft/autowasm.c @@ -0,0 +1,173 @@ + +#include +#include +#include +#include +#include + +#include "./aggregate.h" +#include "./read.h" +#include "./structs.h" + +#pragma weak main +int main(int argc, char **argv) { + int wasm = open("./test.wasm", O_RDONLY); + read_aggr_wasm(wasm); + + printf("magic_number:%x\n", magic_number_container->magic_number); + printf("version:%x\n", version_container->version); + + printf("type section id:%d\n", W_Type_Section_container->id); + printf("type section payloadlength:%d\n", + W_Type_Section_container->payloadlength); + printf("type_section entry count:%d\n", W_Type_Section_container->count); + for (int i = 0; i < W_Type_Section_container->count; ++i) { + printf("param_count:%d\n", + W_Type_Section_container->entries[i]->param_count); + for (int j = 0; j < W_Type_Section_container->entries[i]->param_count; ++j) + printf("param_types:%d\n", + W_Type_Section_container->entries[i]->param_types[j]); + printf("return_count:%d\n", + W_Type_Section_container->entries[i]->return_count); + for (int j = 0; j < W_Type_Section_container->entries[i]->return_count; ++j) + printf("param_types:%d\n", + W_Type_Section_container->entries[i]->return_types[j]); + } + printf("import_section_id:%d\n", W_Import_Section_container->id); + printf("import_section_payloadlength:%d\n", + W_Import_Section_container->payloadlength); + printf("import_section_count:%d\n", W_Import_Section_container->count); + for (int i = 0; i < W_Import_Section_container->count; ++i) { + printf("module_length:%d\n", + W_Import_Section_container->entries[i]->module_length); + printf("module_str:%s\n", + W_Import_Section_container->entries[i]->module_str); + printf("field_length:%d\n", + W_Import_Section_container->entries[i]->field_len); + printf("field_str:%s\n", W_Import_Section_container->entries[i]->field_str); + printf("kind:%d\n", W_Import_Section_container->entries[i]->kind); + if (W_Import_Section_container->entries[i]->kind == 0) + printf("type:%d\n", W_Import_Section_container->entries[i]->kind); + printf("\n"); + } + printf("function_section_id:%d\n", W_Function_Section_container->id); + printf("function_section_payloadlength:%d\n", + W_Function_Section_container->payloadlength); + printf("function_section_count:%d\n", W_Function_Section_container->count); + for (int i = 0; i < W_Function_Section_container->count; ++i) + printf("type:%d\n", W_Function_Section_container->types[i]); + + printf("table_section_id:%d\n", W_Table_Section_container->id); + printf("table_section_payloadlength:%d\n", + W_Table_Section_container->payloadlength); + printf("table_section_count:%d\n", W_Table_Section_container->count); + for (int i = 0; i < W_Table_Section_container->count; ++i) { + printf("element_type:%d\n", + W_Table_Section_container->entries[i]->element_type); + printf("rl_flags:%d\n", + W_Table_Section_container->entries[i]->resizable_limit->flags); + printf("rl_initial:%d\n", + W_Table_Section_container->entries[i]->resizable_limit->initial); + printf("rl_maximum:%d\n", + W_Table_Section_container->entries[i]->resizable_limit->maximum); + } + + printf("memory_section_id:%d\n", W_Memory_Section_container->id); + printf("memory_section_payload_length:%d\n", + W_Memory_Section_container->payloadlength); + printf("rl_flags:%d\n", + W_Memory_Section_container->entries->resizable_limit->flags); + printf("rl_initial:%d\n", + W_Memory_Section_container->entries->resizable_limit->initial); + printf("rl_maximum:%d\n", + W_Memory_Section_container->entries->resizable_limit->maximum); + + if (W_Global_Section_container == NULL) + printf("global section doesnt exist.\n"); + + printf("export_section_id:%d\n", W_Export_Section_container->id); + printf("export_section_payloadlength:%d\n", + W_Export_Section_container->payloadlength); + printf("entry count:%d\n", W_Export_Section_container->count); + + for (int i = 0; i < W_Export_Section_container->count; ++i) { + printf("field_len:%d\n", W_Export_Section_container->entries[i]->field_len); + printf("field_str:%s\n", W_Export_Section_container->entries[i]->field_str); + printf("kind:%d\n", W_Export_Section_container->entries[i]->kind); + printf("index:%d\n", W_Export_Section_container->entries[i]->index); + } + + if (W_Start_Section_container == NULL) + printf("start section doesnt exist.\n"); + + printf("element_seciton_id:%d\n", W_Element_Section_container->id); + printf("element_section_payloadlength:%d\n", + W_Element_Section_container->payloadlength); + printf("entry count:%d\n", W_Element_Section_container->count); + + for (int i = 0; i < W_Element_Section_container->count; ++i) { + printf("index:%d\n", W_Element_Section_container->entries[i]->index); + for (int j = 0; j < 3; ++j) { + printf("code:%d\n", + W_Element_Section_container->entries[i]->init->code[j]); + } + printf("num_length:%d\n", + W_Element_Section_container->entries[i]->num_length); + for (int j = 0; j < W_Element_Section_container->entries[i]->num_length; + ++j) { + printf("elems:%d\n", W_Element_Section_container->entries[i]->elems[j]); + } + } + + printf("code_section_id:%d\n", W_Code_Section_container->id); + printf("code_section_payloadlength:%d\n", + W_Code_Section_container->payloadlength); + printf("count:%d\n", W_Code_Section_container->count); + + for (int i = 0; i < W_Code_Section_container->count; ++i) { + printf("body_size:%d\n", W_Code_Section_container->bodies[i]->body_size); + printf("local_count:%d\n", + W_Code_Section_container->bodies[i]->local_count); + if (W_Code_Section_container->bodies[i]->local_count > 0) { + for (int j = 0; j < W_Code_Section_container->bodies[i]->local_count; + ++j) { + for (int k = 0; + k < W_Code_Section_container->bodies[i]->locals[j]->count; ++k) { + } + } + } + printf("code:\n"); + for (int j = 0; j < W_Code_Section_container->bodies[i]->body_size; ++j) { + printf("%02x ", W_Code_Section_container->bodies[i]->code[j]); + } + printf("\n"); + } + + printf("data_section_id:%d\n", W_Data_Section_container->id); + printf("data_section_payloadlength:%d\n", + W_Data_Section_container->payloadlength); + printf("data seg count:%d\n", W_Data_Section_container->count); + + for (int i = 0; i < W_Data_Section_container->count; ++i) { + printf("index:%d\n", W_Data_Section_container->entries[i]->index); + printf("size:%d\n", W_Data_Section_container->entries[i]->size); + printf("code:\n"); + for (int j = 0; j < W_Data_Section_container->entries[i]->size; ++j) { + printf("%c ", W_Data_Section_container->entries[i]->data[j]); + } + printf("\n"); + int j = 0; + printf("offset:\n"); + while (1) { + printf("%02x ", W_Data_Section_container->entries[i]->offset->code[j]); + if (W_Data_Section_container->entries[i]->offset->code[j] == 11) { + break; + } + j++; + } + printf("\n"); + } + + release_all(); + return 0; +} diff --git a/bruiser/autogen/wasm/ft/makefile b/bruiser/autogen/wasm/ft/makefile new file mode 100644 index 0000000..86f0a6b --- /dev/null +++ b/bruiser/autogen/wasm/ft/makefile @@ -0,0 +1,143 @@ +SHELL=bash +SHELL?=bash +TARGET=autowasm +CC=clang +CC?=clang +CC_FLAGS=-fpic +CC_EXTRA?= +CTAGS_I_PATH?=./ +LD_FLAGS= +EXTRA_LD_FLAGS?= +ADD_SANITIZERS_CC= -g -fsanitize=address -fno-omit-frame-pointer +ADD_SANITIZERS_LD= -g -fsanitize=address +MEM_SANITIZERS_CC= -g -fsanitize=memory -fno-omit-frame-pointer +MEM_SANITIZERS_LD= -g -fsanitize=memory +UB_SANITIZERS_CC= -g -fsanitize=undefined -fno-omit-frame-pointer +UB_SANITIZERS_LD= -g -fsanitize=undefined +COV_CC= -fprofile-instr-generate -fcoverage-mapping +COV_LD= -fprofile-instr-generate +# BUILD_MODES are=RELEASE(default), DEBUG,ADDSAN,MEMSAN,UBSAN +BUILD_MODE?=RELEASE +OBJ_LIST:=$(patsubst %.c, %.o, $(wildcard *.c)) +ASM_LIST:=$(patsubst %.c, %.dis, $(wildcard *.c)) + +ifeq ($(BUILD_MODE), ADDSAN) +ifeq ($(CC), gcc) +$(error This build mode is only useable with clang.) +endif +CC_EXTRA+=$(ADD_SANITIZERS_CC) +EXTRA_LD_FLAGS+=$(ADD_SANITIZERS_LD) +endif + +ifeq ($(BUILD_MODE), MEMSAN) +ifeq ($(CC), gcc) +$(error This build mode is only useable with clang.) +endif +CC_EXTRA+=$(MEM_SANITIZERS_CC) +EXTRA_LD_FLAGS+=$(MEM_SANITIZERS_LD) +endif + +ifeq ($(BUILD_MODE), UBSAN) +ifeq ($(CC), gcc) +$(error This build mode is only useable with clang.) +endif +CC_EXTRA+=$(UB_SANITIZERS_CC) +EXTRA_LD_FLAGS+=$(UB_SANITIZERS_LD) +endif + +SRCS:=$(wildcard *.c) +CC_FLAGS+=$(CC_EXTRA) +LD_FLAGS+=$(EXTRA_LD_FLAGS) + +.DEFAULT:all + +.PHONY:all clean help ASM SO TAGS + +all:$(TARGET) + +everything:$(TARGET) A ASM SO $(TARGET)-static $(TARGET)-dbg TAGS $(TARGET)-cov + +depend:.depend + +.depend:$(SRCS) + rm -rf .depend + $(CC) -MM $(CC_FLAGS) $^ > ./.depend + echo $(patsubst %.o:, %.odbg:, $(shell $(CC) -MM $(CC_FLAGS) $^)) | sed -r 's/[a-z0-9\-\_]+\.odbg/\n&/g' >> ./.depend + echo $(patsubst %.o:, %.ocov:, $(shell $(CC) -MM $(CC_FLAGS) $^)) | sed -r 's/[a-z0-9\-\_]+\.ocov/\n&/g' >> ./.depend + +-include ./.depend + +.c.o: + $(CC) $(CC_FLAGS) -c $< -o $@ + +%.odbg:%.c + $(CC) $(CC_FLAGS) -g -c $< -o $@ + +%.ocov:%.c + $(CC) $(CC_FLAGS) $(COV_CC) -c $< -o $@ + +$(TARGET): $(TARGET).o read.o aggregate.o structs.o + $(CC) $^ $(LD_FLAGS) -o $@ + +$(TARGET)-static: $(TARGET).o read.o aggregate.o structs.o + $(CC) $^ $(LD_FLAGS) -static -o $@ + +$(TARGET)-dbg: $(TARGET).odbg read.o aggregate.o structs.o + $(CC) $^ $(LD_FLAGS) -g -o $@ + +$(TARGET)-cov: $(TARGET).ocov read.o aggregate.o structs.o + $(CC) $^ $(LD_FLAGS) $(COV_LD) -o $@ + +cov: + @llvm-profdata merge -sparse ./default.profraw -o ./default.profdata + @llvm-cov show $(TARGET)-cov -instr-profile=default.profdata + +covrep: + @llvm-profdata merge -sparse ./default.profraw -o ./default.profdata + @llvm-cov report $(TARGET)-cov -instr-profile=default.profdata + +ASM:$(ASM_LIST) + +SO:$(TARGET).so + +A:$(TARGET).a + +TAGS:tags + +tags:$(SRCS) + $(shell $(CC) -c -I $(CTAGS_I_PATH) -M $(SRCS)|\ + sed -e 's/[\\ ]/\n/g'|sed -e '/^$$/d' -e '/\.o:[ \t]*$$/d'|\ + ctags -L - --c++-kinds=+p --fields=+iaS --extra=+q) + +%.dis: %.o + objdump -r -d -M intel -S $< > $@ + +$(TARGET).so: $(TARGET).o read.o aggregate.o structs.o + $(CC) $^ $(LD_FLAGS) -shared -o $@ + +$(TARGET).a: $(TARGET).o read.o aggregate.o structs.o + ar rcs $(TARGET).a $(TARGET).o + +clean: + rm -f *.o *.dis *.odbg *.ocov *~ $(TARGET) $(TARGET).so $(TARGET)-static $(TARGET)-dbg $(TARGET).a $(TARGET)-cov + +deepclean: + rm -f *.o *.dis *.odbg *.ocov *~ $(TARGET) $(TARGET).so tags $(TARGET)-static $(TARGET)-dbg $(TARGET).a $(TARGET)-cov + rm .depend + +help: + @echo "--all is the default target, runs $(TARGET) target" + @echo "--everything will build everything" + @echo "--SO will generate the so" + @echo "--ASM will generate assembly files" + @echo "--TAGS will generate tags file" + @echo "--$(TARGET) builds the dynamically-linked executable" + @echo "--$(TARGET)-dbg will generate the debug build. BUILD_MODE should be set to DEBUG to work" + @echo "--$(TARGET)-static will statically link the executable to the libraries" + @echo "--$(TARGET)-cov is the coverage build" + @echo "--cov will print the coverage report" + @echo "--covrep will print the coverage report" + @echo "--A will build the static library" + @echo "--TAGS will build the tags file" + @echo "--clean" + @echo "--deepclean$(newline) will clean almost everything" diff --git a/bruiser/autogen/wasm/ft/wasm.xml b/bruiser/autogen/wasm/ft/wasm.xml new file mode 100644 index 0000000..dfae936 --- /dev/null +++ b/bruiser/autogen/wasm/ft/wasm.xml @@ -0,0 +1,174 @@ + + + + + + + 1 + + + + + + + + 2 + + + + + + + + 3 + + + + + + + + 4 + + + + + + + + 5 + + + + + + + + 6 + + + + + + + + 7 + + + + + + + + 8 + + + + + + + 9 + + + + + + + + 10 + + + + + + + + 11 + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + 0 + 1 + 2 + 3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bruiser/autogen/wasm/ltg.sh b/bruiser/autogen/wasm/ltg.sh new file mode 100755 index 0000000..94f052b --- /dev/null +++ b/bruiser/autogen/wasm/ltg.sh @@ -0,0 +1,11 @@ +#!/usr/bin/bash +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/ +clang-format ./ltg/*.c ./ltg/*.h -i +for filename in ./ltg/*.c; do + gcc -c $filename > /dev/null 2>&1 + if [[ $? != 0 ]]; then + echo $filename did not compile. + fi +done +rm *.o diff --git a/bruiser/autogen/wasm/ltg/makefile b/bruiser/autogen/wasm/ltg/makefile new file mode 100644 index 0000000..b59a216 --- /dev/null +++ b/bruiser/autogen/wasm/ltg/makefile @@ -0,0 +1,51 @@ +CC=clang +CC?=clang +CC_FLAGS=-fpic +CC_EXTRA?= +CC_FLAGS+=$(CC_EXTRA) +SRCS=$(wildcard *.c) +TBG_OBJLIST=$(patsubst %.c, %.o , $(wildcard *.c)) +TBG_OBJLIST_DBG=$(patsubst %.c, %.odbg , $(wildcard *.c)) +TBG_OBJLIST_COV=$(patsubst %.c, %.ocov , $(wildcard *.c)) +ADD_SANITIZERS_CC= -g -fsanitize=address -fno-omit-frame-pointer +ADD_SANITIZERS_LD= -g -fsanitize=address +MEM_SANITIZERS_CC= -g -fsanitize=memory -fno-omit-frame-pointer +MEM_SANITIZERS_LD= -g -fsanitize=memory +UB_SANITIZERS_CC= -g -fsanitize=undefined -fno-omit-frame-pointer +UB_SANITIZERS_LD= -g -fsanitize=undefined +COV_CC= -fprofile-instr-generate -fcoverage-mapping + +.DEFAULT:all + +.PHONY:all clean help + +all:$(TBG_OBJLIST) $(TBG_OBJLIST_DBG) $(TBG_OBJLIST_COV) + @echo $(TBG_OBJLIST) + @echo $(TBG_OBJLIST_INC) + +depend:.depend + +.depend:$(SRCS) + rm -rf .depend + $(CC) -MM $(CC_FLAGS) $^ > ./.depend + echo $(patsubst %.o:, %.odbg:, $(shell $(CC) -MM $(CC_FLAGS) $^)) | sed -r 's/[A-Za-z0-9\-\_]+\.odbg/\n&/g' >> ./.depend + echo $(patsubst %.o:, %.ocov:, $(shell $(CC) -MM $(CC_FLAGS) $^)) | sed -r 's/[A-Za-z0-9\-\_]+\.ocov/\n&/g' >> ./.depend + +-include ./.depend + +.c.o: + $(CC) $(CC_FLAGS) -c $< -o $@ + +%.odbg:%.c + $(CC) $(CC_FLAGS) -g -c $< -o $@ + +%.ocov:%.c + $(CC) $(CC_FLAGS) $(COV_CC) -c $< -o $@ + +clean: + rm -f *.o *~ $(TARGET) *.ocov *.odbg + rm .depend + +help: + @echo "all is the default target" + @echo "there is clean." diff --git a/bruiser/autogen/wasm/ltg/wasm.xml b/bruiser/autogen/wasm/ltg/wasm.xml new file mode 100644 index 0000000..6d8d0d2 --- /dev/null +++ b/bruiser/autogen/wasm/ltg/wasm.xml @@ -0,0 +1,174 @@ + + + + + + + 1 + + + + + + + + 2 + + + + + + + + 3 + + + + + + + + 4 + + + + + + + + 5 + + + + + + + + 6 + + + + + + + + 7 + + + + + + + + 8 + + + + + + + 9 + + + + + + + + 10 + + + + + + + + 11 + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 1 + 2 + 3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bruiser/faultreiber b/bruiser/faultreiber index 7f9fc4b..cbd94dd 160000 --- a/bruiser/faultreiber +++ b/bruiser/faultreiber @@ -1 +1 @@ -Subproject commit 7f9fc4b0a044f3b797f61d50bd4682f3bbf2a752 +Subproject commit cbd94dd817ac2f1d79a9643a651bd2d8982fcf56 diff --git a/bruiser/lua-scripts/asmtest.lua b/bruiser/lua-scripts/asmtest.lua index f5809d8..e9f1598 100644 --- a/bruiser/lua-scripts/asmtest.lua +++ b/bruiser/lua-scripts/asmtest.lua @@ -9,6 +9,7 @@ function test() -- messes up the stack. I could fix it but not sure why i would want to keep this in --local head2 = jmp_s_t:new() local head = getjmptable(#text_section, text_section) + print(type(head)) while head:inext() ~= nil do --head:dump("entry") @@ -16,6 +17,15 @@ function test() print() head = head:inext() end + + local dummy = jmp_s_t + print(type(dummy)) + for k,v in pairs(dummy) do + if type(v) == "function" then + print(k,v ) + end + end + --print(dummy:location()) end test() diff --git a/bruiser/tablegen b/bruiser/tablegen index eda3df9..33c3ddf 160000 --- a/bruiser/tablegen +++ b/bruiser/tablegen @@ -1 +1 @@ -Subproject commit eda3df98b33a938fcfbc375b0da8d5e4786f8bf8 +Subproject commit 33c3ddfcc94d7c1f9a98d635881ebcc63dffcc20 -- cgit v1.2.3