diff options
| -rwxr-xr-x | luatablegen.py | 10 | ||||
| -rw-r--r-- | resources/makefile | 143 | ||||
| -rw-r--r-- | test/wasm.xml | 174 |
3 files changed, 323 insertions, 4 deletions
diff --git a/luatablegen.py b/luatablegen.py index b2542ff..4921e5f 100755 --- a/luatablegen.py +++ b/luatablegen.py @@ -65,14 +65,15 @@ SOURCE_FILE_NAME='XXX_luatablegen.c' HEADER_FILE_NAME='XXX_luatablegen.h' LUA_PUSH_TABLE = """ int pushluatable_YYY(lua_State* ls, XXX array) { - lua_newtable(ls); - if (!lua_checkstack(ls, count+1)) { + if (!lua_checkstack(ls, 2)) { printf("Not enough space on the lua stack."); return -1; } + lua_newtable(ls); for (int i = 0; i < count; ++i) { lua_pushinteger(i+1); - push_self_ZZZ(ls, array[i]); + WWW_push_args(ls, array[i]); + new_WWW(ls); lua_settable(ls, -3); } return 0; @@ -525,7 +526,8 @@ class TbgParser(object): else: xxx = node.attrib["name"] zzz = "lua_push" + node.attrib["luatype"] - tbl_source.write(LUA_PUSH_TABLE.replace("XXX", xxx+pointer).replace("YYY", xxx)) + if pointer == "*": continue + tbl_source.write(LUA_PUSH_TABLE.replace("XXX", xxx+pointer).replace("YYY", xxx).replace("WWW", xxx)) tbl_header.write(LUA_PUSH_TABLE_SIG.replace("XXX", xxx+pointer).replace("YYY", xxx)) #end of tadldef diff --git a/resources/makefile b/resources/makefile new file mode 100644 index 0000000..9cfb5fa --- /dev/null +++ b/resources/makefile @@ -0,0 +1,143 @@ +TARGET=main +SHELL=bash +SHELL?=bash +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 + $(CC) $^ $(LD_FLAGS) -o $@ + +$(TARGET)-static: $(TARGET).o + $(CC) $^ $(LD_FLAGS) -static -o $@ + +$(TARGET)-dbg: $(TARGET).odbg + $(CC) $^ $(LD_FLAGS) -g -o $@ + +$(TARGET)-cov: $(TARGET).ocov + $(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 + $(CC) $^ $(LD_FLAGS) -shared -o $@ + +$(TARGET).a: $(TARGET).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 will clean almost everything" diff --git a/test/wasm.xml b/test/wasm.xml new file mode 100644 index 0000000..eb1048c --- /dev/null +++ b/test/wasm.xml @@ -0,0 +1,174 @@ +<?xml version="1.0" encoding="UTF-8"?> +<FT> + <Read> + <Magic_Number name="magic_number" type="uint32" count="1" luatype="integer"></Magic_Number> + <Version name="version" type="uint32" count="1" luatype="integer"></Version> + <Type_Section name="W_Type_Section" count="1" type="" isaggregate="true" unordered="true" unorderedbegin="true" luatype="table"> + <ID name="id" type="uint8" encoding="leb128u" issign="true" luatype="integer">1</ID> + <PayloadLength name="payloadlength" type="uint32" encoding="leb128u" luatype="integer"/> + <NameLength name="namelength" type="uint32" encoding="leb128u" luatype="integer"/> + <Name name="name" type="string" size="self::NameLength" luatype="string"/> + <Count name="count" encoding="leb128u" type="uint32" count="1" luatype="integer"/> + <Type_Section_Entry count="self::Count" type="self::Type_Section_Entry" name="entries" luatype="table"/> + </Type_Section> + <Import_Section name="W_Import_Section" count="1" type="" isaggregate="true" unordered="true" luatype="table"> + <ID name="id" type="uint8" encoding="leb128u" issign="true" luatype="table">2</ID> + <PayloadLength name="payloadlength" type="uint32" encoding="leb128u" luatype="integer"/> + <NameLength name="namelength" type="uint32" encoding="leb128u" luatype="integer"/> + <Name name="name" type="string" size="self::NameLength" luatype="string"/> + <Count name="count" encoding="leb128u" type="uint32" count="1" luatype="integer"/> + <Entries name="entries" type="self::Import_Section_Entry" count="self::Count" luatype="table"/> + </Import_Section> + <Function_Section name="W_Function_Section" count="1" type="" isaggregate="true" unordered="true" luatype="table"> + <ID name="id" type="uint8" encoding="leb128u" issign="" luatype="integer">3</ID> + <PayloadLength name="payloadlength" type="uint32" encoding="leb128u" luatype="integer"/> + <NameLength name="namelength" type="uint32" encoding="leb128u" luatype="integer"/> + <Name name="name" type="string" size="self::NameLength" luatype="string"/> + <Count name="count" encoding="leb128u" type="uint32" count="1" luatype="integer"/> + <Types name="types" encoding="leb128u" type="uint32" count="self::Count" luatype="integer"/> + </Function_Section> + <Table_Section name="W_Table_Section" count="1" type="" isaggregate="true" unordered="true" luatype="table"> + <ID name="id" type="uint8" encoding="leb128u" issign="true" luatype="integer">4</ID> + <PayloadLength name="payloadlength" type="uint32" encoding="leb128u" luatype="integer"/> + <NameLength name="namelength" type="uint32" encoding="leb128u" luatype="integer"/> + <Name name="name" type="string" size="self::NameLength" luatype="string"/> + <Count name="count" encoding="leb128u" type="uint32" count="1" luatype="integer"/> + <Entries name="entries" type="self::Table_Type" count="self::Count" luatype="table"/> + </Table_Section> + <Memory_Section name="W_Memory_Section" count="1" type="" isaggregate="true" unordered="true" luatype="table"> + <ID name="id" type="uint8" encoding="leb128u" issign="true" luatype="integer">5</ID> + <PayloadLength name="payloadlength" type="uint32" encoding="leb128u" luatype="integer"/> + <NameLength name="namelength" type="uint32" encoding="leb128u" luatype="integer"/> + <Name name="name" type="string" size="self::NameLength" luatype="string"/> + <!--<Count name="count" encoding="leb128u" type="uint32" count="1"/>--> + <Entries name="entries" type="self::Memory_Type" count="1" luatype="table"/> + </Memory_Section> + <Global_Section name="W_Global_Section" count="1" type="" isaggregate="true" unordered="true" luatype="table"> + <ID name="id" type="uint8" encoding="leb128u" issign="true" luatype="integer">6</ID> + <PayloadLength name="payloadlength" type="uint32" encoding="leb128u" luatype="integer"/> + <NameLength name="namelength" type="uint32" encoding="leb128u" luatype="integer"/> + <Name name="name" type="string" size="self::NameLength" luatype="string"/> + <Count name="count" encoding="leb128u" type="uint32" count="1" luatype="integer"/> + <Globals name="globals" type="self::Global_Entry" count="self::Count" luatype="table"/> + </Global_Section> + <Export_Section name="W_Export_Section" count="1" type="" isaggregate="true" unordered="true" luatype="table"> + <ID name="id" type="uint8" encoding="leb128u" issign="true" luatype="integer">7</ID> + <PayloadLength name="payloadlength" type="uint32" encoding="leb128u" luatype="integer"/> + <NameLength name="namelength" type="uint32" encoding="leb128u" luatype="integer"/> + <Name name="name" type="string" size="self::NameLength" luatype="string"/> + <Count name="count" encoding="leb128u" type="uint32" count="1" luatype="integer"/> + <Entries name="entries" type="self::Export_Entry" count="self::Count" luatype="table"/> + </Export_Section> + <Start_Section name="W_Start_Section" count="1" isaggregate="true" unordered="true" luatype="table"> + <ID name="id" type="uint8" encoding="leb128u" issign="true" luatype="integer">8</ID> + <PayloadLength name="payloadlength" type="uint32" encoding="leb128u" luatype="integer"/> + <NameLength name="namelength" type="uint32" encoding="leb128u" luatype="integer"/> + <Name name="name" type="string" size="self::NameLength" luatype="string"/> + <Index name="index" encoding="leb128u" type="uint32" count="1" luatype="integer"/> + </Start_Section> + <Element_Section name="W_Element_Section" count="1" isaggregate="true" unordered="true" luatype="table"> + <ID name="id" type="uint8" encoding="leb128u" issign="true" luatype="integer">9</ID> + <PayloadLength name="payloadlength" type="uint32" encoding="leb128u" luatype="integer"/> + <NameLength name="namelength" type="uint32" encoding="leb128u" luatype="integer"/> + <Name name="name" type="string" size="self::NameLength" luatype="string"/> + <Count name="count" encoding="leb128u" type="uint32" count="1" luatype="integer"/> + <Entries name="entries" type="self::Element_Segment" count="self::Count" luatype="table"/> + </Element_Section> + <Code_Section name="W_Code_Section" count="1" isaggregate="true" unordered="true" luatype="table"> + <ID name="id" type="uint8" encoding="leb128u" issign="true" luatype="integer">10</ID> + <PayloadLength name="payloadlength" type="uint32" encoding="leb128u" luatype="table"/> + <NameLength name="namelength" type="uint32" encoding="leb128u" luatype="table"/> + <Name name="name" type="string" size="self::NameLength" luatype="string"/> + <Count name="count" encoding="leb128u" type="uint32" count="1" luatype="integer"/> + <Bodies name="bodies" type="self::Function_Body" count="self::Count" luatype="table"/> + </Code_Section> + <Data_Section name="W_Data_Section" count="1" isaggregate="true" unordered="true" luatype="table"> + <ID name="id" type="uint8" encoding="leb128u" issign="true" luatype="integer">11</ID> + <PayloadLength name="payloadlength" type="uint32" encoding="leb128u" luatype="integer"/> + <NameLength name="namelength" type="uint32" encoding="leb128u" luatype="integer"/> + <Name name="name" type="string" size="self::NameLength" luatype="string"/> + <Count name="count" encoding="leb128u" type="uint32" count="1" luatype="integer"/> + <Entries name="entries" type="self::Data_Segment" count="self::Count" luatype="table"/> + </Data_Section> + <Custom_Section name="W_Custom_Section" count="*" isaggregate="true" unordered="true" unorderedend="true" luatype="table"> + <ID name="id" type="uint8" encoding="leb128u" issign="true" luatype="integer">0</ID> + <PayloadLength name="payloadlength" type="uint32" encoding="leb128u" luatype="integer"/> + <NameLength name="namelength" type="uint32" encoding="leb128u" luatype="integer"/> + <Name name="name" type="string" size="self::NameLength" luatype="string"/> + <Payload name="payload" type="uint8" count="self::PayloadLength" luatype="integer"/> + </Custom_Section> + </Read> + <Definition> + <Init_Expr name="init_expr_t" isaggregate="true" luatype="table"> + <Code name="code" type="string" count="1" size="-1" delimiter="11" luatype="integer"></Code> + </Init_Expr> + <Resizable_Limit name="resizable_limit_t" isaggregate="true" luatype="table"> + <Flags name="flags" encoding="leb128u" type="uint8" count="1" luatype="integer"></Flags> + <Initial name="initial" encoding="leb128u" type="uint32" count="1" luatype="integer"></Initial> + <Maximum name="maximum" encoding="leb128u" type="uint32" count="1" luatype="integer"></Maximum> + </Resizable_Limit> + <Global_Type name="global_type_t" isaggregate="true" luatype="table"> + <Value_Type name="value_type" type="uint32" count="1" luatype="integer"></Value_Type> + <Mutability name="mutability" encoding="leb128u" type="uint8" count="1" luatype="integer"></Mutability> + </Global_Type> + <Table_Type name="table_type_t" isaggregate="true" luatype="table"> + <Element_Type name="element_type" encoding="leb128u" type="uint8" count="1" luatype="integer"></Element_Type> + <Resizable_Limit name="resizable_limit" count="1" type="self::Resizable_Limit" luatype="table"></Resizable_Limit> + </Table_Type> + <Memory_Type name="memory_type_t" isaggregate="true" luatype="table"> + <Resizable_Limit count="1" type="self::Resizable_Limit" name="resizable_limit" luatype="table"></Resizable_Limit> + </Memory_Type> + <Type_Section_Entry name="W_Type_Section_Entry" isaggregate="true" luatype="table"> + <Form name="form" encoding="leb128u" type="uint8" count="1" luatype="integer"/> + <Param_Count name="param_count" encoding="leb128u" type="uint32" count="1" luatype="integer"/> + <Param_Types name="param_types" encoding="leb128u" type="uint8" count="self::Param_Count" luatype="integer"/> + <Return_Count name="return_count" encoding="leb128u" type="uint8" luatype="integer"/> + <Return_Types name="return_types" encoding="leb128u" type="uint8" count="self::Return_Count" luatype="integer"/> + </Type_Section_Entry> + <Import_Section_Entry name="W_Import_Section_Entry" isaggregate="true" luatype="table"> + <Module_Length name="module_length" encoding="leb128u" type="uint32" count="1" luatype="integer"/> + <Module_Str name="module_str" type="string" count="1" size="self::Module_Length" luatype="string"/> + <Field_Len name="field_len" encoding="leb128u" type="uint32" couny="1" luatype="integer"/> + <Field_Str name="field_str" type="string" count="1" size="self::Field_Len" luatype="string"/> + <Kind name="kind" encoding="leb128u" type="uint8" count="1" luatype="integer"/> + <Type name="type" conditional="true" condition="self::Kind" type="FT::conditional" luatype="table"> + <condition0 name="type" encoding="leb128u" type="uint32" luatype="integer">0</condition0> + <condition1 name="type" type="self::Table_Type" luatype="table">1</condition1> + <condition2 name="type" type="self::Memory_Type" luatype="table">2</condition2> + <condition3 name="type" type="self::Global_Type" luatype="table">3</condition3> + </Type> + </Import_Section_Entry> + <Global_Entry name="W_Global_Entry" isaggregate="true" luatype="table"> + <Global_Type name="type" type="self::Global_Type" count="1" luatype="table"/> + <Init name="init" type="self::Init_Expr" count="1" luatype="table"/> + </Global_Entry> + <Export_Entry name="W_Export_Entry" isaggregate="true" luatype="table"> + <Field_Len name="field_len" encoding="leb128u" type="uint32" count="1" luatype="integer"/> + <Field_Str name="field_str" type="string" count="1" size="self::Field_Len" luatype="string"/> + <Kind name="kind" encoding="leb128u" type="uint8" count="1" luatype="integer"/> + <Index name="index" encoding="leb128u" type="uint32" count="1" luatype="integer"/> + </Export_Entry> + <Element_Segment name="W_Element_Segment" isaggregate="true" luatype="table"> + <Index name="index" encoding="leb128u" type="uint32" count="1" luatype="integer"/> + <Init name="init" type="self::Init_Expr" count="1" luatype="table"/> + <Num_Length name="num_length" encoding="leb128u" type="uint32" count="1" luatype="integer"/> + <Elems name="elems" encoding="leb128u" type="uint32" count="self::Num_Length" luatype="integer"/> + </Element_Segment> + <Local_Entry name="W_Local_Entry" isaggregate="true" luatype="table"> + <Count name="count" encoding="leb128u" type="uint32" count="1" luatype="integer"/> + <Type name="type" encoding="leb128u" type="uint16" count="self::Count" luatype="integer"/> + </Local_Entry> + <Function_Body name="W_Function_Body" isaggregate="true" luatype="table"> + <Body_size name="body_size" encoding="leb128u" type="uint32" count="1" luatype="integer"/> + <Local_Count name="local_count" encoding="leb128u" type="uint32" count="1" luatype="integer"/> + <Local_Entries name="locals" type="self::Local_Entry" count="self::Local_Count" luatype="table"/> + <Code name="code" type="uchar" count="self::Body_size" luatype="integer"/> + </Function_Body> + <Data_Segment name="W_Data_Segment" isaggregate="true" luatype="table"> + <Index name="index" encoding="leb128u" type="uint32" count="1" luatype="integer"/> + <Offset name="offset" type="self::Init_Expr" count="1" luatype="table"/> + <Size name="size" encoding="leb128u" type="uint32" count="1" luatype="integer"/> + <Data name="data" type="uchar" count="self::Size" luatype="table"/> + </Data_Segment> + </Definition> +</FT> |