Wasm generation finished

Author: jbaylina

cli.js

@@ -30,7 +30,7 @@ const version = require("./package").version;
 
 const argv = require("yargs")
     .version(version)
-    .usage("circom [input source circuit file] -o [output definition circuit file] -c [output c file]")
+    .usage("circom [input source circuit file] -r [output r1cs file] -c [output c file] -w [output wasm file] -t [output wat file] -s [output sym file]")
     .alias("o", "output")
     .alias("c", "csource")
     .alias("w", "wasm")
@@ -50,6 +50,10 @@ const argv = require("yargs")
         type: "boolean",
         description: "Do not optimize constraints"
     })
+    .option("sanityCheck", {
+        type: "boolean",
+        description: "Add sanity check code"
+    })
     .epilogue(`Copyright (C) 2018  0kims association
     This program comes with ABSOLUTELY NO WARRANTY;
     This is free software, and you are welcome to redistribute it
@@ -79,6 +83,7 @@ const symName = typeof(argv.sym) === "string" ?  argv.sym : fileName + ".sym";
 const options = {};
 options.reduceConstraints = !argv.fast;
 options.verbose = argv.verbose || false;
+options.sanityCheck = argv.sanitycheck;
 if (argv.csource) {
     options.cSourceWriteStream = fs.createWriteStream(cSourceName);
 }

index.js

@@ -1,3 +1,4 @@
 module.exports.compiler = require("./src/compiler.js");
 module.exports.c_tester = require("./ports/c/tester.js");
 module.exports.wasm_tester = require("./ports/wasm/tester.js");
+module.exports.tester = module.exports.wasm_tester;

ports/c/buildasm/add.asm.ejs

@@ -116,14 +116,14 @@ add_l1ms2m:
 
 ;;;;;;;;
 add_s1l2:
-        bt     rcx, 62          ; check if montgomery first
+        bt     rcx, 62          ; check if montgomery second
         jc     add_s1l2m
 add_s1l2n:
 <%=     global.setTypeDest("0x80"); %>
 <%=     addS1L2(); %>
 
 add_s1l2m:
-        bt     rax, 62          ; check if montgomery second
+        bt     rax, 62          ; check if montgomery first
         jc     add_s1ml2m
 add_s1nl2m:
 <%=     global.setTypeDest("0xC0"); %>

ports/c/buildasm/binops.asm.ejs

@@ -1,3 +1,24 @@
+<% function binOpSubQIfBigger() { %>
+        <% const subQ = global.tmpLabel() %>
+        <% const done = global.tmpLabel() %>
+
+        ; Compare with q
+<% for (let i=0; i<n64; i++) { %>
+        mov rax, [rdi + <%= (n64-i)*8 %>]
+        cmp rax, [q + <%= (n64-i-1)*8 %>]
+        jc <%=done%>        ; q is bigget so done.
+        jnz <%=subQ%>         ; q is lower
+<% } %>
+        ; If equal substract q
+<%=subQ%>:
+<% for (let i=0; i<n64; i++) { %>
+        mov rax, [q + <%=i*8%>]
+        <%= i==0 ? "sub" : "sbb" %> [rdi + <%=i*8 + 8 %>], rax
+<% } %>
+<%=done%>:
+<% } %>
+
+
 <% function binOpS1S2(op) { %>
         cmp    r8d, 0
         <% const s1s2_solveNeg = global.tmpLabel() %>
@@ -35,6 +56,7 @@
 <%     }  %>
         mov    [rdi + <%= (i*8)+8 %> ], rax
 <%   } %>
+<%      binOpSubQIfBigger() %>
         ret
 
 <%=s1l2_solveNeg%>:
@@ -59,6 +81,7 @@
 <%     }  %>
         mov    [rdi + <%= (i*8)+8 %> ], rax;
 <%   } %>
+<%      binOpSubQIfBigger() %>
         ret
 
 <%=l1s2_solveNeg%>:
@@ -77,12 +100,11 @@
 <%     }  %>
         mov    [rdi + <%= (i*8)+8 %> ], rax
 <%   } %>
+<%      binOpSubQIfBigger() %>
         ret
 <% } %>
 
 
-
-
 <% function binOp(op) { %>
 ;;;;;;;;;;;;;;;;;;;;;;
 ; b<%= op %>
@@ -212,6 +234,7 @@ bnot_l1n:
 <%     }  %>
         mov    [rdi + <%= i*8 + 8 %>], rax
 <%   } %>
+<%      binOpSubQIfBigger() %>
         ret