now supports size-bound reads

2 files changed, 156 insertions, 5 deletions

diff --git a/resources/wasm.xml b/resources/wasm.xml
index dfae936..8b31481 100644
--- a/resources/wasm.xml
+++ b/resources/wasm.xml
@@ -105,10 +105,10 @@
     <Resizable_Limit name="resizable_limit_t" isaggregate="true">
       <Flags name="flags" encoding="leb128u" type="uint8" count="1"></Flags>
       <Initial name="initial" encoding="leb128u" type="uint32" count="1"></Initial>
-      <Maximum name="maximum" encoding="leb128u" type="uint32" count="1"></Maximum>
+      <Maximum name="maximum" encoding="leb128u" type="uint32" count="self::Flags"></Maximum>
     </Resizable_Limit>
     <Global_Type name="global_type_t" isaggregate="true">
-      <Value_Type name="value_type" type="uint32" count="1"></Value_Type>
+      <Value_Type name="value_type" type="uint8" count="1"></Value_Type>
       <Mutability name="mutability" encoding="leb128u" type="uint8" count="1"></Mutability>
     </Global_Type>
     <Table_Type name="table_type_t" isaggregate="true">
@@ -156,13 +156,13 @@
     </Element_Segment>
     <Local_Entry name="W_Local_Entry" isaggregate="true">
       <Count name="count" encoding="leb128u" type="uint32" count="1"/>
-      <Type name="type" encoding="leb128u" type="uint16" count="self::Count"/>
+      <Type name="type" encoding="leb128u" type="uint16" count="1"/>
     </Local_Entry>
     <Function_Body name="W_Function_Body" isaggregate="true">
       <Body_size name="body_size" encoding="leb128u" type="uint32" count="1"/>
-      <Local_Count name="local_count" encoding="leb128u" type="uint32" count="1"/>
+      <Local_Count name="local_count" encoding="leb128u" type="uint32" count="1" sizeconst="begin"/>
       <Local_Entries name="locals" type="self::Local_Entry" count="self::Local_Count"/>
-      <Code name="code" type="uchar" count="self::Body_size"/>
+      <Code name="code" type="uchar" count="self::Body_size" sizeconst="end"/>
     </Function_Body>
     <Data_Segment name="W_Data_Segment" isaggregate="true">
       <Index name="index" encoding="leb128u" type="uint32" count="1"/>
diff --git a/resources/wasm2.xml b/resources/wasm2.xml
new file mode 100644
index 0000000..2d6e5fd
--- /dev/null
+++ b/resources/wasm2.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FT>
+  <Read>
+    <Magic_Number name="magic_number" type="uint32" count="1"></Magic_Number>
+    <Version name="version" type="uint32" count="1"></Version>
+    <Type_Section name="W_Type_Section" count="1" type="" isaggregate="true" unordered="true" unorderedbegin="true">
+      <ID name="id" type="uint8" encoding="leb128u" issign="true">1</ID>
+      <PayloadLength name="payloadlength" type="uint32" encoding="leb128u"/>
+      <Count name="count" encoding="leb128u" type="uint32" count="1"/>
+      <Type_Section_Entry count="self::Count" type="self::Type_Section_Entry" name="entries"/>
+    </Type_Section>
+    <Import_Section name="W_Import_Section" count="1" type="" isaggregate="true" unordered="true">
+      <ID name="id" type="uint8" encoding="leb128u" issign="true">2</ID>
+      <PayloadLength name="payloadlength" type="uint32" encoding="leb128u"/>
+      <Count name="count" encoding="leb128u" type="uint32" count="1"/>
+      <Entries name="entries" type="self::Import_Section_Entry" count="self::Count"/>
+    </Import_Section>
+    <Function_Section name="W_Function_Section" count="1" type="" isaggregate="true" unordered="true">
+      <ID name="id" type="uint8" encoding="leb128u" issign="">3</ID>
+      <PayloadLength name="payloadlength" type="uint32" encoding="leb128u"/>
+      <Count name="count" encoding="leb128u" type="uint32" count="1"/>
+      <Types name="types" encoding="leb128u" type="uint32" count="self::Count"/>
+    </Function_Section>
+    <Table_Section name="W_Table_Section" count="1" type="" isaggregate="true" unordered="true">
+      <ID name="id" type="uint8" encoding="leb128u" issign="true">4</ID>
+      <PayloadLength name="payloadlength" type="uint32" encoding="leb128u"/>
+      <Count name="count" encoding="leb128u" type="uint32" count="1"/>
+      <Entries name="entries" type="self::Table_Type" count="self::Count"/>
+    </Table_Section>
+    <Memory_Section name="W_Memory_Section" count="1" type="" isaggregate="true" unordered="true">
+      <ID name="id" type="uint8" encoding="leb128u" issign="true">5</ID>
+      <PayloadLength name="payloadlength" type="uint32" encoding="leb128u"/>
+      <Entries name="entries" type="self::Memory_Type" count="1"/>
+    </Memory_Section>
+    <Global_Section name="W_Global_Section" count="1" type="" isaggregate="true" unordered="true">
+      <ID name="id" type="uint8" encoding="leb128u" issign="true">6</ID>
+      <PayloadLength name="payloadlength" type="uint32" encoding="leb128u"/>
+      <Count name="count" encoding="leb128u" type="uint32" count="1"/>
+      <Globals name="globals" type="self::Global_Entry" count="self::Count"/>
+    </Global_Section>
+    <Export_Section name="W_Export_Section" count="1" type="" isaggregate="true" unordered="true">
+      <ID name="id" type="uint8" encoding="leb128u" issign="true">7</ID>
+      <PayloadLength name="payloadlength" type="uint32" encoding="leb128u"/>
+      <Count name="count" encoding="leb128u" type="uint32" count="1"/>
+      <Entries name="entries" type="self::Export_Entry" count="self::Count"/>
+    </Export_Section>
+    <Start_Section name="W_Start_Section" count="1" isaggregate="true" unordered="true">
+      <ID name="id" type="uint8" encoding="leb128u" issign="true">8</ID>
+      <PayloadLength name="payloadlength" type="uint32" encoding="leb128u"/>
+      <Index name="index" encoding="leb128u" type="uint32" count="1"/>
+    </Start_Section>
+    <Element_Section name="W_Element_Section" count="1" isaggregate="true" unordered="true">
+      <ID name="id" type="uint8" encoding="leb128u" issign="true">9</ID>
+      <PayloadLength name="payloadlength" type="uint32" encoding="leb128u"/>
+      <Count name="count" encoding="leb128u" type="uint32" count="1"/>
+      <Entries name="entries" type="self::Element_Segment" count="self::Count"/>
+    </Element_Section>
+    <Code_Section name="W_Code_Section" count="1" isaggregate="true" unordered="true">
+      <ID name="id" type="uint8" encoding="leb128u" issign="true">10</ID>
+      <PayloadLength name="payloadlength" type="uint32" encoding="leb128u"/>
+      <Count name="count" encoding="leb128u" type="uint32" count="1"/>
+      <Bodies name="bodies" type="self::Function_Body" count="self::Count"/>
+    </Code_Section>
+    <Data_Section name="W_Data_Section" count="1" isaggregate="true" unordered="true">
+      <ID name="id" type="uint8" encoding="leb128u" issign="true">11</ID>
+      <PayloadLength name="payloadlength" type="uint32" encoding="leb128u"/>
+      <Count name="count" encoding="leb128u" type="uint32" count="1"/>
+      <Entries name="entries" type="self::Data_Segment" count="self::Count"/>
+    </Data_Section>
+    <Custom_Section name="W_Custom_Section" count="*" isaggregate="true" unordered="true" unorderedend="true">
+      <ID name="id" type="uint8" encoding="leb128u" issign="true">0</ID>
+      <PayloadLength name="payloadlength" type="uint32" encoding="leb128u"/>
+      <NameLength name="namelength" type="uint32" encoding="leb128u"/>
+      <Name name="name" type="string" size="self::NameLength"/>
+      <Payload name="payload" type="uint8" count="self::PayloadLength"/>
+    </Custom_Section>
+  </Read>
+  <Definition>
+    <Init_Expr name="init_expr_t" isaggregate="true">
+      <Code name="code" type="string" count="1" size="-1" delimiter="11"></Code>
+    </Init_Expr>
+    <Resizable_Limit name="resizable_limit_t" isaggregate="true">
+      <Flags name="flags" encoding="leb128u" type="uint8" count="1"></Flags>
+      <Initial name="initial" encoding="leb128u" type="uint32" count="1"></Initial>
+      <Maximum name="maximum" encoding="leb128u" type="uint32" count="self::Flags"></Maximum>
+    </Resizable_Limit>
+    <Global_Type name="global_type_t" isaggregate="true">
+      <Value_Type name="value_type" type="uint8" count="1"></Value_Type>
+      <Mutability name="mutability" encoding="leb128u" type="uint8" count="1"></Mutability>
+    </Global_Type>
+    <Table_Type name="table_type_t" isaggregate="true">
+      <Element_Type name="element_type" encoding="leb128u" type="uint8" count="1"></Element_Type>
+      <Resizable_Limit name="resizable_limit" count="1" type="self::Resizable_Limit"></Resizable_Limit>
+    </Table_Type>
+    <Memory_Type name="memory_type_t" isaggregate="true">
+      <Resizable_Limit count="1" type="self::Resizable_Limit" name="resizable_limit"></Resizable_Limit>
+    </Memory_Type>
+    <Type_Section_Entry name="W_Type_Section_Entry" isaggregate="true">
+      <Form name="form" encoding="leb128u" type="uint8" count="1"/>
+      <Param_Count name="param_count" encoding="leb128u" type="uint32" count="1"/>
+      <Param_Types name="param_types" encoding="leb128u" type="uint8" count="self::Param_Count"/>
+      <Return_Count name="return_count" encoding="leb128u" type="uint8"/>
+      <Return_Types name="return_types" encoding="leb128u" type="uint8" count="self::Return_Count"/>
+    </Type_Section_Entry>
+    <Import_Section_Entry name="W_Import_Section_Entry" isaggregate="true">
+      <Module_Length name="module_length" encoding="leb128u" type="uint32" count="1"/>
+      <Module_Str name="module_str" type="string" count="1" size="self::Module_Length"/>
+      <Field_Len name="field_len" encoding="leb128u" type="uint32" couny="1"/>
+      <Field_Str name="field_str" type="string" count="1" size="self::Field_Len"/>
+      <Kind name="kind" encoding="leb128u" type="uint8" count="1"/>
+      <Type name="type" conditional="true" condition="self::Kind" type="FT::conditional">
+        <condition0 name="type" encoding="leb128u" type="uint32">0</condition0>
+        <condition1 name="type" type="self::Table_Type">1</condition1>
+        <condition2 name="type" type="self::Memory_Type">2</condition2>
+        <condition3 name="type" type="self::Global_Type">3</condition3>
+      </Type>
+    </Import_Section_Entry>
+    <Global_Entry name="W_Global_Entry" isaggregate="true">
+      <Global_Type name="type" type="self::Global_Type" count="1"/>
+      <Init name="init" type="self::Init_Expr" count="1"/>
+    </Global_Entry>
+    <Export_Entry name="W_Export_Entry" isaggregate="true">
+      <Field_Len name="field_len" encoding="leb128u" type="uint32" count="1"/>
+      <Field_Str name="field_str" type="string" count="1" size="self::Field_Len"/>
+      <Kind name="kind" encoding="leb128u" type="uint8" count="1"/>
+      <Index name="index" encoding="leb128u" type="uint32" count="1"/>
+    </Export_Entry>
+    <Element_Segment name="W_Element_Segment" isaggregate="true">
+      <Index name="index" encoding="leb128u" type="uint32" count="1"/>
+      <Init name="init" type="self::Init_Expr" count="1"/>
+      <Num_Length name="num_length" encoding="leb128u" type="uint32" count="1"/>
+      <Elems name="elems" encoding="leb128u" type="uint32" count="self::Num_Length"/>
+    </Element_Segment>
+    <Local_Entry name="W_Local_Entry" isaggregate="true" countversion="true">
+      <Count name="count" encoding="leb128u" type="uint32" count="1"/>
+      <Type name="type" encoding="leb128u" type="uint16" count="1"/>
+    </Local_Entry>
+    <Function_Body name="W_Function_Body" isaggregate="true">
+      <Body_size name="body_size" encoding="leb128u" type="uint32" count="1"/>
+      <Local_Count name="local_count" encoding="leb128u" type="uint32" count="1" sizeconst="true"/>
+      <Local_Entries name="locals" type="self::Local_Entry" count="self::Local_Count" sizeconst="true"/>
+      <Code name="code" type="uchar" count="self::Body_size" sizeconst="end"/>
+    </Function_Body>
+    <Data_Segment name="W_Data_Segment" isaggregate="true">
+      <Index name="index" encoding="leb128u" type="uint32" count="1"/>
+      <Offset name="offset" type="self::Init_Expr" count="1"/>
+      <Size name="size" encoding="leb128u" type="uint32" count="1"/>
+      <Data name="data" type="uchar" count="self::Size"/>
+    </Data_Segment>
+  </Definition>
+</FT>