Fix bit operations. Test them (a bit) better.

[u/mdw/catacomb] / tests / mp

diff --git a/tests/mp b/tests/mp
index ed5e3b8..c451acb 100644 (file)
--- a/tests/mp
+++ b/tests/mp
@@ -1,6 +1,6 @@
 # Test vectors for MP functions
 #
-# $Id: mp,v 1.7 2000/07/15 10:03:13 mdw Exp $
+# $Id: mp,v 1.13 2002/10/19 17:56:50 mdw Exp $
 
 add {
   5 4 9; 5 -4 1; -5 4 -1; -5 -4 -9;
@@ -21,6 +21,43 @@ div {
   9 4 2 1; -9 4 -3 3; 9 -4 -3 -3; -9 -4 2 -1;
 }
 
+bin2c {
+  and 5 3 1;
+  or 5 3 7;
+  xor 5 3 6;
+  1111 0 0 -1;
+  or 45 -7 -3;
+  xor 0x343cd5 -0x6a49c -0x32984f;
+}
+
+lsr2c {
+  -1 5 -1;
+  1 5 0;
+  -6 2 -2;
+}
+
+setbit {
+  0 40 0x10000000000;
+  0x87348 40 0x10000087348;
+  5 1 7;
+  7 1 7;
+  -3 1 -1;
+}
+
+clrbit {
+  0x10000000000 40 0;
+  0x87348 40 0x87348;
+  5 1 5;
+  7 1 5;
+  -1 1 -3;
+}
+
+neg {
+  0 0;
+  15 -15;
+  -15 15;
+}
+
 odd {
   1 0 1;
   2 1 1;
@@ -49,19 +86,19 @@ sqrt {
 gcd {
   # --- Simple tests ---
 
-  16 12 4 -2 3;
+  16 12 4 -11 15;
   12 16 4 -1 1;
-  693 609 21 -181 206;
+  693 609 21 -7 8;
   4398082908043 90980984098081324 1 -32483863573352089 1570292150447;
 
   # --- Negative argument tests ---
 
-  16 -12 4 -2 -3;
-  -16 12 4 2 3;
+  16 -12 4 -11 -15;
+  -16 12 4 11 15;
   -12 -16 4 1 -1;
   -12 16 4 1 1;
-  -693 609 21 181 206;
-  693 -609 21 -181 -206;
+  -693 609 21 7 8;
+  693 -609 21 -7 -8;
 
   # --- Zero argument tests ---
 
@@ -74,13 +111,13 @@ gcd {
   # --- Random number tests ---
 
   829561629303257626084392170900075 32498098450983560651904114638965
-    5 -22841190347053190672253237276815 583054885752979049202923618992482;
+    5 -29340810037249902802634060204608 748967211613630574419802053172497;
 
   5509672937670943767152343650729669537671508
   398326674296699796695672966992514673531
   17
-  -191606556147997561067126486929677861359
-  2650310725368604614586643627755316700713319;
+  -4158709420138833210339208344965073815
+  57523460582278135926717203882531035926727;
 
   324098408098290809832490802984098208098324
   23430980840982340982098409823089098443
@@ -134,6 +171,7 @@ jacobi {
 }
 
 modsqrt {
+  1 3 1;
   4 5 3;
   9775592058107450692 13391974640168007623 3264570455655810730;
   8155671698868891620 10189552848261357803 2073812183305821596;