Make cmp constexpr so that all <=> for fp/fp2/g1/g2 become constexpr.

AntelopeIO · Nov 29, 2023 · 8871e5e · 8871e5e
1 parent 6818a31
commit 8871e5e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/include/bls12-381/fp.hpp b/include/bls12-381/fp.hpp
@@ -34,7 +34,20 @@ class fp
     bool isEven() const;
     bool isZero() const;
     bool isOne() const;
-    std::strong_ordering cmp(const fp& e) const;
+    constexpr std::strong_ordering cmp(const fp& e) const {
+        for(int64_t i = 5; i >= 0; i--)
+        {
+            if(d[i] < e.d[i])
+            {
+                return std::strong_ordering::less;
+            }
+            if(d[i] > e.d[i])
+            {
+                return std::strong_ordering::greater;
+            }
+        }
+        return std::strong_ordering::equal;
+    };
     bool equal(const fp& e) const;
     bool sign() const;
 

diff --git a/src/fp.cpp b/src/fp.cpp
@@ -94,11 +94,6 @@ bool fp::isOne() const
     return equal(R1);
 }
 
-std::strong_ordering fp::cmp(const fp& e) const
-{
-    return scalar::cmp<6>(d, e.d);
-}
-
 bool fp::equal(const fp& e) const
 {
     return d[0] == e.d[0] && d[1] == e.d[1] && d[2] == e.d[2] && d[3] == e.d[3] && d[4] == e.d[4] && d[5] == e.d[5];