Changeset 65c5f5 in git

Timestamp:

Feb 8, 2012, 4:29:10 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

237b4dda7a8a6ccfcc5966b92c779cebeebc30cc

Parents:

cc3240c506fdb572293019718b6e949f582d6108

Message:

chg: make the simple part of nlInpAdd an inline routine, hide the rest

File:

• libpolys/coeffs/longrat.cc (modified) (4 diffs)

libpolys/coeffs/longrat.cc

@@ -1655 +1655 @@
 }
 
+void _nlInpAdd_aNoImm_OR_bNoImm(number &a, number b)
+{
+  if (SR_HDL(b) & SR_INT)
+  {
+    switch (a->s)
+    {
+      case 0:
+      case 1:/* b:short, a:1 */
+      {
+        mpz_t x;
+        mpz_init(x);
+        mpz_mul_si(x,a->n,SR_TO_INT(b));
+        mpz_add(a->z,a->z,x);
+        mpz_clear(x);
+        a->s = 0;
+        a=nlShort1(a);
+        break;
+      }
+      case 3:
+      {
+        if ((long)b>0L)
+          mpz_add_ui(a->z,a->z,SR_TO_INT(b));
+        else
+          mpz_sub_ui(a->z,a->z,-SR_TO_INT(b));
+        a->s = 3;
+        a=nlShort3_noinline(a);
+        break;
+      }
+    }
+    return;
+  }
+  else if (SR_HDL(a) & SR_INT)
+  {
+    number u=ALLOC_RNUMBER();
+    #if defined(LDEBUG)
+    u->debug=123456;
+    #endif
+    mpz_init(u->z);
+    switch (b->s)
+    {
+      case 0:
+      case 1:/* a:short, b:1 */
+      {
+        mpz_t x;
+        mpz_init(x);
+
+        mpz_mul_si(x,b->n,SR_TO_INT(a));
+        mpz_add(u->z,b->z,x);
+        mpz_clear(x);
+        // result cannot be 0, if coeffs are normalized
+        mpz_init_set(u->n,b->n);
+        u->s = 0;
+        u=nlShort1(u);
+        break;
+      }
+      case 3:
+      {
+        if ((long)a>0L)
+          mpz_add_ui(u->z,b->z,SR_TO_INT(a));
+        else
+          mpz_sub_ui(u->z,b->z,-SR_TO_INT(a));
+        // result cannot be 0, if coeffs are normalized
+        u->s = 3;
+        u=nlShort3_noinline(u);
+        break;
+      }
+    }
+    a=u;
+  }
+  else
+  {
+    switch (a->s)
+    {
+      case 0:
+      case 1:
+      {
+        switch(b->s)
+        {
+          case 0:
+          case 1: /* a:1 b:1 */
+          {
+            mpz_t x;
+            mpz_t y;
+            mpz_init(x);
+            mpz_init(y);
+            mpz_mul(x,b->z,a->n);
+            mpz_mul(y,a->z,b->n);
+            mpz_add(a->z,x,y);
+            mpz_clear(x);
+            mpz_clear(y);
+            mpz_mul(a->n,a->n,b->n);
+            a->s = 0;
+            break;
+          }
+          case 3: /* a:1 b:3 */
+          {
+            mpz_t x;
+            mpz_init(x);
+            mpz_mul(x,b->z,a->n);
+            mpz_add(a->z,a->z,x);
+            mpz_clear(x);
+            a->s = 0;
+            break;
+          }
+        } /*switch (b->s) */
+        a=nlShort1(a);
+        break;
+      }
+      case 3:
+      {
+        switch(b->s)
+        {
+          case 0:
+          case 1:/* a:3, b:1 */
+          {
+            mpz_t x;
+            mpz_init(x);
+            mpz_mul(x,a->z,b->n);
+            mpz_add(a->z,b->z,x);
+            mpz_clear(x);
+            mpz_init_set(a->n,b->n);
+            a->s = 0;
+            a=nlShort1(a);
+            break;
+          }
+          case 3:
+          {
+            mpz_add(a->z,a->z,b->z);
+            a->s = 3;
+            a=nlShort3_noinline(a);
+            break;
+          }
+        }
+        break;
+      }
+    }
+  }
+}
+
 number _nlSub_aNoImm_OR_bNoImm(number a, number b)
 {
@@ -2092 +2231 @@
 number  _nlNeg_NoImm(number a);
 number  _nlAdd_aNoImm_OR_bNoImm(number a, number b);
+void    _nlInpAdd_aNoImm_OR_bNoImm(number &a, number b);
 number  _nlSub_aNoImm_OR_bNoImm(number a, number b);
 number  _nlMult_aNoImm_OR_bNoImm(number a, number b);
@@ -2229 +2369 @@
 LINLINE void nlInpAdd(number &a, number b, const coeffs r)
 {
+  // a=a+b
   if (SR_HDL(a) & SR_HDL(b) & SR_INT)
   {
@@ -2237 +2378 @@
       a=nlRInit(SR_TO_INT(r));
   }
-  // a=a+b
-  else if (SR_HDL(b) & SR_INT)
-  {
-    switch (a->s)
-    {
-      case 0:
-      case 1:/* b:short, a:1 */
-      {
-        mpz_t x;
-        mpz_init(x);
-        mpz_mul_si(x,a->n,SR_TO_INT(b));
-        mpz_add(a->z,a->z,x);
-        mpz_clear(x);
-        a->s = 0;
-        a=nlShort1(a);
-        break;
-      }
-      case 3:
-      {
-        if ((long)b>0L)
-          mpz_add_ui(a->z,a->z,SR_TO_INT(b));
-        else
-          mpz_sub_ui(a->z,a->z,-SR_TO_INT(b));
-        a->s = 3;
-        a=nlShort3_noinline(a);
-        break;
-      }
-    }
-    return;
-  }
-  else if (SR_HDL(a) & SR_INT)
-  {
-    number u=ALLOC_RNUMBER();
-    #if defined(LDEBUG)
-    u->debug=123456;
-    #endif
-    mpz_init(u->z);
-    switch (b->s)
-    {
-      case 0:
-      case 1:/* a:short, b:1 */
-      {
-        mpz_t x;
-        mpz_init(x);
-
-        mpz_mul_si(x,b->n,SR_TO_INT(a));
-        mpz_add(u->z,b->z,x);
-        mpz_clear(x);
-        // result cannot be 0, if coeffs are normalized
-        mpz_init_set(u->n,b->n);
-        u->s = 0;
-        u=nlShort1(u);
-        break;
-      }
-      case 3:
-      {
-        if ((long)a>0L)
-          mpz_add_ui(u->z,b->z,SR_TO_INT(a));
-        else
-          mpz_sub_ui(u->z,b->z,-SR_TO_INT(a));
-        // result cannot be 0, if coeffs are normalized
-        u->s = 3;
-        u=nlShort3_noinline(u);
-        break;
-      }
-    }
-    nlTest(u, r);
-    a=u;
-  }
   else
   {
-    switch (a->s)
-    {
-      case 0:
-      case 1:
-      {
-        switch(b->s)
-        {
-          case 0:
-          case 1: /* a:1 b:1 */
-          {
-            mpz_t x;
-            mpz_t y;
-            mpz_init(x);
-            mpz_init(y);
-            mpz_mul(x,b->z,a->n);
-            mpz_mul(y,a->z,b->n);
-            mpz_add(a->z,x,y);
-            mpz_clear(x);
-            mpz_clear(y);
-            mpz_mul(a->n,a->n,b->n);
-            a->s = 0;
-            break;
-          }
-          case 3: /* a:1 b:3 */
-          {
-            mpz_t x;
-            mpz_init(x);
-            mpz_mul(x,b->z,a->n);
-            mpz_add(a->z,a->z,x);
-            mpz_clear(x);
-            a->s = 0;
-            break;
-          }
-        } /*switch (b->s) */
-        a=nlShort1(a);
-        break;
-      }
-      case 3:
-      {
-        switch(b->s)
-        {
-          case 0:
-          case 1:/* a:3, b:1 */
-          {
-            mpz_t x;
-            mpz_init(x);
-            mpz_mul(x,a->z,b->n);
-            mpz_add(a->z,b->z,x);
-            mpz_clear(x);
-            mpz_init_set(a->n,b->n);
-            a->s = 0;
-            a=nlShort1(a);
-            break;
-          }
-          case 3:
-          {
-            mpz_add(a->z,a->z,b->z);
-            a->s = 3;
-            a=nlShort3_noinline(a);
-            break;
-          }
-        }
-        break;
-      }
-    }
-  }
-  nlTest(a, r);
+    _nlInpAdd_aNoImm_OR_bNoImm(a,b);
+    nlTest(a,r);
+  }
 }