blob: 582f61e8f144bf2655bc9a03d01c7d823deba01b (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
--- src/zarith.c.orig 2013-04-30 11:07:41.000000000 +0900
+++ src/zarith.c 2013-04-30 11:08:43.000000000 +0900
@@ -32,9 +32,9 @@
*/
/* Define max and min values for what will fit in value.intval. */
-#define MIN_INTVAL min_long
-#define MAX_INTVAL max_long
-#define MAX_HALF_INTVAL ((1L << (size_of(long) * 4 - 1)) - 1)
+#define MIN_INTVAL 0x80000000
+#define MAX_INTVAL 0x7fffffff
+#define MAX_HALF_INTVAL 0x7fff
/* <num1> <num2> add <sum> */
/* We make this into a separate procedure because */
@@ -64,7 +64,7 @@
op[-1].value.realval += (double)op->value.intval;
break;
case t_integer: {
- long int2 = op->value.intval;
+ int int2 = op->value.intval;
if (((op[-1].value.intval += int2) ^ int2) < 0 &&
((op[-1].value.intval - int2) ^ int2) >= 0
@@ -158,10 +158,10 @@
op[-1].value.realval *= (double)op->value.intval;
break;
case t_integer: {
- long int1 = op[-1].value.intval;
- long int2 = op->value.intval;
- long abs1 = (int1 >= 0 ? int1 : -int1);
- long abs2 = (int2 >= 0 ? int2 : -int2);
+ int int1 = op[-1].value.intval;
+ int int2 = op->value.intval;
+ uint abs1 = (uint)(int1 >= 0 ? int1 : -int1);
+ uint abs2 = (uint)(int2 >= 0 ? int2 : -int2);
float fprod;
if ((abs1 > MAX_HALF_INTVAL || abs2 > MAX_HALF_INTVAL) &&
@@ -212,7 +212,7 @@
op[-1].value.realval -= (double)op->value.intval;
break;
case t_integer: {
- long int1 = op[-1].value.intval;
+ int int1 = op[-1].value.intval;
if ((int1 ^ (op[-1].value.intval = int1 - op->value.intval)) < 0 &&
(int1 ^ op->value.intval) < 0
|
