[PATCH 095/188] adding parsing of call_indirect, normalization of the

type

From 7609b9e984a9aeaa71f72d69bbd475f37818b826 Mon Sep 17 00:00:00 2001
From: Dmitry Boyarintsev <skalogryz.lists@gmail.com>
Date: Mon, 16 Mar 2020 16:29:32 -0400

git-svn-id: branches/wasm@46091 -

utils/wasmbin/wasmbincode.pas

@@ -213,7 +213,8 @@ type
     ipf32,     // float point single
     ipf64,     // float point double
     ipTable,   // a complex structure... used for br_table only
-    ipResType  // result type used for blocks, such as If, block or loop
+    ipResType, // result type used for blocks, such as If, block or loop
+    ipCallType // used for call_indirect
   );
   TInstFlag = record
     valid : Boolean;
@@ -239,7 +240,7 @@ const
    ,(valid: true;  Param: ipTable)    // 0E  br_table
    ,(valid: true;  Param: ipNone)     // 0F  return
    ,(valid: true;  Param: ipLeb)      // 10  call
-   ,(valid: true;  Param: ipLeb)      // 11  call_indirect
+   ,(valid: true;  Param: ipCallType) // 11  call_indirect
    ,(valid: false; Param: ipNone)     // 12
    ,(valid: false; Param: ipNone)     // 13
    ,(valid: false; Param: ipNone)     // 14

utils/wasmbin/wasmmodule.pas

@@ -667,11 +667,17 @@ begin
         end;
       end;
 
-      INST_CALL:
+      INST_call:
       begin
         if (ci.operandIdx<>'') and (ci.operandNum<0) then
           ci.operandNum:=FindFunc(m,ci.operandIdx);
       end;
+
+      INST_call_indirect:
+      begin
+        if Assigned(ci.insttype) and (ci.insttype.typeNum<0) then
+          ci.insttype.typeNum:=RegisterFuncType(m, ci.insttype);
+      end;
     end;
   end;
 

utils/wasmbin/watparser.pas

@@ -196,9 +196,43 @@ begin
   sc.Next;
 end;
 
+procedure ParseFuncParamResult(sc: TWatScanner; dst: TWasmFuncType);
+var
+  tk  : TWatToken;
+  nm  : integer;
+  id  : string;
+  p   : TWasmParam;
+begin
+  tk := sc.token;
+  if tk = weType then begin
+    if not ParseNumOfId(sc, nm, id) then begin
+      writeln('failed type');
+      Exit;
+    end;
+    if nm>=0 then dst.typeNum:=nm
+    else dst.typeIdx:=id;
+    ConsumeAnyOpenToken(sc, tk);
+  end;
+
+  while tk = weParam do begin
+    p:=dst.AddParam;
+    sc.Next;
+    ParseParam(sc, p.id, p.tp);
+    ConsumeAnyOpenToken(sc, tk);
+  end;
+
+  while tk = weResult do begin
+    p:=dst.AddResult;
+    sc.Next;
+    ParseParam(sc, p.id, p.tp, false);
+    ConsumeAnyOpenToken(sc, tk);
+  end;
+end;
+
 procedure ParseInstrList(sc: TWatScanner; dst: TWasmInstrList);
 var
   ci  : TWasmInstr;
+  ft  : TWasmFuncType;
 begin
   while sc.token=weInstr do begin
     ci := dst.AddInstr(sc.instrCode);
@@ -217,6 +251,14 @@ begin
         sc.Next;
       end;
 
+      ipCallType:
+      begin
+        //writeln('token type=',sc.token);
+        ConsumeToken(sc, weOpenBrace);
+        ft := ci.addInstType;
+        ParseFuncParamResult(sc, ft);
+      end;
+
       //ip2Leb,  // memory arguments, ask for offset + align
       //ipTable,   // a complex structure... used for br_table only
       //ipResType  // result type used for blocks, such as If, block or loop
@@ -226,12 +268,11 @@ begin
 
 end;
 
+
 procedure ParseFunc(sc: TWatScanner; dst: TWasmFunc);
 var
-  nm : integer;
-  id : string;
-  p  : TWasmParam;
   tk  : TWatToken;
+  p   : TWasmParam;
 begin
   if sc.token=weFunc then sc.Next;
 
@@ -242,26 +283,8 @@ begin
 
   ConsumeAnyOpenToken(sc, tk);
 
-  if tk = weType then begin
+  if tk in [weType, weParam, weResult] then
-    if not ParseNumOfId(sc, nm, id) then Exit;
+    ParseFuncParamResult(sc, dst.functype);
-    if nm>=0 then dst.functype.typeNum:=nm
-    else dst.functype.typeIdx:=id;
-    ConsumeAnyOpenToken(sc, tk);
-  end;
-
-  while tk = weParam do begin
-    p:=dst.functype.AddParam;
-    sc.Next;
-    ParseParam(sc, p.id, p.tp);
-    ConsumeAnyOpenToken(sc, tk);
-  end;
-
-  while tk = weResult do begin
-    p:=dst.functype.AddResult;
-    sc.Next;
-    ParseParam(sc, p.id, p.tp, false);
-    ConsumeAnyOpenToken(sc, tk);
-  end;
 
   while tk = weLocal do begin
     p:=dst.AddLocal;
@@ -350,17 +373,7 @@ end;
 
 function ParseId(sc: TWatScanner; var id: TWasmId): boolean;
 begin
-  if sc.token = weNumber then begin
+  Result := ParseNumOfId(sc, id.idNum, id.id);
-    id.idNum := sc.resInt32;
-    id.id := '';
-    Result := true;
-  end else if sc.token = weIdent then begin
-    id.id := sc.resText;
-    id.idNum := -1;
-    Result := true;
-  end else
-    Result := false;
-  if Result then sc.Next;
 end;
 
 procedure ParseTable(sc: TWatScanner; dst: TWasmTable);