From 20058a38d6b21362d314ffc7c8bcf1e78b1ebe18 Mon Sep 17 00:00:00 2001
From: Jordi Baylina <jordi@baylina.cat>
Date: Thu, 23 Jan 2020 09:31:29 +0700
Subject: [PATCH] toInt and isTrue in assembly

---
 c/buildasm/copy.asm.ejs       |  52 ++++++++++++++
 c/buildasm/fr.asm             | 128 ++++++++++++++++++++++++++++++++++
 c/buildasm/fr.asm.ejs         |   3 +
 c/buildasm/fr.c               |  29 +-------
 c/buildasm/fr.c.ejs           |  29 +-------
 c/buildasm/fr.h               |  13 +++-
 c/buildasm/fr.h.ejs           |  13 +++-
 c/buildasm/fr.o               | Bin 21563 -> 22051 bytes
 c/buildasm/logicalops.asm.ejs |  15 ++++
 c/buildasm/main.c             |  20 +++++-
 c/buildasm/montgomery.asm.ejs |   1 +
 c/buildasm/tester.cpp         |   1 +
 test/fieldasm.js              |   2 -
 13 files changed, 242 insertions(+), 64 deletions(-)

diff --git a/c/buildasm/copy.asm.ejs b/c/buildasm/copy.asm.ejs
index d851c5f..6f469b1 100644
--- a/c/buildasm/copy.asm.ejs
+++ b/c/buildasm/copy.asm.ejs
@@ -79,3 +79,55 @@ u64toLong_adjust_neg:
         mov    [rdi + <%= (i+1)*8 %>], rax
 <% } %>
         ret
+
+;;;;;;;;;;;;;;;;;;;;;;
+; toInt
+;;;;;;;;;;;;;;;;;;;;;;
+; Convert a 64 bit integer to a long format field element
+; Params:
+;   rsi <= Pointer to the element
+; Returs:
+;   rax <= The value
+;;;;;;;;;;;;;;;;;;;;;;;
+<%=name%>_toInt:
+        mov     rax, [rdi]
+        bt      rax, 63
+        jc      <%=name%>_long
+        movsx   rax, eax
+        ret
+
+<%=name%>_long:
+        mov     rax, [rdi + 8]
+        mov     rcx, rax
+        shr     rcx, 31
+        jnz     <%=name%>_longNeg
+<% for (let i=1; i< n64; i++) { %>
+        mov     rcx, [rdi + <%= i*8+8 %>]
+        test    rcx, rcx
+        jnz     <%=name%>_longNeg
+<% } %>
+        ret
+
+<%=name%>_longNeg:
+        mov     rax, [rdi + 8]
+        sub     rax, [q]
+        jnc     <%=name%>_longErr
+<% for (let i=1; i<n64; i++) { %>
+        mov     rcx, [rdi + <%= i*8+8 %>]
+        sbb     rcx, [q + <%= i*8 %>]
+        jnc     <%=name%>_longErr
+<% } %>
+        mov     rcx, rax
+        sar     rcx, 31
+        add     rcx, 1
+        jnz     <%=name%>_longErr
+        ret
+
+<%=name%>_longErr:
+        push    rdi
+        mov     rdi, 0
+        call    <%=name%>_fail
+        pop     rdi
+
+
+
diff --git a/c/buildasm/fr.asm b/c/buildasm/fr.asm
index 258fe13..597b1b6 100644
--- a/c/buildasm/fr.asm
+++ b/c/buildasm/fr.asm
@@ -23,7 +23,10 @@
         global Fr_toNormal
         global Fr_toLongNormal
         global Fr_toMontgomery
+        global Fr_toInt
+        global Fr_isTrue
         global Fr_q
+        extern Fr_fail
         DEFAULT REL
 
         section .text
@@ -150,6 +153,74 @@ u64toLong_adjust_neg:
 
         ret
 
+;;;;;;;;;;;;;;;;;;;;;;
+; toInt
+;;;;;;;;;;;;;;;;;;;;;;
+; Convert a 64 bit integer to a long format field element
+; Params:
+;   rsi <= Pointer to the element
+; Returs:
+;   rax <= The value
+;;;;;;;;;;;;;;;;;;;;;;;
+Fr_toInt:
+        mov     rax, [rdi]
+        bt      rax, 63
+        jc      Fr_long
+        movsx   rax, eax
+        ret
+
+Fr_long:
+        mov     rax, [rdi + 8]
+        mov     rcx, rax
+        shr     rcx, 31
+        jnz     Fr_longNeg
+
+        mov     rcx, [rdi + 16]
+        test    rcx, rcx
+        jnz     Fr_longNeg
+
+        mov     rcx, [rdi + 24]
+        test    rcx, rcx
+        jnz     Fr_longNeg
+
+        mov     rcx, [rdi + 32]
+        test    rcx, rcx
+        jnz     Fr_longNeg
+
+        ret
+
+Fr_longNeg:
+        mov     rax, [rdi + 8]
+        sub     rax, [q]
+        jnc     Fr_longErr
+
+        mov     rcx, [rdi + 16]
+        sbb     rcx, [q + 8]
+        jnc     Fr_longErr
+
+        mov     rcx, [rdi + 24]
+        sbb     rcx, [q + 16]
+        jnc     Fr_longErr
+
+        mov     rcx, [rdi + 32]
+        sbb     rcx, [q + 24]
+        jnc     Fr_longErr
+
+        mov     rcx, rax
+        sar     rcx, 31
+        add     rcx, 1
+        jnz     Fr_longErr
+        ret
+
+Fr_longErr:
+        push    rdi
+        mov     rdi, 0
+        call    Fr_fail
+        pop     rdi
+
+
+
+
 
 
 
@@ -1432,6 +1503,7 @@ toLongNormal_fromShort:
     movsx   rsi, eax
     call    rawCopyS2L
     mov     rsi, r8                     ; recover rsi
+    ret
 
 
 
@@ -5699,6 +5771,62 @@ lnot_retOne:
         ret
 
 
+;;;;;;;;;;;;;;;;;;;;;;
+; isTrue
+;;;;;;;;;;;;;;;;;;;;;;
+; Convert a 64 bit integer to a long format field element
+; Params:
+;   rsi <= Pointer to the element
+; Returs:
+;   rax <= 1 if true 0 if false
+;;;;;;;;;;;;;;;;;;;;;;;
+Fr_isTrue:
+        
+
+
+
+
+
+    mov     rax, [rdi]
+    bt      rax, 63
+    jc      tmp_64
+
+    test    eax, eax
+    jz      retZero_66
+    jmp     retOne_65
+
+tmp_64:
+
+    mov     rax, [rdi + 8]
+    test    rax, rax
+    jnz     retOne_65
+
+    mov     rax, [rdi + 16]
+    test    rax, rax
+    jnz     retOne_65
+
+    mov     rax, [rdi + 24]
+    test    rax, rax
+    jnz     retOne_65
+
+    mov     rax, [rdi + 32]
+    test    rax, rax
+    jnz     retOne_65
+
+
+retZero_66:
+    mov     qword rax, 0
+    jmp     done_67
+
+retOne_65:
+    mov     qword rax, 1
+
+done_67:
+
+        ret
+
+
+
 
 
         section .data
diff --git a/c/buildasm/fr.asm.ejs b/c/buildasm/fr.asm.ejs
index 83c76a9..6819ec7 100644
--- a/c/buildasm/fr.asm.ejs
+++ b/c/buildasm/fr.asm.ejs
@@ -23,7 +23,10 @@
         global <%=name%>_toNormal
         global <%=name%>_toLongNormal
         global <%=name%>_toMontgomery
+        global <%=name%>_toInt
+        global <%=name%>_isTrue
         global <%=name%>_q
+        extern <%=name%>_fail
         DEFAULT REL
 
         section .text
diff --git a/c/buildasm/fr.c b/c/buildasm/fr.c
index 37daa3a..62c4d57 100644
--- a/c/buildasm/fr.c
+++ b/c/buildasm/fr.c
@@ -179,32 +179,7 @@ void Fr_div(PFrElement r, PFrElement a, PFrElement b) {
     Fr_mul(r, a, &tmp);
 }
 
-int Fr_isTrue(PFrElement pE) {
-    if (!(pE->type & Fr_LONG)) return pE->shortVal != 0;
-    for (int i=0; i< Fr_N64; i++) {
-        if (pE->longVal[i]) return 1;
-    }
-    return 0;
-}
-
-int Fr_toInt(PFrElement pE) {
-    Fr_toNormal(pE);
-    if (!(pE->type & Fr_LONG)) {
-        return pE->shortVal;
-    } else {
-        mpz_t ma;
-        mpz_init(ma);
-        Fr_toMpz(ma, pE);
-        if (mpz_fits_sint_p(ma)) {
-            return mpz_get_si(ma);
-        }
-
-        mpz_sub(ma, ma, q);
-        if (mpz_fits_sint_p(ma)) {
-            return mpz_get_si(ma);
-        } else {
-            assert(false);
-        }
-    }
+void Fr_fail() {
+    assert(false);
 }
 
diff --git a/c/buildasm/fr.c.ejs b/c/buildasm/fr.c.ejs
index 4ab9200..99033ed 100644
--- a/c/buildasm/fr.c.ejs
+++ b/c/buildasm/fr.c.ejs
@@ -179,32 +179,7 @@ void <%=name%>_div(P<%=name%>Element r, P<%=name%>Element a, P<%=name%>Element b
     <%=name%>_mul(r, a, &tmp);
 }
 
-int <%=name%>_isTrue(P<%=name%>Element pE) {
-    if (!(pE->type & <%=name%>_LONG)) return pE->shortVal != 0;
-    for (int i=0; i< <%=name%>_N64; i++) {
-        if (pE->longVal[i]) return 1;
-    }
-    return 0;
-}
-
-int <%=name%>_toInt(P<%=name%>Element pE) {
-    Fr_toNormal(pE);
-    if (!(pE->type & <%=name%>_LONG)) {
-        return pE->shortVal;
-    } else {
-        mpz_t ma;
-        mpz_init(ma);
-        <%=name%>_toMpz(ma, pE);
-        if (mpz_fits_sint_p(ma)) {
-            return mpz_get_si(ma);
-        }
-
-        mpz_sub(ma, ma, q);
-        if (mpz_fits_sint_p(ma)) {
-            return mpz_get_si(ma);
-        } else {
-            assert(false);
-        }
-    }
+void <%=name%>_fail() {
+    assert(false);
 }
 
diff --git a/c/buildasm/fr.h b/c/buildasm/fr.h
index 6bb0760..31a181a 100644
--- a/c/buildasm/fr.h
+++ b/c/buildasm/fr.h
@@ -36,6 +36,16 @@ extern "C" void Fr_lnot(PFrElement r, PFrElement a);
 extern "C" void Fr_toNormal(PFrElement pE);
 extern "C" void Fr_toLongNormal(PFrElement pE);
 extern "C" void Fr_toMontgomery(PFrElement pE);
+
+extern "C" int Fr_isTrue(PFrElement pE);
+extern "C" int Fr_toInt(PFrElement pE);
+
+extern "C" void Fr_fail();
+
+extern FrElement Fr_q;
+
+// Pending functions to convert
+
 void Fr_str2element(PFrElement pE, char const*s);
 char *Fr_element2str(PFrElement pE);
 void Fr_idiv(PFrElement r, PFrElement a, PFrElement b);
@@ -46,12 +56,9 @@ void Fr_shl(PFrElement r, PFrElement a, PFrElement b);
 void Fr_shr(PFrElement r, PFrElement a, PFrElement b);
 void Fr_pow(PFrElement r, PFrElement a, PFrElement b);
 
-int Fr_isTrue(PFrElement pE);
-int Fr_toInt(PFrElement pE);
 
 void Fr_init();
 
-extern FrElement Fr_q;
 
 
 #endif // __FR_H
diff --git a/c/buildasm/fr.h.ejs b/c/buildasm/fr.h.ejs
index ad5fd0f..19e155e 100644
--- a/c/buildasm/fr.h.ejs
+++ b/c/buildasm/fr.h.ejs
@@ -36,6 +36,16 @@ extern "C" void <%=name%>_lnot(P<%=name%>Element r, P<%=name%>Element a);
 extern "C" void <%=name%>_toNormal(P<%=name%>Element pE);
 extern "C" void <%=name%>_toLongNormal(P<%=name%>Element pE);
 extern "C" void <%=name%>_toMontgomery(P<%=name%>Element pE);
+
+extern "C" int <%=name%>_isTrue(P<%=name%>Element pE);
+extern "C" int <%=name%>_toInt(P<%=name%>Element pE);
+
+extern "C" void <%=name%>_fail();
+
+extern <%=name%>Element <%=name%>_q;
+
+// Pending functions to convert
+
 void <%=name%>_str2element(P<%=name%>Element pE, char const*s);
 char *<%=name%>_element2str(P<%=name%>Element pE);
 void <%=name%>_idiv(P<%=name%>Element r, P<%=name%>Element a, P<%=name%>Element b);
@@ -46,12 +56,9 @@ void <%=name%>_shl(P<%=name%>Element r, P<%=name%>Element a, P<%=name%>Element b
 void <%=name%>_shr(P<%=name%>Element r, P<%=name%>Element a, P<%=name%>Element b);
 void <%=name%>_pow(P<%=name%>Element r, P<%=name%>Element a, P<%=name%>Element b);
 
-int <%=name%>_isTrue(P<%=name%>Element pE);
-int <%=name%>_toInt(P<%=name%>Element pE);
 
 void <%=name%>_init();
 
-extern <%=name%>Element <%=name%>_q;
 
 
 #endif // __<%=name.toUpperCase()%>_H
diff --git a/c/buildasm/fr.o b/c/buildasm/fr.o
index 3255705ddf52e2112ab596c5c29ab942104c5d14..e352655211a02e08a249e15056c575caf64a853d 100644
GIT binary patch
literal 22051
zcmeI43v^V~)yHpmjs!^3@CZaCArTV7E14t^(Li{4M+Z@Z1pRErKoUUnfJsJCumUOS
z2(%VywYG{@Ev@ylDy@Lll8_2TMFKuR#0pq(6d!<(Kt%ZVKKp;>-U$<wfOd7Q@2(a8
z=XdTo`|PvN<DNS+y0z((;~fnnqOC#y&|e$+QwdhOdeL7%rNaMn_YlcX;L3DqCYuKT
zDSM<IPj$)MYD(bpcqWgZI$4uVo7sD6sA0Uzw>ugOY^BIvaZz=VmE-Y@%bT2Mu>m`G
zBP)UIoa$mf<LK`X*@oeyzU*`v#-*JN!(7tA^mjCuOmLX~iyfrVq|u~tq;aGPqzUyd
z|3R1k=-T#V!ED@T`s<E;Za(JrZ*=>&)<3nttlKk!t<)Sh=5{mvH#yAoT4jb!aCNh7
z7CWbIZQ6K(F4KR|jBW2wnbe-5Xd$Y?_t;yhyriQU_1vCO-gf5n+In*dx#_Pn>ptx3
zJJ(z?DcW4T*%wQRI8Jn;L;@!wq+l9*Y*b~bg7ICry{Z&dIKB%vR~4@+#CPG=s=6w}
zNBf#JbrEEtU_E8Z?C_X1A5$c@xt=HAKfCA4y&EQ`*G^2|JTZMcN3b!`6;bPo+2*R*
zZn*umuEzIFf4gL}@q9L5-BLx19Il8uSIl--O#?-r;?9+=3{{Q&v@+fPe=3XPlBqCE
zS{11EqG(sd23Jgjt7aQaawE2!Xw`_7A(o^SD_1qmQL*Z}{S9cEOrUA20yiCJ?;iJt
zozbyS^Qn=YvE{^tgv(qqE}3nMGgdKiQM|Eom5V%9mPH-!ami%(q<|}r$VV$)G{cpT
zwj8P$Ix1o-bQH9s;*wQc92K8*uG=3)lLNh{)~%4yx@tCD(pG5Lbz5Rp*LM309BRTT
zBO!qoBh3SIaWu_Rw|`O`&(y`+eIse{#F-=2((+#I8$=jQ$ZdNs@%2$lYouC~-jTkp
zCat@X?dhK39qgldrIKbUZ5Fa_d+~muDx1A{%a9e@i<kUMX3aln)t`FJ>^XT1TUs-v
zwl!lP%hoKGQrlt)85x?p<dP0H4*@T?v$04@ZDVD1S{6UMqvyAk(i7l&Tovq;p08F)
z<}AfQ-(pXAVV#}Dz>Vq%TPfYfX)glX6w)^SyVk&7YsmFJ7IqErHb!NwK{@T2&)XhZ
z(81?$ot5d$dy%adZ1;QI&d=6dY{jPgU$(`%+jivRz_*-8+-)a0xQHA^PIFSZ+ZIG~
zMLBkymHFgudvTn0`~RoX5Bs!M$Lv6^_gXq_2S#~wOg_<Xa!fIo$>Du^gIUvL%#94B
ze0}0Xp;_~pquy-X73fW5`i}>C(h~x?x}v`cbptPa5v-z`Ig(q|QyuE7=<KhW38a5R
zc9c<7Vo$EuAtj>dAhF32h|%}yUBsMzFtGUZ6DQ~mgwFXL%q5-V4I!0e@2IFn8|lzu
zrf>Ieh<IssJJa8@ehSqvr*AVO-V98ndWH2UIGSFCxN5HVg1prWTy^h_aQo@_ztO>k
zsa5Xr%`x1~Np$>S_sp749rXbZy-x*+ZRL8?^H$fwK!NGs5qRP_$EAth9M}w5tl8iQ
z{F2+#R;&skW#-t+h;6%b%P1~96n5vHX=gJV*wD-X^=`P;7CF~w`riz6R{kBPp$m2K
zFvsp&Tzu7DM&dV3JWaNT(bn<b+H0Kb%xyfl{*#?4u~!Qp=W(iPvp5g7*Rz@niSs%3
zGCYggw&A(RuVk@ftk>b#G1e<_>==HZjq?uw{twag&fJ4$?sMd%Va84&e+nEL$f1I0
z4dhWloc9Mh+Mjy0r8Zk_sc#0}{mi!7CVc1Bc7i9To`iwdnoa01t1VaULd|ADzI~Op
zFbjs-%g78HZO!4DBgWjGQ`EGf4TM+lqwuAW_7vMvq#a^3EUC>U{F=M3Df~2l+}^<!
z9KGFM<~yyq$@UtSRlNa3w%|-3d$sUuuHh*6qgk}yx34FwxsWwiXD`ERF13NyoJ?h2
zc)bWOmXD!SQa*`N$+)UC{SF!td<Tu;!txFpW4(jMTpU+#re&D^;cM0MiI?T9L9J&E
zYC)f-Y4STQxL3fqdU1-k?G^E|SDdbCyk&D(sAv4vW!CKE55j^S6%4*`3&uq)-@q^I
zY4UL%m5!%ys#+A6c>S>+y`0C(M|)ArH#!bipI%6*-|B<79*sNsvD#4{tBwB(96g{`
zxjf1FVHXJ9T<PP$oDRNzX3hi$eQ1|6A==l2{*Cj|NOV+A@@I~;vC{S;{YN*X|G}Qf
zKnFV`A2^^t_3kAdT*|xi=+nn>{@TXC?6zcnifekU*%&bW8w2^uOD>e_%{h632Hdn)
z=}kx0y#KhltUFJkz%i=J_X_L7RE)J%WIx<XI*BWTN%%aH#7jzfmDl)T&@I>W&1U0=
z?Af}HIDRPnF%?!$MlD)IO>=Ipx4>$aT-)ey+0G|D`FwKEAzqTl19xNREIiODa2w~b
z)6IJ`#MT?@)U(Mtr*uI9b=naRa;;r4yazGxpsUS;Zw|H`HrY<8=Q`#bfIYcUi}<V%
zrq{IFx@-p@)$0e?KK1&391gkHe%)sCUXMUqJchd0Y7;-n>;#w{Ycrdn&8l(A^|o}<
z+5VxeN7kr?Y=ckQ%cx#^XG)JRYN5t_TaD)Zx(@g3{R(Mrl&$i&c;C%lv;|)d25ddF
zP4}opcVXmc%I~IGoX3yP*u0vf#@sG+93SW3FfQ>WK8{=QFPK7SW!LmWfoDJ9k!&jT
z6kJIMR2LoaA5}TWukolOS(5EYmSo#zlVqEvG6`nV82Xb9M15%?i|;{tE@NihNB&uD
zE5|Zj)9cJ6?3J`nC1I;nN%e5xFEf(Zx@9@&wV}PXthUx$%R=52`VqbLFb72)i}S8N
z3+`UAA3?SnYpuI#x<)N(9#I-_iYNsP!^N?~XsM(X(a^C9j{1}Dvx_w9XYQh9A@6dE
z=#IbwwL>*|@}{bpd1j8bKYNbaW~b}|V=UKOJ3f{L)%C?{M{7ExwUq0<D#U6dzeWyH
zhULwTPjGtR`I|&N^89V$Dc0%9MtAT7Rp!0&ev{(Xdw-gn)Hy9}QZetbU-nJv#6Hf^
zn^dH2lZv!$QjxYzDl&B9^MKQK`5iW?NNbadv^J?oInMDW71_cj^*_o-^4bctnpLgv
z*0Nx2QUgB?4wikBYPGvh>_w2R##-y{w`@{60317OlhT8waznR${b)Kzxp?v>r491r
z*A{v5Ym@wtYBv5>C$UMr{jutP$R?%jp0=ac?ZNc4nmL15^5Kj({P3HUcCuBSSIc}4
zpE~_bvPreVocI-Hle$A0wl=9&*tP;luBx3c!!oM8?{|jYpXMf&-qI#j_AeDh+ezvg
zm7_N)r)`sR+BPYtZIg1gc9U{io0QYqq@30!<!oV-diEW7Z3SA*)K++FS+F*##eA+k
z`6Sh9cRQXvcfVzm(gC2guSZKIgD0tGV--9}74POQpS($FgS<|)Mc$-NG5)rQ%1J7l
zUjb;P+D}s2?rA&v{M%>EQHtfMH!1C8t2(ci`A9kP%O=$db1iOC`_$pw+N4@x+Zrdm
zNiDOCD(`QVH-J`qZ?!<%6-RrNw_9+=9exV~d7!r%h^koaMhD9cwW=HG^DX{Fi>9DT
z%IAD4DL*=+r0so+eo2y2U@n`V><G-Gg&bHzXK(64yJY!1DvjPVt9#GwY;NM8<k1Ia
z|46BCmZrB+<k!qkPB47QCTW~OpGJ{J8@_I=4#USbtg?1{mJ3H{@&__obirQTp0-^3
zb{DL&c6TfneC)#0|NbsfIE4#Qi|4Dbs7O>J5@m=)aYzK|YyAW>M}6Yv&GikFUt8p;
z59GW<d<pVhZI1f9&U+qxuBU!pkfYw1y<O?oL-t78yYzk8wL*0Xt=GWqbZ`$pVZw*U
z?yefGA2d|qeLC|{g|};ksxPh50KYAS4^{X{X&=q+7Anh)Gw)J(pS~}<R;a$9wHFvh
zuL0phWp&X$lm4@z3h&dIhpGj;_^zPC;@ax|2k57UbTC|8>q}C5J|%inf_}1F>x-cT
z{baY+=g3pv$sFjAw^o^4(nfZ7u|VHc(7Bb0^`iv+=(pC_ixSEL?KX5=rJRoIcsd+t
zzmDs>6YESr{dPcqY4M+P<eYGhP=6#M)E{~ZN`E9G{4hMZKlH2SY6tdFe!6iVsdxBo
zbTCNtRFxpnH!5P3zVo338NFDHN|f8HAlGxi=vqM54${w>$NpmWx|_{_Gv&uq7cP8u
z{N-y?A4=cry{vc`l{vDx>EOfW+T9l>f6;5jkSA(KzuhlocejT7X6FpZh+9>j_~iKg
zYvbR$`r7xNzTkNN;swv=UsU5-`q;S3ZhN|+N1M^c`oHYmxuS6GvtOV4_urZWKiRtS
z;o^-K`sbIta@(a>AL-1$38$;?h(U(YEyC!N0*!+@pnKBfegm`?`V_Pa^qYZF?i1)c
z(7!?-gZ>h_7`iW2>TQQ^fIb7g3wjImdgwLKH7Qbm74%-{9Z(N+5_A-FDD;8;hS8Jy
zKLGmT`NFfHy`dYECEp9}1Kpe?`L{s(LtpME`8PrPKo=!SeggC#3Bo>TB6Le%$)5{N
zhQ4v0<S&Hwhi>nK^3ZqA6`lv}3vGy({Q1xn=xe<t|2F6_=x+KCHaI>Dp@X5X#Yz79
zo`%tb?tjoj^bmc0$D9Oxp_^gE5<dxD30)3Ng2q9+K-)rJh(&$qO6YRv?a+D9+0asG
z8Z-gg9U2L3_>tIu5&9hTDd+(DjV$|rE;I((5qd02?tcn>7uo>*1@w04Jm?%~DRe5-
z1-$?|t+Qctr}q0pn<AyX&!GQ??t*TG)<K_vJ_4NwErgoTLC_vh1Nu=XY426&I_M+N
zh0qe{<<KF}A3+bDBX<4_eH8j@=+B`)h299A0i6mR291S&;}E-hp)W)K3S9}UfmT4L
zLert$p$7CVdb8nie*t<g^m6EU=mpSW(DR`^p$_QL4q|T`^bzPX=vB~B&{XLD_EPU9
z=wG2Lp;tn)p^4CU=@)A3e?9abs2iFG&4vzwCPHJO?Vw+_6?<Et4?^#Rn$QgBxzGms
zGLZfF3v?ya4;>7RfgYm=BbR>$`YWgh%HQl~L>Pk|;I9oS|0#4Y^nU14=ue=tpvOqN
zl8phRe08EU^H@P%bBasB1Hn&&$p>|R7x*IZxukrV;1uxH;8cnyUtaKJ@G|hV;D^D3
zY5wr_0(dI;ZSZyAPryrQUGUYB;>rD415N_32WNqI&^qU961WZRGko0ujtAcgc7pE)
z=Yk&rPX_aNbNjQwFM}6>cY>FL4}c#7ccl5l^;d(>1MdP40Dl0!0DJ_T2X5O%`f~}m
z6L>N>8+;9T9Jm;KDYz0mAAAe=A#e?N6?hr=HSj&)z2FDH0q`HdeY=XktHEQze*<3v
z-Uz+|ybbIF?*=~s-Va_4J_P<Z_!!th&mF$n(>&z(SAb){zXtaO-w#d!x1;AGUzy;c
z;4xqmd@1-Ua3Q!9Tmqg0t^m&k&jmjU{t5UQ@SWgwVBY_@KOcb~1b2-Qe^-IKgP#VE
z1g`;K1+D{M3w{NB4|oT74R{au@8FNXFM_`We+V{cA7_6P=p4dVC-4Apckonj0(d?+
z75u;8Ebvb7Snyk5H`qbvBEF`Ao#0Y%Cb$wj9Xt>GGq4~0bMSI-8lCI-dI+2i{yjJs
zybkOJuLqZaH-Uc+ZUDay-UZ$ZJ_tSxZUP?#x2NYV$2&v){LC<-!PkR(f#-q;ftP}v
z;CsOrf`12|0RAKR3h-`l0eC<7$6$lb)qKqaCxgA<H1Mt9LU0XuCfE<21zrJO27Um1
zA9xjbCHNWecJNy8Zt!~WSKybxsq}up7oU4LzE1E?a3**kcqI4}um^kuTmz1v=N{X;
z3mggl1-J+JRd6EsFgOi-6r2t2L+>?w<$-?;z65+D_zLiDFh7^spAW!A;KSe>z}fWv
z#FrO*7kEDSeQ*sphu*{ZS_&Qq{uTI6@B`r8;8oysdcWiAN$_Iu8t}c~4dA!HTfiyw
z-pJPu@KEqR@K3>?fZNdfCtqKJ<H5(k3&CyZoXzoC3ho5H7aR+I8{8W_l-_swN&?>n
z9ti#yI0O74cqDi*y+`vk2D}h_DfmtBmEeI1s<?3t_(E_o_$Od~ui*Y{0pA3E9lQ{n
znrNtN33wHF1-KUc8*u-AQvP?~bnu_R7lQeHhudEO{u}sp@J8^^B(b*zTmya+{4?+#
z@OJPA;Qq-{{}6Z{_y~9_ID*cZ?9X0sXK>Q_QokqI3r+;z3?2l26+9d~uD{gJ1y2P}
z0DHibz+N!FKe9g?!NuS$;4<)A;A-&u;Q8P~;5)!E1H_+Y;6C6LU>Epd@a5pg!PkOU
zgJ**O2CfGG6TAYv75or*2ly56d*Ii=2f*)wKL;NGe+_N~ccAxnj#qq&^sh5`1~?X6
z1?~;L4V(yG4^9EU3?2$@1djwC2ag4JN|p961@{2wgZqIC!4ts6;N{>Ozz>4G;K#u?
zgFgZ<0DlF(1Ke+*__G3>3Vr~b1^zua5Bz8FMDX+AIp7W87r>jro52m>H^4i=-P6RM
zcfpC^{osk<&%u+y$H3Qt+egZHmw~&2=Yo5Ke+y0o2f!)dFTg{=#vt);ICwNT7wiU)
z2hRk%!Arpf;1%E^@crOf;K#wU!LNe(b1$CHZ-5trcY&9I4}n*JyAKxsSAzS1{|HV3
zKMi(**MbYc_25GA7VvcN8{k{OyTK2FKL9@lJ_LRod=&g=aEH#)-!<SLfwzKtfj<W)
zgPXuZz$d`j%xw(AF+}1q0-OTA2yB8!gJ*)rg6{-RAu~}l9vdj1uZ8r-oQLz$Z@|N_
z-`)k@kMqWI@RCGI&_&Z()mK3O@M{O#!**so3jRIpZ3YicqXb>g(I1!Jf&J$Ics=^R
z4Lo%aCFrW7KQ7;9ph9CG_<EGz1>TGDtHDpep_{>1;=Er99)$OiKY>$G{wrpRzyALa
zRp9<hC|?L3hWA@OHnD$?kn%O2{+RDUyxA;sC-4aH95CH7_%C>QCU`xiMYGBbPE4<y
zeRD8Tp;FbAu8L};CRSEd&!{Xf@k*iU%F8Of<wa7py3$=)F~gQoR9vj8Rr#hVttgox
zJjYk$Em6sGpVXaJR3T-jReIHpX>)a=qEZ?!nFAxDWs*BXqzrdwK+CkfGMFjTW@c4Q
z_WGppIR-jh;VG-EoNaiEZW>G7&(ClhzU)ltj;E;jdS6wwhkd8gWz<8hmswfky<V<u
zMQ0-Qt9gcpIy=!*HK&Ce#g!E$p||oSP9b(AFT5%Hy_2nxOX;EZIVZd&>yEZF!CP5w
zb&u_Y=Gg6oyQAz>S6U|WXI6TvjoFn|&9f-d&9m(Fc#awN3{Npl!s?l`RJP1Mlo1HI
zZ_Q9oX=sn^vsc{{2Wbv_s?w`63{I36RTRxAnRH``x3sMCCY41o<vV4%NLhLX6|OFy
z?a?>NQMoLgQWYpo$#RvfN-q=JoTyM0E!IUU%7UfKb+SxXq!wX9rF09yI@E6PKBe@1
zWr&6`uejLl=J8YsOixMcv1iKHMe=P$@+r17X=!~+j5yIOMw~@45}`;)LdVDn<`~Hx
z6{BFXT;-}5ah?^U%-{`OMD<q+sji6)>bWF1M!{5tm6YldBe}0)6ik+Lzw>?5BmgSm
zDN;*V(mF;&`6`SmVHL@DON?Me7je6-B9zuvXiJfXD4}c8dhk>k{BN_+a+ca<sIc3h
zRZudcsG3GY?HUv-ooZGM_jypHBuyJDS#HoSC8NoSW_3A>DvHpUNrFc+n36f1rDk%r
zl`VGF8bGERX<jJ9RoM|%w)TOBjLlZ52_8&I139wBhFK-bB_~}(SEbQJ5jC!2MNJU#
z7`J5+Nfu3&3OJ)CmE>weYO3h_$`CzjBw%XQI}K*u7L-tEB%!B#dL}Y>&Z`<(Dnm8`
zWlC=Z>Dj?M=-hDBC9h#sEojw}@>O!#*I<ekyt=P^t@PSl9bpiXr|MtwMrqK`9AWKd
z#xQ2(B^0}rs?Yi2V+QPy3u2Ew)TwgV)Hlf|+*IDtGv9JA!)Y*+e<I|dB(#SanaBvb
zn58n5k77zkG9x>92VM?GUGfB0xoj|5jwDA?GL@^rWVtbo4ivO5m5`56<nxj$nd7PA
zXWZEG*(&X!qYCGF=;Wf5jw+;lqCgSJs34&~tFi*FEeWbF36#?YI1^cvG|I?3-8`q+
zfKsZjRLbbultmdlA2UXX<Zv;z#F@@vBI(8qn_W(`U8Q7KDb*m=b}6Y%$aHr)`F7B5
zrr6Cg=mckTm_d2066~@{kSR`R<DAykv&GPGRUl|y`r^zn=wN7>SD+kMR@rlvVAm<3
z&2t*&Go}BT)PKs<<};;BnNHPqW~SjSslKMfTj|Nn=H#S`5>I9p?aZvQ%VmxTmdP3x
zER!Q;vSjbd%CO2PlWZr;i88XYW~l~LTUpAaDl;5qWOK|`4X85N$|RS`PM0#-PJ@rc
s9(WuCDx*4+ZFMF)*qLl}CVRLs$Cz1ER%%?CVO&X;rd3WXs=C4WKNJAI4*&oF

literal 21563
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
Tc;k*Z;|^*yHb31}IMMh&O(s%Q

diff --git a/c/buildasm/logicalops.asm.ejs b/c/buildasm/logicalops.asm.ejs
index 1fbbed3..00d90e8 100644
--- a/c/buildasm/logicalops.asm.ejs
+++ b/c/buildasm/logicalops.asm.ejs
@@ -80,3 +80,18 @@ lnot_retOne:
         ret
 
 
+;;;;;;;;;;;;;;;;;;;;;;
+; isTrue
+;;;;;;;;;;;;;;;;;;;;;;
+; Convert a 64 bit integer to a long format field element
+; Params:
+;   rsi <= Pointer to the element
+; Returs:
+;   rax <= 1 if true 0 if false
+;;;;;;;;;;;;;;;;;;;;;;;
+<%=name%>_isTrue:
+        <%=     isTrue("rax", "rdi") %>
+        ret
+
+
+
diff --git a/c/buildasm/main.c b/c/buildasm/main.c
index 7eb607f..d33cefb 100644
--- a/c/buildasm/main.c
+++ b/c/buildasm/main.c
@@ -1,13 +1,15 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <assert.h>
 #include "fr.h"
 
 int main() {
-
+    Fr_init();
+/*
     FrElement a = { 0, Fr_LONGMONTGOMERY, {1,1,1,1}};
     FrElement b = { 0, Fr_LONGMONTGOMERY, {2,2,2,2}};
 
-/*
+
     FrElement a={0x43e1f593f0000000ULL,0x2833e84879b97091ULL,0xb85045b68181585dULL,0x30644e72e131a029ULL};
     FrElement b = {3,0,0,0};
 
@@ -24,6 +26,7 @@ int main() {
     Fr_mul(&c,&a, &b);
 */
 
+/*
     FrElement a1[10];
     FrElement a2[10];
     for (int i=0; i<10; i++) {
@@ -43,6 +46,19 @@ int main() {
         free(c1);
         free(c2);
     }
+*/
+
+    int tests[7] = { 0, 1, 2, -1, -2, 0x7FFFFFFF, (int)0x80000000};
+    for (int i=0; i<7;i++) {
+        FrElement a = { tests[i], Fr_SHORT, {0,0,0,0}};
+        Fr_toLongNormal(&a);
+        int b = Fr_toInt(&a);
+        int c = Fr_isTrue(&a);
+        printf("%d, %d, %d\n", tests[i], b, c);
+    }
+
+    FrElement err = { 0, Fr_LONGMONTGOMERY, {1,1,1,1}};
+    Fr_toInt(&err);
 
     // printf("%llu, %llu, %llu, %llu\n", c.longVal[0], c.longVal[1], c.longVal[2], c.longVal[3]);
 }
diff --git a/c/buildasm/montgomery.asm.ejs b/c/buildasm/montgomery.asm.ejs
index 097fad7..6cb2f58 100644
--- a/c/buildasm/montgomery.asm.ejs
+++ b/c/buildasm/montgomery.asm.ejs
@@ -338,4 +338,5 @@ toLongNormal_fromShort:
     movsx   rsi, eax
     call    rawCopyS2L
     mov     rsi, r8                     ; recover rsi
+    ret
 
diff --git a/c/buildasm/tester.cpp b/c/buildasm/tester.cpp
index 07792ce..95b2d2a 100644
--- a/c/buildasm/tester.cpp
+++ b/c/buildasm/tester.cpp
@@ -139,6 +139,7 @@ void processLine(std::string &line) {
 
 int main(void)
 {
+    Fr_init();
     fillMap();
     std::string line;
     int i=0;
diff --git a/test/fieldasm.js b/test/fieldasm.js
index 20d5a75..60146ec 100644
--- a/test/fieldasm.js
+++ b/test/fieldasm.js
@@ -13,7 +13,6 @@ const mnt6753r = new bigInt("418984909679189534023442147912406371281707099199539
 
 describe("field asm test", function () {
     this.timeout(1000000000);
-/*
     it("bn128r add", async () => {
         const tv = buildTestVector2(bn128r, "add");
         await tester(bn128r, tv);
@@ -255,7 +254,6 @@ describe("field asm test", function () {
         const tv = buildTestVector2(mnt6753q, "div");
         await tester(mnt6753q, tv);
     });
-*/
     it("bn128r square", async () => {
         const tv = buildTestVector1(bn128r, "square");
         await tester(bn128r, tv);