X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/a69a3efddbe1261f55e90d4ff477053ab80663a5..80be023065ced106a4078a36371c135a60d2bd6c:/mp-arith.c diff --git a/mp-arith.c b/mp-arith.c index 4bd0976..3af1447 100644 --- a/mp-arith.c +++ b/mp-arith.c @@ -229,9 +229,12 @@ int mp_eq(const mp *a, const mp *b) { return (MP_EQ(a, b)); } int mp_cmp(const mp *a, const mp *b) { - if (!((a->f ^ b->f) & MP_NEG)) - return (mpx_ucmp(a->v, a->vl, b->v, b->vl)); - else if (a->f & MP_NEG) + if (!((a->f ^ b->f) & MP_NEG)) { + if (a->f & MP_NEG) + return (-mpx_ucmp(a->v, a->vl, b->v, b->vl)); + else + return (mpx_ucmp(a->v, a->vl, b->v, b->vl)); + } else if (a->f & MP_NEG) return (-1); else return (+1); @@ -357,7 +360,7 @@ mp *mp_bit##n##2c(mp *d, mp *a, mp *b) \ p_bn \ } else { /* Both negative */ \ mp *t = mp_not2c(MP_NEW, a); \ - mp *d = mp_not2c(d, b); \ + d = mp_not2c(d, b); \ d = mp_bit##abn(d, t, d); \ MP_DROP(t); \ p_abn \ @@ -723,6 +726,7 @@ RIG(lsr2c, mp_lsr2c) RIG(add, mp_add) RIG(sub, mp_sub) RIG(mul, mp_mul) +RIG(exp, mp_exp) #undef RIG @@ -908,6 +912,7 @@ static test_chunk tests[] = { { "sub", tsub, { &type_mp, &type_mp, &type_mp, 0 } }, { "mul", tmul, { &type_mp, &type_mp, &type_mp, 0 } }, { "div", tdiv, { &type_mp, &type_mp, &type_mp, &type_mp, 0 } }, + { "exp", texp, { &type_mp, &type_mp, &type_mp, 0 } }, { "bin2c", tbin, { &type_string, &type_mp, &type_mp, &type_mp, 0 } }, { "odd", todd, { &type_mp, &type_uint32, &type_mp, 0 } }, { "neg", tneg, { &type_mp, &type_mp, 0 } },