Changeset 6a05fd in git

Timestamp:

Oct 29, 2012, 6:31:42 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')

Children:

f7286a23b786af032ab46ebb6351640245468492

Parents:

e98ad4a781c85d53c676dffec15b2b238053266718ccf2907a4a103e379cecf364131e83e3aebab5

Message:

Merge pull request #204 from mmklee/factory_imm_mul_sw

chg: avoid undefined signed integer overflow

Files:

• Singular/lists.cc (modified) (1 diff)
• Tst/Manual/extgcd.res.gz.uu (modified) (1 diff)
• Tst/Manual/extgcd.stat (modified) (1 diff)
• factory/imm.h (modified) (4 diffs)

Singular/lists.cc

@@ -25 +25 @@
 {
   int n=L->nr;
-  while ((n>=0)&&(L->m[n].rtyp==DEF_CMD)) n--;
+   while ((n>=0)&&((L->m[n].rtyp==DEF_CMD)||(L->m[n].rtyp==0))) n--;
   return n;
 }

Tst/Manual/extgcd.res.gz.uu

@@ -1 +1 @@
 begin 644 extgcd.res.gz
-M'XL(")Y5BE```V5X=&=C9"YR97,`34\]"\(P%-SS*Q[%H;%I:=+$P6`&<2F(
-M2]V*B!^E!$J1-F+\]R:MA"[O#N[N'5>=#^4)`*B"8[F'R(PFZ_0]DN#85??:
-MQ%@BCZ`4--:TCV?6-Y]L-#>#JG^:*7=F,6:<T-QE:GK9(J^AFLTL=;28J0C1
-MPD<'W;<P['(26_+%I'O)H//%:\M3NW$>EEB!UQ,6>%EE1<(L#X7>D-!02L-3
-4H:9Y?L-[C"F6*_0##I4C@@D!````
+M'XL("."]BE```V5X=&=C9"YR97,`38]+"\(P$(3O^15+\9#8ATV:>#"8@W@I
+MB)=Z*R(^2@F4(FW$^.]-6BV]S'XP.SML<=KG1P"@"@[Y#@+3FZ31MT""HXMN
+MM<%$(C]!*:BLJ>^/I*W>26^N!A6_-%-.1A,S'M'494IZWB#OH9*-%#O,1A13
+M-//13K<U=-LTPC;ZD*AYRLGGL].6QW;M=EAH!5D.,R.S*BM"RZ<ZNF)NPZN7
+9J=KS_[A0PYO^EU>/*9$+]`4-]>F.$0$`````
 `
 end

Tst/Manual/extgcd.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1351243166:3150:3-1-5:ix86-Linux:mamawutz:172148
-1 >> tst_memory_1 :: 1351243166:3150:3-1-5:ix86-Linux:mamawutz:2239256
-1 >> tst_memory_2 :: 1351243166:3150:3-1-5:ix86-Linux:mamawutz:2272040
-1 >> tst_timer_1 :: 1351243166:3150:3-1-5:ix86-Linux:mamawutz:3
+1 >> tst_memory_0 :: 1351269855:3150:3-1-5:ix86-Linux:mamawutz:172324
+1 >> tst_memory_1 :: 1351269855:3150:3-1-5:ix86-Linux:mamawutz:2239256
+1 >> tst_memory_2 :: 1351269855:3150:3-1-5:ix86-Linux:mamawutz:2272040
+1 >> tst_timer_1 :: 1351269855:3150:3-1-5:ix86-Linux:mamawutz:3

factory/imm.h

@@ -36 +36 @@
 
 #if SIZEOF_LONG == 4
-const long MINIMMEDIATE = -268435454; // -2^28-2
+const long MINIMMEDIATE = -268435454; // -2^28+2
 const long MAXIMMEDIATE = 268435454;  // 2^28-2
 #else
-const long MINIMMEDIATE = -(1L<<60)+2L; // -2^60-2
+const long MINIMMEDIATE = -(1L<<60)+2L; // -2^60+2
 const long MAXIMMEDIATE = (1L<<60)-2L;  // 2^60-2
 #endif
@@ -300 +300 @@
     long a = imm2int( lhs );
     long b = imm2int( rhs );
-    INT64 result = (INT64)a * (INT64)b;
+    int sa= 1;
+    unsigned INT64 aa, bb;
+    if (a < 0)
+    {
+      sa= -1;
+      aa= (unsigned INT64) (-a);
+    }
+    else
+      aa= (unsigned INT64) a;
+    if (b < 0)
+    {
+      sa= -sa;
+      bb= (unsigned INT64) (-b);
+    }
+    else
+      bb= (unsigned INT64) b;
+    unsigned INT64 result = aa*bb;
     #if SIZEOF_LONG == 4
-    if ((result>(INT64)MAXIMMEDIATE)||(result<(INT64)MINIMMEDIATE))
+    if (result>(unsigned INT64)MAXIMMEDIATE)
     {
         InternalCF * res = CFFactory::basic( IntegerDomain, a, true );
@@ -308 +324 @@
     }
     #else
-    if ( ( a!=0L ) && ((result/a!=b)
-      ||(result>MAXIMMEDIATE)||(result<MINIMMEDIATE) ) )
+    if ( ( a!=0L ) && ((result/aa!=bb) || (result>(unsigned INT64) MAXIMMEDIATE) ))
     {
         InternalCF * res = CFFactory::basic( IntegerDomain, a, true );
@@ -316 +331 @@
     #endif
     else
-        return int2imm( result );
+      return int2imm( sa*result );
 }