added pow_I

MoarVM · Jul 14, 2013 · 3ed32f9 · 3ed32f9
1 parent 4577ad3
commit 3ed32f9
Show file tree

Hide file tree

Showing 7 changed files with 91 additions and 4 deletions.
diff --git a/lib/MAST/Ops.nqp b/lib/MAST/Ops.nqp
@@ -2087,6 +2087,7 @@ class MAST::Ops {
                     $MVM_operand_write_reg +| $MVM_operand_obj,
                     $MVM_operand_read_reg +| $MVM_operand_obj,
                     $MVM_operand_read_reg +| $MVM_operand_obj,
+                    $MVM_operand_read_reg +| $MVM_operand_obj,
                     $MVM_operand_read_reg +| $MVM_operand_obj
                 ]
             ),

diff --git a/nqp-cc/src/QASTOperationsMAST.nqp b/nqp-cc/src/QASTOperationsMAST.nqp
@@ -1328,7 +1328,7 @@ QAST::MASTOperations.add_core_moarop_mapping('neg_i', 'neg_i');
 QAST::MASTOperations.add_core_moarop_mapping('neg_I', 'neg_I');
 QAST::MASTOperations.add_core_moarop_mapping('neg_n', 'neg_n');
 QAST::MASTOperations.add_core_moarop_mapping('pow_n', 'pow_n');
-#QAST::MASTOperations.add_core_moarop_mapping('pow_I', 'nqp_bigint_pow', 'PPPPP');
+QAST::MASTOperations.add_core_moarop_mapping('pow_I', 'pow_I');
 QAST::MASTOperations.add_core_moarop_mapping('abs_i', 'abs_i');
 QAST::MASTOperations.add_core_moarop_mapping('abs_I', 'abs_I');
 QAST::MASTOperations.add_core_moarop_mapping('abs_n', 'abs_n');

diff --git a/src/core/interp.c b/src/core/interp.c
@@ -1611,6 +1611,20 @@ void MVM_interp_run(MVMThreadContext *tc, void (*initial_invoke)(MVMThreadContex
                         cur_op += 8;
                         break;
                     }
+                    case MVM_OP_pow_I: {
+                        MVMObject *a = GET_REG(cur_op, 2).o, *b = GET_REG(cur_op, 4).o, *type = GET_REG(cur_op, 6).o;
+                        MVMROOT(tc, a, {
+                            MVMROOT(tc, b, {
+                                MVMROOT(tc, type, {
+                                    MVMObject *c = MVM_repr_alloc_init(tc, type);
+                                    MVM_bigint_pow(c, a, b);
+                                    GET_REG(cur_op, 0).o = c;
+                                });
+                            });
+                        });
+                        cur_op += 10;
+                        break;
+                    }
                     case MVM_OP_cmp_I: {
                         MVMObject *a = GET_REG(cur_op, 2).o, *b = GET_REG(cur_op, 4).o;
                         GET_REG(cur_op, 0).i64 = MVM_bigint_cmp(a, b);

diff --git a/src/core/oplist b/src/core/oplist
@@ -272,7 +272,7 @@ BANK 3 math
 0x24    bnot_I              w(obj) r(obj) r(obj)
 0x25    blshift_I           w(obj) r(obj) r(int64) r(obj)
 0x26    brshift_I           w(obj) r(obj) r(int64) r(obj)
-0x27    pow_I               w(obj) r(obj) r(obj) r(obj)
+0x27    pow_I               w(obj) r(obj) r(obj) r(obj) r(obj)
 0x28    gcd_I               w(obj) r(obj) r(obj) r(obj)
 0x29    lcm_I               w(obj) r(obj) r(obj) r(obj)
 0x2A    expmod_I            w(obj) r(obj) r(obj) r(obj) r(obj)

diff --git a/src/core/ops.c b/src/core/ops.c
@@ -1619,8 +1619,8 @@ static MVMOpInfo MVM_op_info_math[] = {
     {
         MVM_OP_pow_I,
         "pow_I",
-        4,
-        { MVM_operand_write_reg | MVM_operand_obj, MVM_operand_read_reg | MVM_operand_obj, MVM_operand_read_reg | MVM_operand_obj, MVM_operand_read_reg | MVM_operand_obj }
+        5,
+        { MVM_operand_write_reg | MVM_operand_obj, MVM_operand_read_reg | MVM_operand_obj, MVM_operand_read_reg | MVM_operand_obj, MVM_operand_read_reg | MVM_operand_obj, MVM_operand_read_reg | MVM_operand_obj }
     },
     {
         MVM_OP_gcd_I,

diff --git a/src/math/bigintops.c b/src/math/bigintops.c
@@ -1,4 +1,34 @@
 #include "moarvm.h"
+#include <math.h>
+
+static double mp_get_double(mp_int *a) {
+    double d    = 0.0;
+    double sign = SIGN(a) == MP_NEG ? -1.0 : 1.0;
+    int i;
+    if (USED(a) == 0)
+        return d;
+    if (USED(a) == 1)
+        return sign * (double) DIGIT(a, 0);
+
+    mp_clamp(a);
+    i = USED(a) - 1;
+    d = (double) DIGIT(a, i);
+    i--;
+    if (i == -1) {
+        return sign * d;
+    }
+    d *= pow(2.0, DIGIT_BIT);
+    d += (double) DIGIT(a, i);
+
+    if (USED(a) > 2) {
+        i--;
+        d *= pow(2.0, DIGIT_BIT);
+        d += (double) DIGIT(a, i);
+    }
+
+    d *= pow(2.0, DIGIT_BIT * i);
+    return sign * d;
+}
 
 static mp_int * MVM_get_bigint(MVMObject *obj) {
   return &((P6bigint *)obj)->body.i;
@@ -52,6 +82,47 @@ void MVM_bigint_div(MVMObject *c, MVMObject *a, MVMObject *b) {
     mp_div(ia, ib, ic, NULL);
 }
 
+void MVM_bigint_pow(MVMObject *c, MVMObject *a, MVMObject *b) {
+    mp_int *base = MVM_get_bigint(a);
+    mp_int *exponent = MVM_get_bigint(b);
+    mp_int *ic = MVM_get_bigint(c);
+    mp_digit exponent_d = 0;
+    int cmp = mp_cmp_d(exponent, 0);
+    mp_init(ic);
+
+    if (((cmp == MP_EQ) || (MP_EQ == mp_cmp_d(base, 1)))) {
+        mp_set_int(ic, 1);
+    }
+    else {
+        if ((cmp == MP_GT)) {
+            exponent_d = mp_get_int(exponent);
+            if ((MP_GT == mp_cmp_d(exponent, exponent_d))) {
+                cmp = mp_cmp_d(base, 0);
+                if (((MP_EQ == cmp) || (MP_EQ == mp_cmp_d(base, 1)))) {
+                    mp_copy(base, ic);
+                }
+                else {
+                    double ZERO = 0.0;
+                    if ((MP_GT == cmp)) {
+                        mp_set_int(ic, (double)1.0 / ZERO);
+                    }
+                    else {
+                        mp_set_int(ic, (double)(-1.0) / ZERO);
+                    }
+                }
+            }
+            else {
+                mp_expt_d(base, exponent_d, ic);
+            }
+        }
+        else {
+            double f_base = mp_get_double(base);
+            double f_exp = mp_get_double(exponent);
+            mp_set_int(ic, pow(f_base, f_exp));
+        }
+    }
+}
+
 void MVM_bigint_shl(MVMObject *b, MVMObject *a, MVMint64 n) {
     mp_int *ia = MVM_get_bigint(a);
     mp_int *ib = MVM_get_bigint(b);

diff --git a/src/math/bigintops.h b/src/math/bigintops.h
@@ -9,6 +9,7 @@ void MVM_bigint_sub(MVMObject *c, MVMObject *a, MVMObject *b);
 void MVM_bigint_mul(MVMObject *c, MVMObject *a, MVMObject *b);
 void MVM_bigint_div(MVMObject *c, MVMObject *a, MVMObject *b);
 void MVM_bigint_mod(MVMObject *c, MVMObject *a, MVMObject *b);
+void MVM_bigint_pow(MVMObject *c, MVMObject *a, MVMObject *b);
 void MVM_bigint_gcd(MVMObject *c, MVMObject *a, MVMObject *b);
 void MVM_bigint_lcm(MVMObject *c, MVMObject *a, MVMObject *b);