Fix problems on the Alpha

diff --git a/v7/src/microcode/mul.c b/v7/src/microcode/mul.c
index b9b382ecb3c4c3cec113ab73162f9566b73a671e..adbf4a7d59a8bb78d22a145b7adc03fa38de00f2 100644 (file)
--- a/v7/src/microcode/mul.c
+++ b/v7/src/microcode/mul.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/mul.c,v 9.32 1992/02/03 23:33:05 jinx Exp $
+$Id: mul.c,v 9.33 1993/02/15 03:39:48 gjr Exp $
 
-Copyright (c) 1987-92 Massachusetts Institute of Technology
+Copyright (c) 1987-1993 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -204,10 +204,12 @@ static long Fixnum_Range[2] = {SMALLEST_FIXNUM , BIGGEST_FIXNUM};
 
 #ifndef MUL_HANDLED
 
-#define HALF_WORD_SIZE ((sizeof(long)*CHAR_BIT)/2)
-#define HALF_WORD_MASK (1<<HALF_WORD_SIZE)-1
-#define MAX_MIDDLE     (1<<((DATUM_LENGTH-1)-HALF_WORD_SIZE))
-#define MAX_FIXNUM     (1<<DATUM_LENGTH)
+#define ONE            ((unsigned long) 1)
+
+#define HALF_WORD_SIZE (((sizeof (long)) * CHAR_BIT) / 2)
+#define HALF_WORD_MASK ((ONE << HALF_WORD_SIZE) - 1)
+#define MAX_MIDDLE     (ONE << ((DATUM_LENGTH - 1) - HALF_WORD_SIZE))
+#define MAX_FIXNUM     (ONE << DATUM_LENGTH)
 #define        ABS(x)          (((x) < 0) ? -(x) : (x))
 
 SCHEME_OBJECT

diff --git a/v8/src/microcode/mul.c b/v8/src/microcode/mul.c
index 32428ce02819e57019c7062f48d51cbc6c7e8803..adbf4a7d59a8bb78d22a145b7adc03fa38de00f2 100644 (file)
--- a/v8/src/microcode/mul.c
+++ b/v8/src/microcode/mul.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/microcode/mul.c,v 9.32 1992/02/03 23:33:05 jinx Exp $
+$Id: mul.c,v 9.33 1993/02/15 03:39:48 gjr Exp $
 
-Copyright (c) 1987-92 Massachusetts Institute of Technology
+Copyright (c) 1987-1993 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -204,10 +204,12 @@ static long Fixnum_Range[2] = {SMALLEST_FIXNUM , BIGGEST_FIXNUM};
 
 #ifndef MUL_HANDLED
 
-#define HALF_WORD_SIZE ((sizeof(long)*CHAR_BIT)/2)
-#define HALF_WORD_MASK (1<<HALF_WORD_SIZE)-1
-#define MAX_MIDDLE     (1<<((DATUM_LENGTH-1)-HALF_WORD_SIZE))
-#define MAX_FIXNUM     (1<<DATUM_LENGTH)
+#define ONE            ((unsigned long) 1)
+
+#define HALF_WORD_SIZE (((sizeof (long)) * CHAR_BIT) / 2)
+#define HALF_WORD_MASK ((ONE << HALF_WORD_SIZE) - 1)
+#define MAX_MIDDLE     (ONE << ((DATUM_LENGTH - 1) - HALF_WORD_SIZE))
+#define MAX_FIXNUM     (ONE << DATUM_LENGTH)
 #define        ABS(x)          (((x) < 0) ? -(x) : (x))
 
 SCHEME_OBJECT