From 52858943b024f16e2b1974db6fc4c0077a906ceb Mon Sep 17 00:00:00 2001
From: gerd <gerd>
Date: Sun, 3 Aug 2003 11:27:52 +0000
Subject: [PATCH] 	Remove the function definition of FIXNUM, which it
 must not 	have according to CLtS.  Found by Paul Dietz.

	Use boot14.lisp to bootstrap.

	* src/compiler/generic/utils.lisp (fixnumize): Renamed from
	fixnum.

	* src/bootfiles/18e/boot14.lisp: New file.

	* src/code/exports.lisp ("VM"): Export fixnumize.

	* src/assembly/alpha/arith.lisp, src/assembly/alpha/array.lisp:
	* src/assembly/alpha/assem-rtns.lisp, src/assembly/hppa/arith.lisp
	* src/assembly/hppa/array.lisp, src/assembly/hppa/assem-rtns.lisp
	* src/assembly/mips/alloc.lisp, src/assembly/mips/arith.lisp
	* src/assembly/mips/array.lisp, src/assembly/mips/assem-rtns.lisp
	* src/assembly/mips/bit-bash.lisp, src/assembly/ppc/arith.lisp
	* src/assembly/ppc/array.lisp, src/assembly/ppc/assem-rtns.lisp
	* src/assembly/rt/alloc.lisp, src/assembly/rt/arith.lisp
	* src/assembly/rt/array.lisp, src/assembly/rt/assem-rtns.lisp
	* src/assembly/sparc/arith.lisp, src/assembly/sparc/array.lisp
	* src/assembly/sparc/assem-rtns.lisp, src/assembly/x86/arith.lisp
	* src/assembly/x86/array.lisp, src/assembly/x86/assem-rtns.lisp
	* src/compiler/alpha/alloc.lisp, src/compiler/alpha/arith.lisp
	* src/compiler/alpha/array.lisp, src/compiler/alpha/call.lisp
	* src/compiler/alpha/move.lisp, src/compiler/alpha/nlx.lisp
	* src/compiler/alpha/static-fn.lisp, src/compiler/alpha/subprim.lisp
	* src/compiler/alpha/values.lisp, src/compiler/generic/utils.lisp
	* src/compiler/hppa/alloc.lisp, src/compiler/hppa/arith.lisp
	* src/compiler/hppa/array.lisp, src/compiler/hppa/call.lisp
	* src/compiler/hppa/move.lisp, src/compiler/hppa/nlx.lisp
	* src/compiler/hppa/static-fn.lisp, src/compiler/hppa/subprim.lisp
	* src/compiler/hppa/values.lisp, src/compiler/mips/alloc.lisp
	* src/compiler/mips/arith.lisp, src/compiler/mips/array.lisp
	* src/compiler/mips/call.lisp, src/compiler/mips/move.lisp
	* src/compiler/mips/nlx.lisp, src/compiler/mips/static-fn.lisp
	* src/compiler/mips/subprim.lisp, src/compiler/mips/values.lisp
	* src/compiler/ppc/alloc.lisp, src/compiler/ppc/arith.lisp
	* src/compiler/ppc/array.lisp, src/compiler/ppc/call.lisp
	* src/compiler/ppc/move.lisp, src/compiler/ppc/nlx.lisp
	* src/compiler/ppc/static-fn.lisp, src/compiler/ppc/subprim.lisp
	* src/compiler/ppc/values.lisp, src/compiler/rt/alloc.lisp
	* src/compiler/rt/arith.lisp, src/compiler/rt/array.lisp
	* src/compiler/rt/call.lisp, src/compiler/rt/move.lisp
	* src/compiler/rt/nlx.lisp, src/compiler/rt/static-fn.lisp
	* src/compiler/rt/subprim.lisp, src/compiler/rt/values.lisp
	* src/compiler/sparc/alloc.lisp, src/compiler/sparc/arith.lisp
	* src/compiler/sparc/array.lisp, src/compiler/sparc/call.lisp
	* src/compiler/sparc/move.lisp, src/compiler/sparc/nlx.lisp
	* src/compiler/sparc/static-fn.lisp, src/compiler/sparc/subprim.lisp
	* src/compiler/sparc/values.lisp, src/compiler/x86/alloc.lisp
	* src/compiler/x86/arith.lisp, src/compiler/x86/array.lisp
	* src/compiler/x86/call.lisp, src/compiler/x86/cell.lisp
	* src/compiler/x86/macros.lisp, src/compiler/x86/memory.lisp
	* src/compiler/x86/move.lisp, src/compiler/x86/nlx.lisp
	* src/compiler/x86/pred.lisp, src/compiler/x86/static-fn.lisp
	* src/compiler/x86/subprim.lisp, src/compiler/x86/values.lisp:
	Use fixnumize instead of fixnum.
---
 assembly/alpha/arith.lisp      | 16 +++++++-------
 assembly/alpha/array.lisp      | 16 +++++++-------
 assembly/alpha/assem-rtns.lisp | 18 ++++++++--------
 assembly/hppa/arith.lisp       | 12 +++++------
 assembly/hppa/array.lisp       |  8 +++----
 assembly/hppa/assem-rtns.lisp  | 20 +++++++++---------
 assembly/mips/alloc.lisp       |  6 +++---
 assembly/mips/arith.lisp       | 16 +++++++-------
 assembly/mips/array.lisp       | 10 ++++-----
 assembly/mips/assem-rtns.lisp  | 18 ++++++++--------
 assembly/mips/bit-bash.lisp    | 18 ++++++++--------
 assembly/ppc/arith.lisp        | 16 +++++++-------
 assembly/ppc/array.lisp        |  6 +++---
 assembly/ppc/assem-rtns.lisp   | 16 +++++++-------
 assembly/rt/alloc.lisp         |  8 +++----
 assembly/rt/arith.lisp         | 24 ++++++++++-----------
 assembly/rt/array.lisp         |  8 +++----
 assembly/rt/assem-rtns.lisp    | 26 +++++++++++------------
 assembly/sparc/arith.lisp      | 18 ++++++++--------
 assembly/sparc/array.lisp      |  8 +++----
 assembly/sparc/assem-rtns.lisp | 22 ++++++++++----------
 assembly/x86/arith.lisp        | 22 ++++++++++----------
 assembly/x86/array.lisp        |  4 ++--
 assembly/x86/assem-rtns.lisp   | 12 +++++------
 bootfiles/18e/boot14.lisp      | 13 ++++++++++++
 code/exports.lisp              |  3 ++-
 compiler/alpha/alloc.lisp      |  4 ++--
 compiler/alpha/arith.lisp      | 14 ++++++-------
 compiler/alpha/array.lisp      |  4 ++--
 compiler/alpha/call.lisp       | 30 +++++++++++++--------------
 compiler/alpha/move.lisp       |  4 ++--
 compiler/alpha/nlx.lisp        |  6 +++---
 compiler/alpha/static-fn.lisp  |  4 ++--
 compiler/alpha/subprim.lisp    |  4 ++--
 compiler/alpha/values.lisp     |  4 ++--
 compiler/generic/utils.lisp    |  8 +++----
 compiler/hppa/alloc.lisp       |  4 ++--
 compiler/hppa/arith.lisp       | 16 +++++++-------
 compiler/hppa/array.lisp       |  4 ++--
 compiler/hppa/call.lisp        | 28 ++++++++++++-------------
 compiler/hppa/move.lisp        |  4 ++--
 compiler/hppa/nlx.lisp         |  6 +++---
 compiler/hppa/static-fn.lisp   |  4 ++--
 compiler/hppa/subprim.lisp     |  4 ++--
 compiler/hppa/values.lisp      |  4 ++--
 compiler/mips/alloc.lisp       | 10 ++++-----
 compiler/mips/arith.lisp       | 20 +++++++++---------
 compiler/mips/array.lisp       |  8 +++----
 compiler/mips/call.lisp        | 30 +++++++++++++--------------
 compiler/mips/move.lisp        |  4 ++--
 compiler/mips/nlx.lisp         |  6 +++---
 compiler/mips/static-fn.lisp   |  4 ++--
 compiler/mips/subprim.lisp     |  4 ++--
 compiler/mips/values.lisp      |  4 ++--
 compiler/ppc/alloc.lisp        |  4 ++--
 compiler/ppc/arith.lisp        | 18 ++++++++--------
 compiler/ppc/array.lisp        |  4 ++--
 compiler/ppc/call.lisp         | 32 ++++++++++++++--------------
 compiler/ppc/move.lisp         |  4 ++--
 compiler/ppc/nlx.lisp          |  8 +++----
 compiler/ppc/static-fn.lisp    |  4 ++--
 compiler/ppc/subprim.lisp      |  4 ++--
 compiler/ppc/values.lisp       |  4 ++--
 compiler/rt/alloc.lisp         |  6 +++---
 compiler/rt/arith.lisp         | 14 ++++++-------
 compiler/rt/array.lisp         |  6 +++---
 compiler/rt/call.lisp          | 22 ++++++++++----------
 compiler/rt/move.lisp          |  6 +++---
 compiler/rt/nlx.lisp           |  8 +++----
 compiler/rt/static-fn.lisp     |  6 +++---
 compiler/rt/subprim.lisp       |  6 +++---
 compiler/rt/values.lisp        |  6 +++---
 compiler/sparc/alloc.lisp      |  4 ++--
 compiler/sparc/arith.lisp      | 16 +++++++-------
 compiler/sparc/array.lisp      |  8 +++----
 compiler/sparc/call.lisp       | 30 +++++++++++++--------------
 compiler/sparc/move.lisp       |  6 +++---
 compiler/sparc/nlx.lisp        |  8 +++----
 compiler/sparc/static-fn.lisp  |  6 +++---
 compiler/sparc/subprim.lisp    |  4 ++--
 compiler/sparc/values.lisp     |  4 ++--
 compiler/x86/alloc.lisp        |  6 +++---
 compiler/x86/arith.lisp        | 16 +++++++-------
 compiler/x86/array.lisp        |  6 +++---
 compiler/x86/call.lisp         | 38 +++++++++++++++++-----------------
 compiler/x86/cell.lisp         |  4 ++--
 compiler/x86/macros.lisp       |  4 ++--
 compiler/x86/memory.lisp       |  4 ++--
 compiler/x86/move.lisp         | 12 +++++------
 compiler/x86/nlx.lisp          |  4 ++--
 compiler/x86/pred.lisp         |  6 +++---
 compiler/x86/static-fn.lisp    | 10 ++++-----
 compiler/x86/subprim.lisp      |  6 +++---
 compiler/x86/values.lisp       |  4 ++--
 general-info/release-19a.txt   |  1 +
 95 files changed, 497 insertions(+), 482 deletions(-)
 create mode 100644 bootfiles/18e/boot14.lisp

diff --git a/assembly/alpha/arith.lisp b/assembly/alpha/arith.lisp
index e74ff2136..1deee439e 100644
--- a/assembly/alpha/arith.lisp
+++ b/assembly/alpha/arith.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/alpha/arith.lisp,v 1.4 1998/08/05 09:03:37 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/alpha/arith.lisp,v 1.5 2003/08/03 11:27:52 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -69,7 +69,7 @@
 
   DO-STATIC-FUN
   (inst ldl lip (static-function-offset 'two-arg-+) null-tn)
-  (inst li (fixnum 2) nargs)
+  (inst li (fixnumize 2) nargs)
   (inst move cfp-tn ocfp)
   (inst move csp-tn cfp-tn)
   (inst jmp zero-tn lip))
@@ -126,7 +126,7 @@
 
   DO-STATIC-FUN
   (inst ldl lip (static-function-offset 'two-arg--) null-tn)
-  (inst li (fixnum 2) nargs)
+  (inst li (fixnumize 2) nargs)
   (inst move cfp-tn ocfp)
   (inst move csp-tn cfp-tn)
   (inst jmp zero-tn lip))
@@ -204,7 +204,7 @@
 
   DO-STATIC-FUN
   (inst ldl lip (static-function-offset 'two-arg-*) null-tn)
-  (inst li (fixnum 2) nargs)
+  (inst li (fixnumize 2) nargs)
   (inst move cfp-tn ocfp)
   (inst move csp-tn cfp-tn)
   (inst jmp zero-tn lip)
@@ -300,7 +300,7 @@
 	  
 	  DO-STATIC-FN
 	  (inst ldl lip (static-function-offset ',static-fn) null-tn)
-	  (inst li (fixnum 2) nargs)
+	  (inst li (fixnumize 2) nargs)
 	  (inst move cfp-tn ocfp)
 	  (inst move csp-tn cfp-tn)
 	  (inst jmp zero-tn lip)
@@ -345,7 +345,7 @@
 
   DO-STATIC-FN
   (inst ldl lip (static-function-offset 'eql) null-tn)
-  (inst li (fixnum 2) nargs)
+  (inst li (fixnumize 2) nargs)
   (inst move cfp-tn ocfp)
   (inst move csp-tn cfp-tn)
   (inst jmp zero-tn lip)
@@ -381,7 +381,7 @@
 
   DO-STATIC-FN
   (inst ldl lip (static-function-offset 'two-arg-=) null-tn)
-  (inst li (fixnum 2) nargs)
+  (inst li (fixnumize 2) nargs)
   (inst move cfp-tn ocfp)
   (inst move csp-tn cfp-tn)
   (inst jmp zero-tn lip)
@@ -417,7 +417,7 @@
 
   DO-STATIC-FN
   (inst ldl lip (static-function-offset 'two-arg-=) null-tn)
-  (inst li (fixnum 2) nargs)
+  (inst li (fixnumize 2) nargs)
   (inst move cfp-tn ocfp)
   (inst move csp-tn cfp-tn)
   (inst jmp zero-tn lip)
diff --git a/assembly/alpha/array.lisp b/assembly/alpha/array.lisp
index c2da6e322..3e8da204a 100644
--- a/assembly/alpha/array.lisp
+++ b/assembly/alpha/array.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/alpha/array.lisp,v 1.2 1994/10/31 04:55:55 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/alpha/array.lisp,v 1.3 2003/08/03 11:27:52 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -131,13 +131,13 @@
 
   test
 
-  (inst subq length (fixnum 4) length)
+  (inst subq length (fixnumize 4) length)
   (inst ldl data 0 lip)
   (inst bge length loop)
 
-  (inst addq length (fixnum 3) length)
+  (inst addq length (fixnumize 3) length)
   (inst beq length one-more)
-  (inst subq length (fixnum 1) length)
+  (inst subq length (fixnumize 1) length)
   (inst beq length two-more)
   (inst bne length done)
 
@@ -148,11 +148,11 @@
   (inst srl accum 27 accum)
   (inst mskll accum 4 accum)
   (inst bis accum byte accum)
-  (inst addq length (fixnum 1) length)
+  (inst addq length (fixnumize 1) length)
 
   two-more
 
-  (inst subq length (fixnum 1) length)
+  (inst subq length (fixnumize 1) length)
   (inst srl data 8 byte)
   (inst and byte #xff byte)
   (inst xor accum byte accum)
@@ -160,11 +160,11 @@
   (inst srl accum 27 accum)
   (inst mskll accum 4 accum)
   (inst bis accum byte accum)
-  (inst addq length (fixnum 1) length)
+  (inst addq length (fixnumize 1) length)
 
   one-more
 
-  (inst subq length (fixnum 1) length)
+  (inst subq length (fixnumize 1) length)
   (inst and data #xff byte)
   (inst xor accum byte accum)
   (inst sll accum 5 byte)
diff --git a/assembly/alpha/assem-rtns.lisp b/assembly/alpha/assem-rtns.lisp
index 943225c55..37a0eabf4 100644
--- a/assembly/alpha/assem-rtns.lisp
+++ b/assembly/alpha/assem-rtns.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/alpha/assem-rtns.lisp,v 1.3 1994/10/31 04:55:55 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/alpha/assem-rtns.lisp,v 1.4 2003/08/03 11:27:51 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -44,19 +44,19 @@
   ;; been loaded.
   (inst ble nvals default-a0-and-on)
   (inst ldl a1 (* 1 vm:word-bytes) vals)
-  (inst subq nvals (fixnum 2) count)
+  (inst subq nvals (fixnumize 2) count)
   (inst ble count default-a2-and-on)
   (inst ldl a2 (* 2 vm:word-bytes) vals)
-  (inst subq nvals (fixnum 3) count)
+  (inst subq nvals (fixnumize 3) count)
   (inst ble count default-a3-and-on)
   (inst ldl a3 (* 3 vm:word-bytes) vals)
-  (inst subq nvals (fixnum 4) count)
+  (inst subq nvals (fixnumize 4) count)
   (inst ble count default-a4-and-on)
   (inst ldl a4 (* 4 vm:word-bytes) vals)
-  (inst subq nvals (fixnum 5) count)
+  (inst subq nvals (fixnumize 5) count)
   (inst ble count default-a5-and-on)
   (inst ldl a5 (* 5 vm:word-bytes) vals)
-  (inst subq nvals (fixnum 6) count)
+  (inst subq nvals (fixnumize 6) count)
   (inst ble count done)
 
   ;; Copy the remaining args to the top of the stack.
@@ -67,7 +67,7 @@
   (inst ldl temp 0 vals)
   (inst addq vals vm:word-bytes vals)
   (inst stl temp 0 dst)
-  (inst subq count (fixnum 1) count)
+  (inst subq count (fixnumize 1) count)
   (inst addq dst vm:word-bytes dst)
   (inst bne count loop)
 		
@@ -140,7 +140,7 @@
   (inst ldl a5 (* 5 vm:word-bytes) args)
 
   ;; Calc SRC, DST, and COUNT
-  (inst subq nargs (fixnum register-arg-count) count)
+  (inst subq nargs (fixnumize register-arg-count) count)
   (inst addq args (* vm:word-bytes register-arg-count) src)
   (inst ble count done)
   (inst addq cfp-tn (* vm:word-bytes register-arg-count) dst)
@@ -150,7 +150,7 @@
   (inst ldl temp 0 src)
   (inst addq src vm:word-bytes src)
   (inst stl temp 0 dst)
-  (inst subq count (fixnum 1) count)
+  (inst subq count (fixnumize 1) count)
   (inst addq dst vm:word-bytes dst)
   (inst bgt count loop)
 	
diff --git a/assembly/hppa/arith.lisp b/assembly/hppa/arith.lisp
index 9f9fafb23..4bdc5041f 100644
--- a/assembly/hppa/arith.lisp
+++ b/assembly/hppa/arith.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/hppa/arith.lisp,v 1.8 1994/10/31 04:56:18 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/hppa/arith.lisp,v 1.9 2003/08/03 11:27:51 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -130,7 +130,7 @@
 
   DO-STATIC-FUN
   (inst ldw (static-function-offset 'two-arg-+) null-tn lip)
-  (inst li (fixnum 2) nargs)
+  (inst li (fixnumize 2) nargs)
   (inst move cfp-tn ocfp)
   (inst bv lip)
   (inst move csp-tn cfp-tn))
@@ -159,7 +159,7 @@
 
   DO-STATIC-FUN
   (inst ldw (static-function-offset 'two-arg--) null-tn lip)
-  (inst li (fixnum 2) nargs)
+  (inst li (fixnumize 2) nargs)
   (inst move cfp-tn ocfp)
   (inst bv lip)
   (inst move csp-tn cfp-tn))
@@ -197,7 +197,7 @@
 
 	  DO-STATIC-FN
 	  (inst ldw (static-function-offset ',static-fn) null-tn lip)
-	  (inst li (fixnum 2) nargs)
+	  (inst li (fixnumize 2) nargs)
 	  (inst move cfp-tn ocfp)
 	  (inst bv lip)
 	  (inst move csp-tn cfp-tn))))
@@ -235,7 +235,7 @@
 
   DO-STATIC-FN
   (inst ldw (static-function-offset 'eql) null-tn lip)
-  (inst li (fixnum 2) nargs)
+  (inst li (fixnumize 2) nargs)
   (inst move cfp-tn ocfp)
   (inst bv lip)
   (inst move csp-tn cfp-tn)
@@ -271,7 +271,7 @@
 
   DO-STATIC-FN
   (inst ldw (static-function-offset 'two-arg-=) null-tn lip)
-  (inst li (fixnum 2) nargs)
+  (inst li (fixnumize 2) nargs)
   (inst move cfp-tn ocfp)
   (inst bv lip)
   (inst move csp-tn cfp-tn)
diff --git a/assembly/hppa/array.lisp b/assembly/hppa/array.lisp
index ed4d76615..ccc603e17 100644
--- a/assembly/hppa/array.lisp
+++ b/assembly/hppa/array.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/hppa/array.lisp,v 1.5 1994/10/31 04:56:18 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/hppa/array.lisp,v 1.6 2003/08/03 11:27:51 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -93,10 +93,10 @@
 
   TEST
   (inst ldwx offset string data)
-  (inst addib :>= (fixnum -4) length loop)
-  (inst addi (fixnum 1) offset offset)
+  (inst addib :>= (fixnumize -4) length loop)
+  (inst addi (fixnumize 1) offset offset)
 
-  (inst addi (fixnum 4) length length)
+  (inst addi (fixnumize 4) length length)
   (inst comb := zero-tn length done :nullify t)
   (inst sub zero-tn length length)
   (inst sll length 1 length)
diff --git a/assembly/hppa/assem-rtns.lisp b/assembly/hppa/assem-rtns.lisp
index 9b88bf50d..aceebe0e6 100644
--- a/assembly/hppa/assem-rtns.lisp
+++ b/assembly/hppa/assem-rtns.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/hppa/assem-rtns.lisp,v 1.5 1994/10/31 04:56:18 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/hppa/assem-rtns.lisp,v 1.6 2003/08/03 11:27:51 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -45,17 +45,17 @@
 
   (inst movb := nvals count default-a0-and-on :nullify t)
   (loadw a0 vals 0)
-  (inst addib := (fixnum -1) count default-a1-and-on :nullify t)
+  (inst addib := (fixnumize -1) count default-a1-and-on :nullify t)
   (loadw a1 vals 1)
-  (inst addib := (fixnum -1) count default-a2-and-on :nullify t)
+  (inst addib := (fixnumize -1) count default-a2-and-on :nullify t)
   (loadw a2 vals 2)
-  (inst addib := (fixnum -1) count default-a3-and-on :nullify t)
+  (inst addib := (fixnumize -1) count default-a3-and-on :nullify t)
   (loadw a3 vals 3)
-  (inst addib := (fixnum -1) count default-a4-and-on :nullify t)
+  (inst addib := (fixnumize -1) count default-a4-and-on :nullify t)
   (loadw a4 vals 4)
-  (inst addib := (fixnum -1) count default-a5-and-on :nullify t)
+  (inst addib := (fixnumize -1) count default-a5-and-on :nullify t)
   (loadw a5 vals 5)
-  (inst addib := (fixnum -1) count done :nullify t)  
+  (inst addib := (fixnumize -1) count done :nullify t)  
 
   ;; Copy the remaining args to the top of the stack.
   (inst addi (* 6 word-bytes) vals src)
@@ -63,7 +63,7 @@
 
   LOOP
   (inst ldwm 4 src temp)
-  (inst addib :> (fixnum -1) count loop)
+  (inst addib :> (fixnumize -1) count loop)
   (inst stwm temp 4 dst)
 
   (inst b done :nullify t)
@@ -134,7 +134,7 @@
   (loadw a5 args 5)
 
   ;; Calc SRC, DST, and COUNT
-  (inst addi (fixnum (- register-arg-count)) nargs count)
+  (inst addi (fixnumize (- register-arg-count)) nargs count)
   (inst comb :<= count zero-tn done :nullify t)
   (inst addi (* word-bytes register-arg-count) args src)
   (inst addi (* word-bytes register-arg-count) cfp-tn dst)
@@ -142,7 +142,7 @@
   LOOP
   ;; Copy one arg.
   (inst ldwm 4 src temp)
-  (inst addib :> (fixnum -1) count loop)
+  (inst addib :> (fixnumize -1) count loop)
   (inst stwm temp 4 dst)
 	
   DONE
diff --git a/assembly/mips/alloc.lisp b/assembly/mips/alloc.lisp
index 7244a238f..accac054a 100644
--- a/assembly/mips/alloc.lisp
+++ b/assembly/mips/alloc.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/mips/alloc.lisp,v 1.8 1994/10/31 04:56:40 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/mips/alloc.lisp,v 1.9 2003/08/03 11:27:51 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -34,7 +34,7 @@
      (:res result descriptor-reg a0-offset))
 
   ;; Is it a large object?
-  (inst slt ndescr words (1+ (fixnum large-object-cutoff)))
+  (inst slt ndescr words (1+ (fixnumize large-object-cutoff)))
   (inst beq ndescr large-alloc-entry)
   (inst nop)
 
@@ -72,7 +72,7 @@
   (inst addu words (* vector-data-offset word-bytes))
 
   ;; Is it a large object?
-  (inst slt ndescr words (1+ (fixnum large-object-cutoff)))
+  (inst slt ndescr words (1+ (fixnumize large-object-cutoff)))
   (inst beq ndescr large-alloc-entry)
   ;; Load ndescr with other-pointer-type because if we take the branch, we
   ;; need nl0 loaded with the desired lowtag.
diff --git a/assembly/mips/arith.lisp b/assembly/mips/arith.lisp
index 2e73dfccb..2cae0e427 100644
--- a/assembly/mips/arith.lisp
+++ b/assembly/mips/arith.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/mips/arith.lisp,v 1.16 1998/08/05 09:03:41 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/mips/arith.lisp,v 1.17 2003/08/03 11:27:51 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -50,7 +50,7 @@
 
   DO-STATIC-FUN
   (inst lw lip null-tn (static-function-offset 'two-arg-+))
-  (inst li nargs (fixnum 2))
+  (inst li nargs (fixnumize 2))
   (inst move ocfp cfp-tn)
   (inst j lip)
   (inst move cfp-tn csp-tn))
@@ -89,7 +89,7 @@
 
   DO-STATIC-FUN
   (inst lw lip null-tn (static-function-offset 'two-arg--))
-  (inst li nargs (fixnum 2))
+  (inst li nargs (fixnumize 2))
   (inst move ocfp cfp-tn)
   (inst j lip)
   (inst move cfp-tn csp-tn))
@@ -198,7 +198,7 @@
 
   DO-STATIC-FUN
   (inst lw lip null-tn (static-function-offset 'two-arg-*))
-  (inst li nargs (fixnum 2))
+  (inst li nargs (fixnumize 2))
   (inst move ocfp cfp-tn)
   (inst j lip)
   (inst move cfp-tn csp-tn)
@@ -234,7 +234,7 @@
 	  
 	  DO-STATIC-FN
 	  (inst lw lip null-tn (static-function-offset ',static-fn))
-	  (inst li nargs (fixnum 2))
+	  (inst li nargs (fixnumize 2))
 	  (inst move ocfp cfp-tn)
 	  (inst j lip)
 	  (inst move cfp-tn csp-tn)
@@ -285,7 +285,7 @@
 
   DO-STATIC-FN
   (inst lw lip null-tn (static-function-offset 'eql))
-  (inst li nargs (fixnum 2))
+  (inst li nargs (fixnumize 2))
   (inst move ocfp cfp-tn)
   (inst j lip)
   (inst move cfp-tn csp-tn)
@@ -328,7 +328,7 @@
 
   DO-STATIC-FN
   (inst lw lip null-tn (static-function-offset 'two-arg-=))
-  (inst li nargs (fixnum 2))
+  (inst li nargs (fixnumize 2))
   (inst move ocfp cfp-tn)
   (inst j lip)
   (inst move cfp-tn csp-tn)
@@ -371,7 +371,7 @@
 
   DO-STATIC-FN
   (inst lw lip null-tn (static-function-offset 'two-arg-=))
-  (inst li nargs (fixnum 2))
+  (inst li nargs (fixnumize 2))
   (inst move ocfp cfp-tn)
   (inst j lip)
   (inst move cfp-tn csp-tn)
diff --git a/assembly/mips/array.lisp b/assembly/mips/array.lisp
index c16de2516..bab17b1a1 100644
--- a/assembly/mips/array.lisp
+++ b/assembly/mips/array.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/mips/array.lisp,v 1.24 1994/10/31 04:56:40 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/mips/array.lisp,v 1.25 2003/08/03 11:27:51 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -125,16 +125,16 @@
 
   test
 
-  (inst addu length length (fixnum -4))
+  (inst addu length length (fixnumize -4))
   (inst lw data lip 0)
   (inst bgez length loop)
   (inst nop)
 
-  (inst addu length length (fixnum 3))
+  (inst addu length length (fixnumize 3))
   (inst beq length zero-tn one-more)
-  (inst addu length length (fixnum -1))
+  (inst addu length length (fixnumize -1))
   (inst beq length zero-tn two-more)
-  (inst addu length length (fixnum -1))
+  (inst addu length length (fixnumize -1))
   (inst bne length zero-tn done)
   (inst nop)
 
diff --git a/assembly/mips/assem-rtns.lisp b/assembly/mips/assem-rtns.lisp
index ba3ceaacf..31e6a8d55 100644
--- a/assembly/mips/assem-rtns.lisp
+++ b/assembly/mips/assem-rtns.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/mips/assem-rtns.lisp,v 1.32 1994/10/31 04:56:40 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/mips/assem-rtns.lisp,v 1.33 2003/08/03 11:27:51 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -44,19 +44,19 @@
   ;; assume that we are never called with nvals == 1 and that a0 has already
   ;; been loaded.
   (inst blez nvals default-a0-and-on)
-  (inst subu count nvals (fixnum 2))
+  (inst subu count nvals (fixnumize 2))
   (inst blez count default-a2-and-on)
   (inst lw a1 vals (* 1 vm:word-bytes))
-  (inst subu count (fixnum 1))
+  (inst subu count (fixnumize 1))
   (inst blez count default-a3-and-on)
   (inst lw a2 vals (* 2 vm:word-bytes))
-  (inst subu count (fixnum 1))
+  (inst subu count (fixnumize 1))
   (inst blez count default-a4-and-on)
   (inst lw a3 vals (* 3 vm:word-bytes))
-  (inst subu count (fixnum 1))
+  (inst subu count (fixnumize 1))
   (inst blez count default-a5-and-on)
   (inst lw a4 vals (* 4 vm:word-bytes))
-  (inst subu count (fixnum 1))
+  (inst subu count (fixnumize 1))
   (inst blez count done)
   (inst lw a5 vals (* 5 vm:word-bytes))
 
@@ -68,7 +68,7 @@
   (inst lw temp vals)
   (inst addu vals vm:word-bytes)
   (inst sw temp dst)
-  (inst subu count (fixnum 1))
+  (inst subu count (fixnumize 1))
   (inst bne count zero-tn loop)
   (inst addu dst vm:word-bytes)
 		
@@ -147,7 +147,7 @@
   (inst lw a5 args (* 5 vm:word-bytes))
 
   ;; Calc SRC, DST, and COUNT
-  (inst addu count nargs (fixnum (- register-arg-count)))
+  (inst addu count nargs (fixnumize (- register-arg-count)))
   (inst blez count done)
   (inst addu src args (* vm:word-bytes register-arg-count))
   (inst addu dst cfp-tn (* vm:word-bytes register-arg-count))
@@ -157,7 +157,7 @@
   (inst lw temp src)
   (inst addu src src vm:word-bytes)
   (inst sw temp dst)
-  (inst addu count (fixnum -1))
+  (inst addu count (fixnumize -1))
   (inst bgtz count loop)
   (inst addu dst dst vm:word-bytes)
 	
diff --git a/assembly/mips/bit-bash.lisp b/assembly/mips/bit-bash.lisp
index 35bfd09ae..91ebe2022 100644
--- a/assembly/mips/bit-bash.lisp
+++ b/assembly/mips/bit-bash.lisp
@@ -5,11 +5,11 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/mips/bit-bash.lisp,v 1.15 1997/10/25 16:31:46 pw Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/mips/bit-bash.lisp,v 1.16 2003/08/03 11:27:51 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/mips/bit-bash.lisp,v 1.15 1997/10/25 16:31:46 pw Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/mips/bit-bash.lisp,v 1.16 2003/08/03 11:27:51 gerd Rel $
 ;;;
 ;;; Stuff to implement bit bashing.
 ;;;
@@ -40,7 +40,7 @@
      (compute-bit/word-offsets dst dst-offset dst-bit-offset)
      
      (inst addu temp1 dst-bit-offset length)
-     (inst subu temp1 (fixnum 32))
+     (inst subu temp1 (fixnumize 32))
      (inst bgez temp1 wide-copy)
      (inst sltu ntemp1 src dst)
 
@@ -64,7 +64,7 @@
 
 (defmacro compute-bit/word-offsets (ptr offset bit)
   `(progn
-     (inst and ,bit ,offset (fixnum 31))
+     (inst and ,bit ,offset (fixnumize 31))
      (inst sra ntemp1 ,offset 7)
      (inst sll ntemp1 2)
      (inst addu ,ptr ntemp1)))
@@ -80,7 +80,7 @@
      ;; It's not aligned, so get the source bits and align them.
      (inst sra ntemp2 src-bit-offset 2)
      (inst add temp1 src-bit-offset length)
-     (inst sub temp1 (fixnum 32))
+     (inst sub temp1 (fixnumize 32))
      (inst blez temp1 only-one-src-word)
      (inst srl ntemp1 ntemp2)
 
@@ -125,7 +125,7 @@
 
      ;; Calc src-shift
      (inst subu src-shift dst-offset src-offset)
-     (inst and src-shift (fixnum 31))
+     (inst and src-shift (fixnumize 31))
 
      (macrolet
 	 ((middle (&rest before-last-inst)
@@ -198,7 +198,7 @@
      (emit-label left-aligned)
 
      (inst addu final-bits length dst-bit-offset)
-     (inst and final-bits (fixnum 31))
+     (inst and final-bits (fixnumize 31))
      (inst subu ntemp1 length final-bits)
      (inst srl ntemp1 7)
      (inst beq ntemp1 check-right)
@@ -234,7 +234,7 @@
 	 (final-bits temp1))
      ;; Compute final-bits, the number of bits in the final dst word.
      (inst addu ntemp3 dst-bit-offset length)
-     (inst and final-bits ntemp3 (fixnum 31))
+     (inst and final-bits ntemp3 (fixnumize 31))
 
      ;; Increase src and dst so they point to the end of the buffers instead
      ;; of the beginning.
@@ -254,7 +254,7 @@
 
      ;; Calc src-shift
      (inst subu src-shift dst-bit-offset src-bit-offset)
-     (inst and src-shift (fixnum 31))
+     (inst and src-shift (fixnumize 31))
 
      (macrolet
 	 ((merge (&rest before-last-inst)
diff --git a/assembly/ppc/arith.lisp b/assembly/ppc/arith.lisp
index b47b89ca3..ad082676e 100644
--- a/assembly/ppc/arith.lisp
+++ b/assembly/ppc/arith.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/ppc/arith.lisp,v 1.1 2001/02/11 14:21:52 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/ppc/arith.lisp,v 1.2 2003/08/03 11:27:51 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -58,7 +58,7 @@
 
   DO-STATIC-FUN
   (inst lwz code-tn null-tn (static-function-offset 'two-arg-+))
-  (inst li nargs (fixnum 2))
+  (inst li nargs (fixnumize 2))
   (inst mr ocfp cfp-tn)
   (inst mr cfp-tn csp-tn)
   (inst j code-tn
@@ -106,7 +106,7 @@
 
   DO-STATIC-FUN
   (inst lwz code-tn null-tn (static-function-offset 'two-arg--))
-  (inst li nargs (fixnum 2))
+  (inst li nargs (fixnumize 2))
   (inst mr ocfp cfp-tn)
   (inst mr cfp-tn csp-tn)
   (inst j code-tn
@@ -186,7 +186,7 @@
 
   DO-STATIC-FUN
   (inst lwz code-tn null-tn (static-function-offset 'two-arg-*))
-  (inst li nargs (fixnum 2))
+  (inst li nargs (fixnumize 2))
   (inst mr ocfp cfp-tn)
   (inst mr cfp-tn csp-tn)
   (inst j code-tn
@@ -318,7 +318,7 @@
 	  
 	  DO-STATIC-FN
 	  (inst lwz code-tn null-tn (static-function-offset ',static-fn))
-	  (inst li nargs (fixnum 2))
+	  (inst li nargs (fixnumize 2))
 	  (inst mr ocfp cfp-tn)
 	  (inst mr cfp-tn csp-tn)
 	  (inst j code-tn
@@ -363,7 +363,7 @@
 
   DO-STATIC-FN
   (inst lwz code-tn null-tn (static-function-offset 'eql))
-  (inst li nargs (fixnum 2))
+  (inst li nargs (fixnumize 2))
   (inst mr ocfp cfp-tn)
   (inst mr cfp-tn csp-tn)
   (inst j code-tn
@@ -399,7 +399,7 @@
 
   DO-STATIC-FN
   (inst lwz code-tn null-tn (static-function-offset 'two-arg-=))
-  (inst li nargs (fixnum 2))
+  (inst li nargs (fixnumize 2))
   (inst mr ocfp cfp-tn)
   (inst mr cfp-tn csp-tn)
   (inst j code-tn
@@ -433,7 +433,7 @@
 
   DO-STATIC-FN
   (inst lwz code-tn null-tn (static-function-offset 'two-arg-=))
-  (inst li nargs (fixnum 2))
+  (inst li nargs (fixnumize 2))
   (inst mr ocfp cfp-tn)
   (inst j code-tn
 	(- (* function-code-offset word-bytes) function-pointer-type))
diff --git a/assembly/ppc/array.lisp b/assembly/ppc/array.lisp
index 5d0f8ac13..cd6dac467 100644
--- a/assembly/ppc/array.lisp
+++ b/assembly/ppc/array.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman (FAHLMAN@CMUC). 
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/ppc/array.lisp,v 1.1 2001/02/11 14:21:52 dtc Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/ppc/array.lisp,v 1.2 2003/08/03 11:27:51 gerd Exp $
 ;;;
 ;;;    This file contains the support routines for arrays and vectors.
 ;;;
@@ -95,11 +95,11 @@
 
   TEST
 
-  (inst subic. length length (fixnum 4))
+  (inst subic. length length (fixnumize 4))
   (inst lwzx data string offset)
   (inst bge loop)
 
-  (inst addic. length length (fixnum 4))
+  (inst addic. length length (fixnumize 4))
   (inst neg length length)
   (inst beq done)
   (inst slwi length length 1)
diff --git a/assembly/ppc/assem-rtns.lisp b/assembly/ppc/assem-rtns.lisp
index b35d8ab20..7d890ce7f 100644
--- a/assembly/ppc/assem-rtns.lisp
+++ b/assembly/ppc/assem-rtns.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman (FAHLMAN@CMUC). 
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/ppc/assem-rtns.lisp,v 1.1 2001/02/11 14:21:52 dtc Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/ppc/assem-rtns.lisp,v 1.2 2003/08/03 11:27:51 gerd Exp $
 ;;;
 ;;;
 (in-package "PPC")
@@ -43,23 +43,23 @@
   ;; been loaded.
   (inst cmpwi nvals 0)
   (inst ble default-a0-and-on)
-  (inst cmpwi nvals (fixnum 2))
+  (inst cmpwi nvals (fixnumize 2))
   (inst lwz a1 vals (* 1 vm:word-bytes))
   (inst ble default-a2-and-on)
-  (inst cmpwi nvals (fixnum 3))
+  (inst cmpwi nvals (fixnumize 3))
   (inst lwz a2 vals (* 2 vm:word-bytes))
   (inst ble default-a3-and-on)
-  (inst cmpwi nvals (fixnum 4))
+  (inst cmpwi nvals (fixnumize 4))
   (inst lwz a3 vals (* 3 vm:word-bytes))
   (inst ble done)
 
   ;; Copy the remaining args to the top of the stack.
   (inst addi src vals (* 4 vm:word-bytes))
   (inst addi dst cfp-tn (* 4 vm:word-bytes))
-  (inst addic. count nvals (- (fixnum 4)))
+  (inst addic. count nvals (- (fixnumize 4)))
 
   LOOP
-  (inst subic. count count (fixnum 1))
+  (inst subic. count count (fixnumize 1))
   (inst lwz temp src 0)
   (inst addi src src vm:word-bytes)
   (inst stw temp dst 0)
@@ -125,7 +125,7 @@
   (inst lwz a3 args (* 3 vm:word-bytes))
 
   ;; Calc SRC, DST, and COUNT
-  (inst addic. count nargs (fixnum (- register-arg-count)))
+  (inst addic. count nargs (fixnumize (- register-arg-count)))
   (inst addi src args (* vm:word-bytes register-arg-count))
   (inst ble done)
   (inst addi dst cfp-tn (* vm:word-bytes register-arg-count))
@@ -135,7 +135,7 @@
   (inst lwz temp src 0)
   (inst addi src src vm:word-bytes)
   (inst stw temp dst 0)
-  (inst addic. count count (fixnum -1))
+  (inst addic. count count (fixnumize -1))
   (inst addi dst dst vm:word-bytes)
   (inst bgt loop)
 	
diff --git a/assembly/rt/alloc.lisp b/assembly/rt/alloc.lisp
index e5017a16e..568e25f98 100644
--- a/assembly/rt/alloc.lisp
+++ b/assembly/rt/alloc.lisp
@@ -5,11 +5,11 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/rt/alloc.lisp,v 1.6 1994/10/31 04:57:00 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/rt/alloc.lisp,v 1.7 2003/08/03 11:27:50 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/rt/alloc.lisp,v 1.6 1994/10/31 04:57:00 ram Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/rt/alloc.lisp,v 1.7 2003/08/03 11:27:50 gerd Rel $
 ;;;
 ;;; Stuff to handle allocating simple objects.
 ;;;
@@ -70,12 +70,12 @@
 	     (load-symbol-value alloc *allocation-pointer*)
 	     (inst cal result alloc ,lowtag)
 	     ,@(cond ((and header variable-length)
-		      `((inst cal temp extra-words (fixnum (1- ,size)))
+		      `((inst cal temp extra-words (fixnumize (1- ,size)))
 			(inst cas alloc temp alloc)
 			(inst sl temp (- type-bits word-shift))
 			(inst oil temp ,header)
 			(storew temp result 0 ,lowtag)
-			(inst cal alloc alloc (+ (fixnum 1) lowtag-mask))
+			(inst cal alloc alloc (+ (fixnumize 1) lowtag-mask))
 			(inst li temp (lognot lowtag-mask))
 			(inst n alloc temp)))
 		     (variable-length
diff --git a/assembly/rt/arith.lisp b/assembly/rt/arith.lisp
index 9206dd16e..9e12e2e24 100644
--- a/assembly/rt/arith.lisp
+++ b/assembly/rt/arith.lisp
@@ -5,11 +5,11 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/rt/arith.lisp,v 1.7 1994/10/31 04:57:00 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/rt/arith.lisp,v 1.8 2003/08/03 11:27:50 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/rt/arith.lisp,v 1.7 1994/10/31 04:57:00 ram Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/rt/arith.lisp,v 1.8 2003/08/03 11:27:50 gerd Rel $
 ;;;
 ;;; Stuff to handle simple cases for generic arithmetic.
 ;;;
@@ -63,7 +63,7 @@
 
   DO-STATIC-FUN
   (load-symbol cname 'two-arg-+)
-  (inst li nargs (fixnum 2))
+  (inst li nargs (fixnumize 2))
   (loadw lip cname symbol-raw-function-addr-slot other-pointer-type)
   (move ocfp cfp-tn)
   ;; Tail call TWO-ARG-+.
@@ -118,7 +118,7 @@
 
   DO-STATIC-FUN
   (load-symbol cname 'two-arg--)
-  (inst li nargs (fixnum 2))
+  (inst li nargs (fixnumize 2))
   (loadw lip cname symbol-raw-function-addr-slot other-pointer-type)
   (move ocfp cfp-tn)
   ;; Tail call TWO-ARG-+.
@@ -214,7 +214,7 @@
 
   DO-STATIC-FUN
   (load-symbol cname 'two-arg-*)
-  (inst li nargs/high (fixnum 2))
+  (inst li nargs/high (fixnumize 2))
   (loadw lip cname symbol-raw-function-addr-slot other-pointer-type)
   (move ocfp/low cfp-tn)
   (inst bx lip)
@@ -253,9 +253,9 @@
   ;; Make sure y is not 0, 1, or -1.
   (inst c y 0)
   (inst bcx :eq zero-divisor)
-  (inst c y (fixnum 1))
+  (inst c y (fixnumize 1))
   (inst bcx :eq one-divisor)
-  (inst c y (fixnum -1))
+  (inst c y (fixnumize -1))
   (inst bc :eq neg-one-divisor)
 
   ;; Do the division.
@@ -291,7 +291,7 @@
   ;; Add 1 to quotient and subtract divisor from remainder.
   (inst mfmqscr temp1)
   (inst sl temp1 2)
-  (inst a quo temp1 (fixnum 1))
+  (inst a quo temp1 (fixnumize 1))
   ;; Since rem and y are the same register, this subtracts the divisor from
   ;; the remainder, putting the result in our rem result register.
   (inst sf y nargs/high)
@@ -309,7 +309,7 @@
 
   DO-STATIC-FUN
   (load-symbol cname 'truncate)
-  (inst li nargs/high (fixnum 2))
+  (inst li nargs/high (fixnumize 2))
   (loadw lip cname symbol-raw-function-addr-slot other-pointer-type)
   (move ocfp/temp2 cfp-tn)
   ;; Get out of here, doing a tail call.
@@ -381,7 +381,7 @@
 
   DO-STATIC-FUN
   (load-symbol cname 'two-arg-<)
-  (inst li nargs (fixnum 2))
+  (inst li nargs (fixnumize 2))
   (loadw lip cname symbol-raw-function-addr-slot other-pointer-type)
   (move ocfp cfp-tn)
   ;; Tail call TWO-ARG->.
@@ -424,7 +424,7 @@
 
   DO-STATIC-FUN
   (load-symbol cname 'two-arg->)
-  (inst li nargs (fixnum 2))
+  (inst li nargs (fixnumize 2))
   (loadw lip cname symbol-raw-function-addr-slot other-pointer-type)
   (move ocfp cfp-tn)
   ;; Tail call TWO-ARG->.
@@ -468,7 +468,7 @@
 
   DO-STATIC-FUN
   (load-symbol cname 'two-arg-=)
-  (inst li nargs (fixnum 2))
+  (inst li nargs (fixnumize 2))
   (loadw lip cname symbol-raw-function-addr-slot other-pointer-type)
   (move ocfp cfp-tn)
   ;; Tail call TWO-ARG-=.
diff --git a/assembly/rt/array.lisp b/assembly/rt/array.lisp
index 80aac48fb..448165a33 100644
--- a/assembly/rt/array.lisp
+++ b/assembly/rt/array.lisp
@@ -5,11 +5,11 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/rt/array.lisp,v 1.5 1994/10/31 04:57:00 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/rt/array.lisp,v 1.6 2003/08/03 11:27:50 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/rt/array.lisp,v 1.5 1994/10/31 04:57:00 ram Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/rt/array.lisp,v 1.6 2003/08/03 11:27:50 gerd Rel $
 ;;;
 ;;; This file contains the support routines for arrays and vectors.
 ;;;
@@ -103,10 +103,10 @@
   (inst o accum temp)
   (inst inc lip 4)
   TEST
-  (inst s length (fixnum 4))
+  (inst s length (fixnumize 4))
   (inst bncx :lt loop)
   (loadw data lip)
-  (inst a length (fixnum 4))
+  (inst a length (fixnumize 4))
   (inst bc :eq done)
   (inst neg length)
   (inst sl length 1)
diff --git a/assembly/rt/assem-rtns.lisp b/assembly/rt/assem-rtns.lisp
index 0d1288ce9..b159c92ea 100644
--- a/assembly/rt/assem-rtns.lisp
+++ b/assembly/rt/assem-rtns.lisp
@@ -5,11 +5,11 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/rt/assem-rtns.lisp,v 1.6 1994/10/31 04:57:00 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/rt/assem-rtns.lisp,v 1.7 2003/08/03 11:27:50 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/rt/assem-rtns.lisp,v 1.6 1994/10/31 04:57:00 ram Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/rt/assem-rtns.lisp,v 1.7 2003/08/03 11:27:50 gerd Exp $
 ;;;
 
 (in-package "RT")
@@ -113,24 +113,24 @@
   (inst c nvals 0)
   (inst bc :eq default-a0-and-on)
   (loadw a0 src 0)
-  (inst c nvals (fixnum 1))
+  (inst c nvals (fixnumize 1))
   (inst bc :eq default-a1-and-on)
   (loadw a1 src 1)
-  (inst c nvals (fixnum 2))
+  (inst c nvals (fixnumize 2))
   (inst bc :eq default-a2-and-on)
   (loadw a2 src 2)
   ;;
   ;; Copy the remaining args to the top of the stack.
   (inst inc src (* word-bytes register-arg-count))
   (inst cal dst cfp-tn (* word-bytes register-arg-count))
-  (inst s count nvals (fixnum 3))
+  (inst s count nvals (fixnumize 3))
   (inst bnc :gt done)
   LOOP
   (loadw temp src)
   (inst inc src word-bytes)
   (storew temp dst)
   (inst inc dst word-bytes)
-  (inst s count (fixnum 1))
+  (inst s count (fixnumize 1))
   (inst bc :gt loop)
   (inst b done)
   ;;
@@ -242,19 +242,19 @@
   (inst bnc :lt CMA-LOOP)
   
   ;; Figure out which argument registers may be more args.
-  (inst c fixedargs (fixnum 2))
+  (inst c fixedargs (fixnumize 2))
   (inst bc :eq two-fixed-args)
-  (inst c fixedargs (fixnum 1))
+  (inst c fixedargs (fixnumize 1))
   (inst bc :eq one-fixed-arg)
   
   ;; Copy register more args being careful to stop before running out of args.
   (storew a0 ocsp)
-  (inst c nargs-tn (fixnum 1))
+  (inst c nargs-tn (fixnumize 1))
   (inst bc :eq CMA-DONE)
   (inst inc ocsp word-bytes)
   ONE-FIXED-ARG
   (storew a1 ocsp)
-  (inst c nargs-tn (fixnum 2))
+  (inst c nargs-tn (fixnumize 2))
   (inst bc :eq CMA-DONE)
   (inst inc ocsp word-bytes)
   TWO-FIXED-ARGS
@@ -294,13 +294,13 @@
   (loadw a1 args 1)
   (loadw a2 args 2)
   ;; Are we done?
-  (inst c nargs (fixnum register-arg-count))
+  (inst c nargs (fixnumize register-arg-count))
   (inst bnc :gt done)
   ;; Calc DST and COUNT after saving those registers.
   (inst inc csp-tn (* word-bytes 2))
   (storew count csp-tn -1)
   (storew dst csp-tn -2)
-  (inst a count nargs (fixnum (- register-arg-count)))
+  (inst a count nargs (fixnumize (- register-arg-count)))
   (inst a args (* vm:word-bytes register-arg-count))
   (inst a dst cfp-tn (* vm:word-bytes register-arg-count))
   LOOP
@@ -308,7 +308,7 @@
   (loadw temp args)
   (inst inc args vm:word-bytes)
   (storew temp dst)
-  (inst s count (fixnum 1))
+  (inst s count (fixnumize 1))
   (inst bcx :gt loop)
   (inst inc dst vm:word-bytes)
   ;; Restore
diff --git a/assembly/sparc/arith.lisp b/assembly/sparc/arith.lisp
index a7b2a268d..dc3e81ea9 100644
--- a/assembly/sparc/arith.lisp
+++ b/assembly/sparc/arith.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/sparc/arith.lisp,v 1.17 2001/10/05 15:13:51 toy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/sparc/arith.lisp,v 1.18 2003/08/03 11:27:50 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -54,7 +54,7 @@
 
   DO-STATIC-FUN
   (inst ld code-tn null-tn (static-function-offset 'two-arg-+))
-  (inst li nargs (fixnum 2))
+  (inst li nargs (fixnumize 2))
   (inst move ocfp cfp-tn)
   (inst j code-tn
 	(- (* function-code-offset word-bytes) function-pointer-type))
@@ -98,7 +98,7 @@
 
   DO-STATIC-FUN
   (inst ld code-tn null-tn (static-function-offset 'two-arg--))
-  (inst li nargs (fixnum 2))
+  (inst li nargs (fixnumize 2))
   (inst move ocfp cfp-tn)
   (inst j code-tn
 	(- (* function-code-offset word-bytes) function-pointer-type))
@@ -201,7 +201,7 @@
 
   DO-STATIC-FUN
   (inst ld code-tn null-tn (static-function-offset 'two-arg-*))
-  (inst li nargs (fixnum 2))
+  (inst li nargs (fixnumize 2))
   (inst move ocfp cfp-tn)
   (inst j code-tn
 	(- (* function-code-offset word-bytes) function-pointer-type))
@@ -271,7 +271,7 @@
 	     (emit-label label-1)
 	     (inst b :gtu label-2)
 	     (inst sll quo 1)
-	     (inst add quo (if tagged (fixnum 1) 1))
+	     (inst add quo (if tagged (fixnumize 1) 1))
 	     (inst sub rem divisor)
 	     (emit-label label-2))))))
     (do-loop (if tagged 30 32))))
@@ -422,7 +422,7 @@
 	  
 	  DO-STATIC-FN
 	  (inst ld code-tn null-tn (static-function-offset ',static-fn))
-	  (inst li nargs (fixnum 2))
+	  (inst li nargs (fixnumize 2))
 	  (inst move ocfp cfp-tn)
 	  (inst j code-tn
 		(- (* function-code-offset word-bytes) function-pointer-type))
@@ -468,7 +468,7 @@
 
   DO-STATIC-FN
   (inst ld code-tn null-tn (static-function-offset 'eql))
-  (inst li nargs (fixnum 2))
+  (inst li nargs (fixnumize 2))
   (inst move ocfp cfp-tn)
   (inst j code-tn
 	(- (* function-code-offset word-bytes) function-pointer-type))
@@ -504,7 +504,7 @@
 
   DO-STATIC-FN
   (inst ld code-tn null-tn (static-function-offset 'two-arg-=))
-  (inst li nargs (fixnum 2))
+  (inst li nargs (fixnumize 2))
   (inst move ocfp cfp-tn)
   (inst j code-tn
 	(- (* function-code-offset word-bytes) function-pointer-type))
@@ -540,7 +540,7 @@
 
   DO-STATIC-FN
   (inst ld code-tn null-tn (static-function-offset 'two-arg-=))
-  (inst li nargs (fixnum 2))
+  (inst li nargs (fixnumize 2))
   (inst move ocfp cfp-tn)
   (inst j code-tn
 	(- (* function-code-offset word-bytes) function-pointer-type))
diff --git a/assembly/sparc/array.lisp b/assembly/sparc/array.lisp
index d4829a284..1bbbd9094 100644
--- a/assembly/sparc/array.lisp
+++ b/assembly/sparc/array.lisp
@@ -5,11 +5,11 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/sparc/array.lisp,v 1.6 2002/05/10 14:48:23 toy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/sparc/array.lisp,v 1.7 2003/08/03 11:27:50 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/sparc/array.lisp,v 1.6 2002/05/10 14:48:23 toy Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/sparc/array.lisp,v 1.7 2003/08/03 11:27:50 gerd Exp $
 ;;;
 ;;;    This file contains the support routines for arrays and vectors.
 ;;;
@@ -104,11 +104,11 @@
 
   TEST
 
-  (inst subcc length (fixnum 4))
+  (inst subcc length (fixnumize 4))
   (inst b :ge loop)
   (inst ld data string offset)
 
-  (inst addcc length (fixnum 4))
+  (inst addcc length (fixnumize 4))
   (inst b :eq done)
   (inst neg length)
   (inst sll length 1)
diff --git a/assembly/sparc/assem-rtns.lisp b/assembly/sparc/assem-rtns.lisp
index 5f20b1540..89d3a008e 100644
--- a/assembly/sparc/assem-rtns.lisp
+++ b/assembly/sparc/assem-rtns.lisp
@@ -5,11 +5,11 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/sparc/assem-rtns.lisp,v 1.2 1994/10/31 04:57:20 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/sparc/assem-rtns.lisp,v 1.3 2003/08/03 11:27:50 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/sparc/assem-rtns.lisp,v 1.2 1994/10/31 04:57:20 ram Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/sparc/assem-rtns.lisp,v 1.3 2003/08/03 11:27:50 gerd Exp $
 ;;;
 ;;;
 (in-package "SPARC")
@@ -47,26 +47,26 @@
   ;; been loaded.
   (inst cmp nvals)
   (inst b :le default-a0-and-on)
-  (inst cmp nvals (fixnum 2))
+  (inst cmp nvals (fixnumize 2))
   (inst b :le default-a2-and-on)
   (inst ld a1 vals (* 1 vm:word-bytes))
-  (inst cmp nvals (fixnum 3))
+  (inst cmp nvals (fixnumize 3))
   (inst b :le default-a3-and-on)
   (inst ld a2 vals (* 2 vm:word-bytes))
-  (inst cmp nvals (fixnum 4))
+  (inst cmp nvals (fixnumize 4))
   (inst b :le default-a4-and-on)
   (inst ld a3 vals (* 3 vm:word-bytes))
-  (inst cmp nvals (fixnum 5))
+  (inst cmp nvals (fixnumize 5))
   (inst b :le default-a5-and-on)
   (inst ld a4 vals (* 4 vm:word-bytes))
-  (inst cmp nvals (fixnum 6))
+  (inst cmp nvals (fixnumize 6))
   (inst b :le done)
   (inst ld a5 vals (* 5 vm:word-bytes))
 
   ;; Copy the remaining args to the top of the stack.
   (inst add src vals (* 6 vm:word-bytes))
   (inst add dst cfp-tn (* 6 vm:word-bytes))
-  (inst subcc count nvals (fixnum 6))
+  (inst subcc count nvals (fixnumize 6))
 
   LOOP
   (inst ld temp src)
@@ -74,7 +74,7 @@
   (inst st temp dst)
   (inst add dst vm:word-bytes)
   (inst b :gt loop)
-  (inst subcc count (fixnum 1))
+  (inst subcc count (fixnumize 1))
 		
   (inst b done)
   (inst nop)
@@ -144,7 +144,7 @@
   (inst ld a5 args (* 5 vm:word-bytes))
 
   ;; Calc SRC, DST, and COUNT
-  (inst addcc count nargs (fixnum (- register-arg-count)))
+  (inst addcc count nargs (fixnumize (- register-arg-count)))
   (inst b :le done)
   (inst add src args (* vm:word-bytes register-arg-count))
   (inst add dst cfp-tn (* vm:word-bytes register-arg-count))
@@ -154,7 +154,7 @@
   (inst ld temp src)
   (inst add src src vm:word-bytes)
   (inst st temp dst)
-  (inst addcc count (fixnum -1))
+  (inst addcc count (fixnumize -1))
   (inst b :gt loop)
   (inst add dst dst vm:word-bytes)
 	
diff --git a/assembly/x86/arith.lisp b/assembly/x86/arith.lisp
index c8d6d6a1e..66bd3ac32 100644
--- a/assembly/x86/arith.lisp
+++ b/assembly/x86/arith.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
- "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/x86/arith.lisp,v 1.10 1998/02/19 19:37:26 dtc Exp $")
+ "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/x86/arith.lisp,v 1.11 2003/08/03 11:27:50 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -51,9 +51,9 @@
     (inst pop eax)
     (inst push ebp-tn)
     (inst lea ebp-tn (make-ea :dword :base esp-tn :disp word-bytes))
-    (inst sub esp-tn (fixnum 2))
+    (inst sub esp-tn (fixnumize 2))
     (inst push eax)			; callers return addr
-    (inst mov ecx (fixnum 2))		; arg count
+    (inst mov ecx (fixnumize 2))	; arg count
     (inst jmp (make-ea :dword
 	       	       :disp (+ nil-value (static-function-offset
 					   ',(symbolicate "TWO-ARG-" fun)))))
@@ -146,9 +146,9 @@
   (inst pop eax)
   (inst push ebp-tn)
   (inst lea ebp-tn (make-ea :dword :base esp-tn :disp word-bytes))
-  (inst sub esp-tn (fixnum 2))
+  (inst sub esp-tn (fixnumize 2))
   (inst push eax)
-  (inst mov ecx (fixnum 1))		; arg count
+  (inst mov ecx (fixnumize 1))		; arg count
   (inst jmp (make-ea :dword
 		     :disp (+ nil-value (static-function-offset '%negate))))
   
@@ -193,9 +193,9 @@
     (inst pop eax)
     (inst push ebp-tn)
     (inst lea ebp-tn (make-ea :dword :base esp-tn :disp word-bytes))
-    (inst sub esp-tn (fixnum 2))
+    (inst sub esp-tn (fixnumize 2))
     (inst push eax)
-    (inst mov ecx (fixnum 2))
+    (inst mov ecx (fixnumize 2))
     (inst jmp (make-ea :dword
 	       	       :disp (+ nil-value
 				(static-function-offset ',static-fn))))
@@ -246,9 +246,9 @@
   (inst pop eax)
   (inst push ebp-tn)
   (inst lea ebp-tn (make-ea :dword :base esp-tn :disp word-bytes))
-  (inst sub esp-tn (fixnum 2))
+  (inst sub esp-tn (fixnumize 2))
   (inst push eax)
-  (inst mov ecx (fixnum 2))
+  (inst mov ecx (fixnumize 2))
   (inst jmp (make-ea :dword
 		     :disp (+ nil-value (static-function-offset 'eql))))
   
@@ -285,9 +285,9 @@
   (inst pop eax)
   (inst push ebp-tn)
   (inst lea ebp-tn (make-ea :dword :base esp-tn :disp word-bytes))
-  (inst sub esp-tn (fixnum 2))
+  (inst sub esp-tn (fixnumize 2))
   (inst push eax)
-  (inst mov ecx (fixnum 2))
+  (inst mov ecx (fixnumize 2))
   (inst jmp (make-ea :dword
 		     :disp (+ nil-value (static-function-offset 'two-arg-=))))
   
diff --git a/assembly/x86/array.lisp b/assembly/x86/array.lisp
index 563165d65..9bd8ba928 100644
--- a/assembly/x86/array.lisp
+++ b/assembly/x86/array.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
- "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/x86/array.lisp,v 1.7 1998/02/19 19:37:27 dtc Exp $")
+ "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/x86/array.lisp,v 1.8 2003/08/03 11:27:50 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -104,7 +104,7 @@
   ;; First, check to see how many of them there are.  If zero, blow out of
   ;; here.  Otherwise, multiply by 8.
   (inst mov ecx length)
-  (inst and ecx (fixnum 3))
+  (inst and ecx (fixnumize 3))
   (inst jecxz done)
   (inst shl ecx 1)
 
diff --git a/assembly/x86/assem-rtns.lisp b/assembly/x86/assem-rtns.lisp
index 47fe9c3e1..e73610f09 100644
--- a/assembly/x86/assem-rtns.lisp
+++ b/assembly/x86/assem-rtns.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
- "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/x86/assem-rtns.lisp,v 1.5 1998/02/19 19:37:29 dtc Exp $")
+ "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/x86/assem-rtns.lisp,v 1.6 2003/08/03 11:27:50 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;; 
@@ -43,11 +43,11 @@
      
   ;; Pick off the cases where everything fits in register args.
   (inst jecxz zero-values)
-  (inst cmp ecx (fixnum 1))
+  (inst cmp ecx (fixnumize 1))
   (inst jmp :e one-value)
-  (inst cmp ecx (fixnum 2))
+  (inst cmp ecx (fixnumize 2))
   (inst jmp :e two-values)
-  (inst cmp ecx (fixnum 3))
+  (inst cmp ecx (fixnumize 3))
   (inst jmp :e three-values)
 
   ;; Save the count, because the loop is going to destroy it.
@@ -140,7 +140,7 @@
   (inst sub ecx esp-tn)
 
   ;; Check for all the args fitting the the registers.
-  (inst cmp ecx (fixnum 3))
+  (inst cmp ecx (fixnumize 3))
   (inst jmp :le REGISTER-ARGS)
 
   ;; Save the OLD-FP and RETURN-PC because the blit it going to trash
@@ -155,7 +155,7 @@
   (inst shr ecx 2)			; fixnum to raw words
   (inst std)				; count down
   (inst lea edi (make-ea :dword :base ebp-tn :disp (- word-bytes)))
-  (inst sub esi (fixnum 1))
+  (inst sub esi (fixnumize 1))
   (inst rep)
   (inst movs :dword)
 
diff --git a/bootfiles/18e/boot14.lisp b/bootfiles/18e/boot14.lisp
new file mode 100644
index 000000000..df9e8decc
--- /dev/null
+++ b/bootfiles/18e/boot14.lisp
@@ -0,0 +1,13 @@
+;;;
+;;; Bootstrap file for removing the function definition of
+;;; FIXNUM, which must not exist according to CLtS.
+;;;
+
+(in-package :vm)
+
+(export 'fixnumize)
+
+(when (fboundp 'fixnum)
+  (setf (fdefinition 'fixnumize) (fdefinition 'fixnum)))
+      
+;;; End of file.
\ No newline at end of file
diff --git a/code/exports.lisp b/code/exports.lisp
index cefafdc7a..0b5e2561c 100644
--- a/code/exports.lisp
+++ b/code/exports.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/exports.lisp,v 1.219 2003/07/03 02:13:14 toy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/exports.lisp,v 1.220 2003/08/03 11:27:49 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -1045,6 +1045,7 @@
 	   #+sparc "PSEUDO-ATOMIC-TRAP"
 	   #+sparc "GET-FP-OPERANDS"
 	   "CALLBACK-ACCESSOR-FORM" "MAKE-CALLBACK-TRAMPOLINE"
+	   "FIXNUMIZE"
 	   ))
 
 (defpackage "CONDITIONS")
diff --git a/compiler/alpha/alloc.lisp b/compiler/alpha/alloc.lisp
index 7a5bfcb26..a000fd4b0 100644
--- a/compiler/alpha/alloc.lisp
+++ b/compiler/alpha/alloc.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/alpha/alloc.lisp,v 1.2 1994/10/31 04:39:51 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/alpha/alloc.lisp,v 1.3 2003/08/03 11:27:49 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -87,7 +87,7 @@
   (:temporary (:scs (non-descriptor-reg) :from (:argument 1)) unboxed)
   (:generator 100
     (inst li (lognot lowtag-mask) ndescr)
-    (inst lda boxed (fixnum (1+ code-trace-table-offset-slot))
+    (inst lda boxed (fixnumize (1+ code-trace-table-offset-slot))
 	  boxed-arg)
     (inst and boxed ndescr boxed)
     (inst srl unboxed-arg word-shift unboxed)
diff --git a/compiler/alpha/arith.lisp b/compiler/alpha/arith.lisp
index d443dc65c..1290a59f6 100644
--- a/compiler/alpha/arith.lisp
+++ b/compiler/alpha/arith.lisp
@@ -5,11 +5,11 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/alpha/arith.lisp,v 1.5 2000/10/23 16:21:54 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/alpha/arith.lisp,v 1.6 2003/08/03 11:27:49 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/alpha/arith.lisp,v 1.5 2000/10/23 16:21:54 dtc Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/alpha/arith.lisp,v 1.6 2003/08/03 11:27:49 gerd Rel $
 ;;;
 ;;;    This file contains the VM definition arithmetic VOPs for the MIPS.
 ;;;
@@ -143,7 +143,7 @@
 		       (:arg-types tagged-num (:constant ,tagged-type))
 	     (:translate ,translate)
 	     (:generator ,cost
-			 (inst ,op x (fixnum y) r)))))
+			 (inst ,op x (fixnumize y) r)))))
      ,@(when untagged-type
 	 `((define-vop (,(symbolicate "FAST-" translate "-C/SIGNED=>SIGNED")
 			fast-signed-c-binop)
@@ -276,7 +276,7 @@
     (inst subq zero-tn 4 res)
     (inst sll shift 1 shift)
     LOOP
-    (inst addq res (fixnum 1) res)
+    (inst addq res (fixnumize 1) res)
     (inst srl shift 1 shift)
     (inst bne shift loop)))
 
@@ -406,7 +406,7 @@
 			(:generator ,cost
 			  (let* ((signed ,signed)
 				 (-c/fixnum ,(eq suffix '-c/fixnum))
-				 (y (if -c/fixnum (fixnum y) y)))
+				 (y (if -c/fixnum (fixnumize y) y)))
 			    (declare (optimize (inhibit-warnings 3)))
 			    ,@generator)))))
 	       '(/fixnum -c/fixnum /signed -c/signed /unsigned -c/unsigned)
@@ -432,7 +432,7 @@
 	     (inst ble x target)
 	     (inst bgt x target)))
 	((integerp y)
-	 (let ((y (+ y (if -c/fixnum (fixnum 1) 1))))
+	 (let ((y (+ y (if -c/fixnum (fixnumize 1) 1))))
 	   (if signed
 	       (inst cmplt x y temp)
 	       (inst cmpult x y temp))
@@ -499,7 +499,7 @@
   (:generator 2
     (let ((y (cond ((eql y 0) zero-tn)
 		   (t
-		    (inst li (fixnum y) temp)
+		    (inst li (fixnumize y) temp)
 		    temp))))
       (inst cmpeq x y temp)
       (if not-p
diff --git a/compiler/alpha/array.lisp b/compiler/alpha/array.lisp
index 1c24ed3f0..85ba9d77c 100644
--- a/compiler/alpha/array.lisp
+++ b/compiler/alpha/array.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/alpha/array.lisp,v 1.9 2003/07/21 12:57:19 emarsden Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/alpha/array.lisp,v 1.10 2003/08/03 11:27:49 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -35,7 +35,7 @@
 	  bytes)
     (inst li (lognot lowtag-mask) header)
     (inst and bytes header bytes)
-    (inst addq rank (fixnum (1- array-dimensions-offset)) header)
+    (inst addq rank (fixnumize (1- array-dimensions-offset)) header)
     (inst sll header type-bits header)
     (inst bis header type header)
     (inst srl header 2 header)
diff --git a/compiler/alpha/call.lisp b/compiler/alpha/call.lisp
index 526db6a62..af2fc48bf 100644
--- a/compiler/alpha/call.lisp
+++ b/compiler/alpha/call.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/alpha/call.lisp,v 1.3 1998/01/26 15:54:27 pw Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/alpha/call.lisp,v 1.4 2003/08/03 11:27:49 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -320,7 +320,7 @@ default-value-8
 	  (note-this-location vop :unknown-return)
 	  ;; If there are no stack results, clear the stack now.
 	  (if (> nvals register-arg-count)
-	      (inst subq nargs-tn (fixnum register-arg-count) temp)
+	      (inst subq nargs-tn (fixnumize register-arg-count) temp)
 	      (move ocfp-tn csp-tn))
 	  ;; Branch off to the MV case.
 	  (inst br zero-tn regs-defaulted))
@@ -353,7 +353,7 @@ default-value-8
 		
 		(inst blt temp default-lab)
 		(inst ldl move-temp (* i word-bytes) ocfp-tn)
-		(inst subq temp (fixnum 1) temp)
+		(inst subq temp (fixnumize 1) temp)
 		(store-stack-tn tn move-temp)))
 	    
 	    (emit-label defaulting-done)
@@ -412,7 +412,7 @@ default-value-8
     (inst addq csp-tn 4 csp-tn)
     (storew (first register-arg-tns) csp-tn -1)
     (inst subq csp-tn 4 start)
-    (inst li (fixnum 1) count)
+    (inst li (fixnumize 1) count)
     
     (emit-label done)
     
@@ -777,7 +777,7 @@ default-value-8
 							    word-shift)
 						      new-fp))
 					   register-arg-names)))
-			     '((inst li (fixnum nargs) nargs-pass))))
+			     '((inst li (fixnumize nargs) nargs-pass))))
 		      ,@(if (eq return :tail)
 			    '((:load-ocfp
 			       (sc-case ocfp
@@ -1011,7 +1011,7 @@ default-value-8
 	      nsp-tn)))
     ;; Establish the values pointer and values count.
     (move cfp-tn val-ptr)
-    (inst li (fixnum nvals) nargs)
+    (inst li (fixnumize nvals) nargs)
     ;; restore the frame pointer and clear as much of the control
     ;; stack as possible.
     (move ocfp cfp-tn)
@@ -1060,7 +1060,7 @@ default-value-8
 		nsp-tn)))
 
       ;; Check for the single case.
-      (inst li (fixnum 1) a0)
+      (inst li (fixnumize 1) a0)
       (inst cmpeq nvals-arg a0 temp)
       (inst ldl a0 0 vals-arg)
       (inst beq temp not-single)
@@ -1130,13 +1130,13 @@ default-value-8
 	     (inst addq csp-tn nargs-tn csp-tn)
 	     (inst beq nargs-tn done))
 	    (t
-	     (inst subq nargs-tn (fixnum fixed) count)
+	     (inst subq nargs-tn (fixnumize fixed) count)
 	     (inst ble count done)
 	     (inst addq csp-tn count csp-tn)))
       (when (< fixed register-arg-count)
 	;; We must stop when we run out of stack args, not when we run out of
 	;; more args.
-	(inst subq nargs-tn (fixnum register-arg-count) count))
+	(inst subq nargs-tn (fixnumize register-arg-count) count))
       ;; Initialize dst to be end of stack.
       (move csp-tn dst)
       ;; Everything of interest in registers.
@@ -1147,7 +1147,7 @@ default-value-8
       (emit-label loop)
       ;; *--dst = *--src, --count
       (inst subq src word-bytes src)
-      (inst subq count (fixnum 1) count)
+      (inst subq count (fixnumize 1) count)
       (loadw temp src)
       (inst subq dst word-bytes dst)
       (storew temp dst)
@@ -1158,7 +1158,7 @@ default-value-8
 	;; Now we have to deposit any more args that showed up in registers.
 	;; We know there is at least one more arg, otherwise we would have
 	;; branched to done up at the top.
-	(inst subq nargs-tn (fixnum (1+ fixed)) count)
+	(inst subq nargs-tn (fixnumize (1+ fixed)) count)
 	(do ((i fixed (1+ i)))
 	    ((>= i register-arg-count))
 	  ;; Store it relative to the pointer saved at the start.
@@ -1166,7 +1166,7 @@ default-value-8
 	  ;; Is this the last one?
 	  (inst beq count done)
 	  ;; Decrement count.
-	  (inst subq count (fixnum 1) count)))
+	  (inst subq count (fixnumize 1) count)))
       (emit-label done))))
 
 
@@ -1221,7 +1221,7 @@ default-value-8
 	(storew temp dst 0 list-pointer-type)
 
 	;; Dec count, and if != zero, go back for more.
-	(inst subq count (fixnum 1) count)
+	(inst subq count (fixnumize 1) count)
 	(inst bne count loop)
 
 	;; NIL out the last cons.
@@ -1249,7 +1249,7 @@ default-value-8
   (:result-types t tagged-num)
   (:note "more-arg-context")
   (:generator 5
-    (inst subq supplied (fixnum fixed) count)
+    (inst subq supplied (fixnumize fixed) count)
     (inst subq csp-tn count context)))
 
 
@@ -1270,7 +1270,7 @@ default-value-8
       (cond ((zerop count)
 	     (inst bne nargs err-lab))
 	    (t
-	     (inst subq nargs (fixnum count) temp)
+	     (inst subq nargs (fixnumize count) temp)
 	     (inst bne temp err-lab))))))
 
 ;;; Various other error signalers.
diff --git a/compiler/alpha/move.lisp b/compiler/alpha/move.lisp
index 1f7bd160c..2c4cd4be6 100644
--- a/compiler/alpha/move.lisp
+++ b/compiler/alpha/move.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/alpha/move.lisp,v 1.2 1994/10/31 04:39:51 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/alpha/move.lisp,v 1.3 2003/08/03 11:27:49 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -24,7 +24,7 @@
   (let ((val (tn-value x)))
     (etypecase val
       (integer
-       (inst li (fixnum val) y))
+       (inst li (fixnumize val) y))
       (null
        (move null-tn y))
       (symbol
diff --git a/compiler/alpha/nlx.lisp b/compiler/alpha/nlx.lisp
index 0538fcd29..14a9130fe 100644
--- a/compiler/alpha/nlx.lisp
+++ b/compiler/alpha/nlx.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/alpha/nlx.lisp,v 1.4 1998/01/26 15:54:34 pw Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/alpha/nlx.lisp,v 1.5 2003/08/03 11:27:49 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -211,7 +211,7 @@
 		 (defaults (cons default-lab tn))
 		 
 		 (inst move count temp)
-		 (inst lda count (fixnum -1) count)
+		 (inst lda count (fixnumize -1) count)
 		 (inst beq temp default-lab)
 		 (sc-case tn
 			  ((descriptor-reg any-reg)
@@ -274,7 +274,7 @@
       (loadw temp src)
       (inst lda src vm:word-bytes src)
       (storew temp dst)
-      (inst lda num (fixnum -1) num)
+      (inst lda num (fixnumize -1) num)
       (inst lda dst vm:word-bytes dst)
       (inst bne num loop)
 
diff --git a/compiler/alpha/static-fn.lisp b/compiler/alpha/static-fn.lisp
index 2cbfe3ddd..789c77101 100644
--- a/compiler/alpha/static-fn.lisp
+++ b/compiler/alpha/static-fn.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/alpha/static-fn.lisp,v 1.2 1994/10/31 04:39:51 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/alpha/static-fn.lisp,v 1.3 2003/08/03 11:27:49 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -87,7 +87,7 @@
 	   (let ((lra-label (gen-label))
 		 (cur-nfp (current-nfp-tn vop)))
 	     ,@(moves (arg-names) (temp-names))
-	     (inst li (fixnum ,num-args) nargs)
+	     (inst li (fixnumize ,num-args) nargs)
 	     (inst ldl entry-point (static-function-offset symbol) null-tn)
 	     (when cur-nfp
 	       (store-stack-tn nfp-save cur-nfp))
diff --git a/compiler/alpha/subprim.lisp b/compiler/alpha/subprim.lisp
index dbd7b04a5..fcc824716 100644
--- a/compiler/alpha/subprim.lisp
+++ b/compiler/alpha/subprim.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/alpha/subprim.lisp,v 1.2 1994/10/31 04:39:51 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/alpha/subprim.lisp,v 1.3 2003/08/03 11:27:49 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -46,7 +46,7 @@
     (inst bne temp not-list)
     
     (loadw ptr ptr cons-cdr-slot list-pointer-type)
-    (inst addq count (fixnum 1) count)
+    (inst addq count (fixnumize 1) count)
     (inst br zero-tn loop)
     
     NOT-LIST
diff --git a/compiler/alpha/values.lisp b/compiler/alpha/values.lisp
index 83ee44828..bce946cbb 100644
--- a/compiler/alpha/values.lisp
+++ b/compiler/alpha/values.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/alpha/values.lisp,v 1.2 1994/10/31 04:39:51 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/alpha/values.lisp,v 1.3 2003/08/03 11:27:49 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -58,7 +58,7 @@
 	   (load-stack-tn temp tn)
 	   (storew temp start-temp i)))))
     (move start-temp start)
-    (inst li (fixnum nvals) count)))
+    (inst li (fixnumize nvals) count)))
 
 
 ;;; Push a list of values on the stack, returning Start and Count as used in
diff --git a/compiler/generic/utils.lisp b/compiler/generic/utils.lisp
index 256341bb7..085045270 100644
--- a/compiler/generic/utils.lisp
+++ b/compiler/generic/utils.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/generic/utils.lisp,v 1.6 2001/06/25 16:48:22 toy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/generic/utils.lisp,v 1.7 2003/08/03 11:27:49 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -16,14 +16,14 @@
 
 (in-package "VM")
 
-(export '(fixnum static-symbol-p static-symbol-offset offset-static-symbol
-		 static-function-offset))
+(export '(fixnumize static-symbol-p static-symbol-offset offset-static-symbol
+	  static-function-offset))
 
 
 
 ;;;; Handy routine for making fixnums:
 
-(defun fixnum (num)
+(defun fixnumize (num)
   "Make a fixnum out of NUM.  (i.e. shift by two bits if it will fit.)"
   (if (<= #x-20000000 num #x1fffffff)
       (ash num 2)
diff --git a/compiler/hppa/alloc.lisp b/compiler/hppa/alloc.lisp
index 07b17cfea..b45ae2f31 100644
--- a/compiler/hppa/alloc.lisp
+++ b/compiler/hppa/alloc.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/hppa/alloc.lisp,v 1.3 1994/10/31 04:42:45 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/hppa/alloc.lisp,v 1.4 2003/08/03 11:27:49 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -85,7 +85,7 @@
   (:temporary (:scs (any-reg) :from (:argument 0)) boxed)
   (:temporary (:scs (non-descriptor-reg) :from (:argument 1)) unboxed)
   (:generator 100
-    (inst addi (fixnum (1+ code-trace-table-offset-slot)) boxed-arg boxed)
+    (inst addi (fixnumize (1+ code-trace-table-offset-slot)) boxed-arg boxed)
     (inst dep 0 31 3 boxed)
     (inst srl unboxed-arg word-shift unboxed)
     (inst addi lowtag-mask unboxed unboxed)
diff --git a/compiler/hppa/arith.lisp b/compiler/hppa/arith.lisp
index 5462cfeda..86d8c48f7 100644
--- a/compiler/hppa/arith.lisp
+++ b/compiler/hppa/arith.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/hppa/arith.lisp,v 1.5 2000/01/17 16:42:23 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/hppa/arith.lisp,v 1.6 2003/08/03 11:27:49 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -51,7 +51,7 @@
 	      temp)
   (:translate lognot)
   (:generator 2
-    (inst li (fixnum -1) temp)
+    (inst li (fixnumize -1) temp)
     (inst xor x temp res)))
 
 (define-vop (fast-lognot/signed signed-unop)
@@ -152,7 +152,7 @@
        (:arg-types tagged-num (:constant ,tagged-type))
        (:translate ,translate)
        (:generator ,cost
-	 (let ((y (fixnum y)))
+	 (let ((y (fixnumize y)))
 	   ,inst)))
      (define-vop (,(symbolicate "FAST-" translate "-C/SIGNED=>SIGNED")
 		  fast-signed-c-binop)
@@ -189,7 +189,7 @@
   (:result-types (:or signed-num unsigned-num))
   (:note nil)
   (:generator 3
-    (inst addio (fixnum y) x r)))
+    (inst addio (fixnumize y) x r)))
 
 (define-vop (fast--/fixnum fast--/fixnum=>fixnum)
   (:results (r :scs (any-reg descriptor-reg)))
@@ -203,7 +203,7 @@
   (:result-types (:or signed-num unsigned-num))
   (:note nil)
   (:generator 3
-    (inst addio (- (fixnum y)) x r)))
+    (inst addio (- (fixnumize y)) x r)))
 
 ;;; Shifting
 
@@ -315,7 +315,7 @@
     LOOP
     (inst srl shift 1 shift)
     (inst comb :<> shift zero-tn loop)
-    (inst addi (fixnum 1) res res)
+    (inst addi (fixnumize 1) res res)
     DONE))
 
 (define-vop (unsigned-byte-32-count)
@@ -527,7 +527,7 @@
 				,(if signed signed-cond unsigned-cond)
 				not-p
 				,(if (eq suffix '-c/fixnum)
-				     '(fixnum y)
+				     '(fixnumize y)
 				     'y)
 				x
 				target)))))
@@ -571,7 +571,7 @@
   (:info target not-p y)
   (:translate eql)
   (:generator 2
-    (inst bci := not-p (fixnum y) x target)))
+    (inst bci := not-p (fixnumize y) x target)))
 ;;;
 (define-vop (generic-eql-c/fixnum fast-eql-c/fixnum)
   (:arg-types * (:constant (signed-byte 9)))
diff --git a/compiler/hppa/array.lisp b/compiler/hppa/array.lisp
index cfde47a02..84061aabf 100644
--- a/compiler/hppa/array.lisp
+++ b/compiler/hppa/array.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/hppa/array.lisp,v 1.7 1998/07/24 17:22:33 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/hppa/array.lisp,v 1.8 2003/08/03 11:27:49 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -35,7 +35,7 @@
       (inst addi (* (1+ array-dimensions-offset) word-bytes) rank ndescr)
       (inst dep 0 31 3 ndescr)
       (inst add alloc-tn ndescr alloc-tn)
-      (inst addi (fixnum (1- array-dimensions-offset)) rank ndescr)
+      (inst addi (fixnumize (1- array-dimensions-offset)) rank ndescr)
       (inst sll ndescr type-bits ndescr)
       (inst or ndescr type ndescr)
       (inst srl ndescr 2 ndescr)
diff --git a/compiler/hppa/call.lisp b/compiler/hppa/call.lisp
index 5156c9b5f..4d795d4a6 100644
--- a/compiler/hppa/call.lisp
+++ b/compiler/hppa/call.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/hppa/call.lisp,v 1.11 1998/03/04 14:53:33 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/hppa/call.lisp,v 1.12 2003/08/03 11:27:48 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -348,7 +348,7 @@ default-value-8
 	  (let ((default-lab (gen-label))
 		(tn (tn-ref-tn val)))
 	    (defaults (cons default-lab tn))
-	    (inst bci :>= nil (fixnum i) nargs-tn default-lab)
+	    (inst bci :>= nil (fixnumize i) nargs-tn default-lab)
 	    (loadw move-temp ocfp-tn i)
 	    (store-stack-tn tn move-temp)))
 	
@@ -401,7 +401,7 @@ default-value-8
     (inst compute-code-from-lra code-tn lra-label temp code-tn)
     (inst move csp-tn start)
     (inst stwm (first register-arg-tns) word-bytes csp-tn)
-    (inst li (fixnum 1) count)
+    (inst li (fixnumize 1) count)
     
     DONE
     
@@ -767,7 +767,7 @@ default-value-8
 					     `(loadw ,name new-fp
 						     ,(incf index)))
 					 register-arg-names)))
-			   '((inst li (fixnum nargs) nargs-pass))))
+			   '((inst li (fixnumize nargs) nargs-pass))))
 		    ,@(if (eq return :tail)
 			  '((:load-ocfp
 			     (sc-case ocfp
@@ -964,7 +964,7 @@ default-value-8
 	(inst move cur-nfp nsp-tn)))
     ;; Establish the values pointer and values count.
     (move cfp-tn val-ptr)
-    (inst li (fixnum nvals) nargs)
+    (inst li (fixnumize nvals) nargs)
     ;; restore the frame pointer and clear as much of the control
     ;; stack as possible.
     (move old-fp cfp-tn)
@@ -1008,7 +1008,7 @@ default-value-8
 
     (unless (policy node (> space speed))
       ;; Check for the single case.
-      (inst comib :<> (fixnum 1) nvals-arg not-single)
+      (inst comib :<> (fixnumize 1) nvals-arg not-single)
       (loadw a0 vals-arg)
 
       ;; Return with one value.
@@ -1066,7 +1066,7 @@ default-value-8
   (:generator 20
     ;; Figure out how many things we are going to copy.
     (unless (zerop fixed)
-      (inst addi (- (fixnum fixed)) nargs-tn count))
+      (inst addi (- (fixnumize fixed)) nargs-tn count))
 
     ;; Blow out of here if is nothing to copy.
     (inst comb :<= (if (zerop fixed) nargs-tn count) zero-tn done :nullify t)
@@ -1082,7 +1082,7 @@ default-value-8
     (when (< fixed register-arg-count)
       ;; We must stop when we run out of stack args, not when we run out of
       ;; args in general.
-      (inst addi (fixnum (- register-arg-count)) nargs-tn count)
+      (inst addi (fixnumize (- register-arg-count)) nargs-tn count)
       ;; Everything of interest in registers.
       (inst comb :<= count zero-tn do-regs))
     ;; Initialize dst to be end of stack.
@@ -1094,7 +1094,7 @@ default-value-8
     LOOP
     ;; *--dst = *--src, --count
     (inst ldwm (- word-bytes) src temp)
-    (inst addib :> (fixnum -1) count loop)
+    (inst addib :> (fixnumize -1) count loop)
     (inst stwm temp (- word-bytes) dst)
 
     DO-REGS
@@ -1102,11 +1102,11 @@ default-value-8
       ;; Now we have to deposit any more args that showed up in registers.
       ;; We know there is at least one more arg, otherwise we would have
       ;; branched to done up at the top.
-      (inst addi (fixnum (- fixed)) nargs-tn count)
+      (inst addi (fixnumize (- fixed)) nargs-tn count)
       (do ((i fixed (1+ i)))
 	  ((>= i register-arg-count))
 	;; Is this the last one?
-	(inst addib :<= (fixnum -1) count done)
+	(inst addib :<= (fixnumize -1) count done)
 	;; Store it relative to the pointer saved at the start.
 	(storew (nth i register-arg-tns) result (- i fixed))))
     DONE))
@@ -1154,7 +1154,7 @@ default-value-8
 	
 	;; Dec count, and if != zero, go back for more.
 	(inst addi (* 2 vm:word-bytes) dst dst)
-	(inst addib :> (fixnum -1) count loop :nullify t)
+	(inst addib :> (fixnumize -1) count loop :nullify t)
 	(storew dst dst -1 list-pointer-type)
 	
 	;; NIL out the last cons.
@@ -1186,7 +1186,7 @@ default-value-8
   (:result-types t tagged-num)
   (:note "more-arg-context")
   (:generator 5
-    (inst addi (fixnum (- fixed)) supplied count)
+    (inst addi (fixnumize (- fixed)) supplied count)
     (inst sub csp-tn count context)))
 
 
@@ -1206,7 +1206,7 @@ default-value-8
       (cond ((zerop count)
 	     (inst bc :<> nil nargs zero-tn err-lab))
 	    (t
-	     (inst bci :<> nil (fixnum count) nargs err-lab))))))
+	     (inst bci :<> nil (fixnumize count) nargs err-lab))))))
 
 ;;; Signal an argument count error.
 ;;;
diff --git a/compiler/hppa/move.lisp b/compiler/hppa/move.lisp
index af6abedd3..25f7b325f 100644
--- a/compiler/hppa/move.lisp
+++ b/compiler/hppa/move.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/hppa/move.lisp,v 1.2 1994/10/31 04:42:45 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/hppa/move.lisp,v 1.3 2003/08/03 11:27:48 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -23,7 +23,7 @@
   (let ((val (tn-value x)))
     (etypecase val
       (integer
-       (inst li (fixnum val) y))
+       (inst li (fixnumize val) y))
       (null
        (move null-tn y))
       (symbol
diff --git a/compiler/hppa/nlx.lisp b/compiler/hppa/nlx.lisp
index e53efa2d1..e2967bb96 100644
--- a/compiler/hppa/nlx.lisp
+++ b/compiler/hppa/nlx.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/hppa/nlx.lisp,v 1.4 1998/03/04 14:53:32 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/hppa/nlx.lisp,v 1.5 2003/08/03 11:27:48 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -196,7 +196,7 @@
 		     (tn (tn-ref-tn tn-ref)))
 		 (defaults (cons default-lab tn))
 
-		 (inst bci := nil (fixnum i) count default-lab)
+		 (inst bci := nil (fixnumize i) count default-lab)
 		 (sc-case tn
 		   ((descriptor-reg any-reg)
 		    (loadw tn start i))
@@ -258,7 +258,7 @@
     ;; Copy stuff on stack.
     LOOP
     (inst stwm temp word-bytes dst)
-    (inst addib :<> (fixnum -1) num loop :nullify t)
+    (inst addib :<> (fixnumize -1) num loop :nullify t)
     (inst ldwm word-bytes src temp)
 
     DONE
diff --git a/compiler/hppa/static-fn.lisp b/compiler/hppa/static-fn.lisp
index 3f34a6e26..5c5f71fbe 100644
--- a/compiler/hppa/static-fn.lisp
+++ b/compiler/hppa/static-fn.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/hppa/static-fn.lisp,v 1.2 1994/10/31 04:42:45 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/hppa/static-fn.lisp,v 1.3 2003/08/03 11:27:48 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -84,7 +84,7 @@
 	   (let ((lra-label (gen-label))
 		 (cur-nfp (current-nfp-tn vop)))
 	     ,@(moves (arg-names) (temp-names))
-	     (inst li (fixnum ,num-args) nargs)
+	     (inst li (fixnumize ,num-args) nargs)
 	     (inst ldw (static-function-offset symbol) null-tn lip)
 	     (when cur-nfp
 	       (store-stack-tn nfp-save cur-nfp))
diff --git a/compiler/hppa/subprim.lisp b/compiler/hppa/subprim.lisp
index 6c6e6c8d0..155db53bb 100644
--- a/compiler/hppa/subprim.lisp
+++ b/compiler/hppa/subprim.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/hppa/subprim.lisp,v 1.2 1994/10/31 04:42:45 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/hppa/subprim.lisp,v 1.3 2003/08/03 11:27:48 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -41,7 +41,7 @@
     (loadw ptr ptr vm:cons-cdr-slot vm:list-pointer-type)
 
     LOOP
-    (inst addi (fixnum 1) count count)
+    (inst addi (fixnumize 1) count count)
     (inst comb := ptr null-tn done :nullify t)
     (inst extru ptr 31 3 temp)
     (inst comib := list-pointer-type temp loop :nullify t)
diff --git a/compiler/hppa/values.lisp b/compiler/hppa/values.lisp
index 0a16f5444..5427b06d4 100644
--- a/compiler/hppa/values.lisp
+++ b/compiler/hppa/values.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/hppa/values.lisp,v 1.5 1994/10/31 04:42:45 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/hppa/values.lisp,v 1.6 2003/08/03 11:27:48 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -50,7 +50,7 @@
 	  (control-stack
 	   (load-stack-tn temp tn)
 	   (storew temp start i)))))
-    (inst li (fixnum nvals) count)))
+    (inst li (fixnumize nvals) count)))
 
 
 ;;; Push a list of values on the stack, returning Start and Count as used in
diff --git a/compiler/mips/alloc.lisp b/compiler/mips/alloc.lisp
index 575e57993..48bcbea66 100644
--- a/compiler/mips/alloc.lisp
+++ b/compiler/mips/alloc.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/alloc.lisp,v 1.28 1994/10/31 04:44:16 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/alloc.lisp,v 1.29 2003/08/03 11:27:48 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -108,7 +108,7 @@
   (:generator 100
     (inst li ndescr (lognot lowtag-mask))
     (inst addu boxed boxed-arg
-	  (fixnum (1+ code-trace-table-offset-slot)))
+	  (fixnumize (1+ code-trace-table-offset-slot)))
     (inst and boxed ndescr)
     (inst srl unboxed unboxed-arg word-shift)
     (inst addu unboxed unboxed lowtag-mask)
@@ -142,9 +142,9 @@
   (:ignore ra)
   (:generator 100
     (inst li lowtag (lognot lowtag-mask))
-    (inst addu words boxed (fixnum (1+ code-debug-info-slot)))
+    (inst addu words boxed (fixnumize (1+ code-debug-info-slot)))
     (inst and words lowtag)
-    (inst addu first-word unboxed (fixnum 1))
+    (inst addu first-word unboxed (fixnumize 1))
     (inst and first-word lowtag)
     (inst sll header words (- type-bits 2))
     (inst or header code-header-type)
@@ -270,7 +270,7 @@
   (:temporary (:sc any-reg :offset ra-offset :from (:eval 0) :to (:eval 1)) ra)
   (:ignore name nl2 ra)
   (:generator 10
-    (inst addu nargs extra (fixnum words))
+    (inst addu nargs extra (fixnumize words))
     (inst sll nl1 nargs (- type-bits word-shift))
     (inst addu nl1 (+ (ash -1 type-bits) type))
     (inst jal (make-fixup 'var-alloc :assembly-routine))
diff --git a/compiler/mips/arith.lisp b/compiler/mips/arith.lisp
index f54d05f0f..cd1696627 100644
--- a/compiler/mips/arith.lisp
+++ b/compiler/mips/arith.lisp
@@ -5,11 +5,11 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/arith.lisp,v 1.54 2000/01/17 16:42:24 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/arith.lisp,v 1.55 2003/08/03 11:27:48 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/arith.lisp,v 1.54 2000/01/17 16:42:24 dtc Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/arith.lisp,v 1.55 2003/08/03 11:27:48 gerd Rel $
 ;;;
 ;;;    This file contains the VM definition arithmetic VOPs for the MIPS.
 ;;;
@@ -55,7 +55,7 @@
 	      temp)
   (:translate lognot)
   (:generator 2
-    (inst li temp (fixnum -1))
+    (inst li temp (fixnumize -1))
     (inst xor res x temp)))
 
 (define-vop (fast-lognot/signed signed-unop)
@@ -147,7 +147,7 @@
 		       (:arg-types tagged-num (:constant ,tagged-type))
 	     (:translate ,translate)
 	     (:generator ,cost
-			 (inst ,op r x (fixnum y))))))
+			 (inst ,op r x (fixnumize y))))))
      ,@(when untagged-type
 	 `((define-vop (,(symbolicate "FAST-" translate "-C/SIGNED=>SIGNED")
 			fast-signed-c-binop)
@@ -187,7 +187,7 @@
   (:result-types (:or signed-num unsigned-num))
   (:note nil)
   (:generator 3
-    (inst add r x (fixnum y))))
+    (inst add r x (fixnumize y))))
 
 (define-vop (fast--/fixnum fast--/fixnum=>fixnum)
   (:results (r :scs (any-reg descriptor-reg)))
@@ -201,7 +201,7 @@
   (:result-types (:or signed-num unsigned-num))
   (:note nil)
   (:generator 3
-    (inst sub r x (fixnum y))))
+    (inst sub r x (fixnumize y))))
 
 
 ;;; Shifting
@@ -318,7 +318,7 @@
       (inst nor shift shift)
 
       (emit-label loop)
-      (inst add res (fixnum 1))
+      (inst add res (fixnumize 1))
       
       (emit-label test)
       (inst bne shift loop)
@@ -503,7 +503,7 @@
 			(:generator ,cost
 			  (let* ((signed ,signed)
 				 (-c/fixnum ,(eq suffix '-c/fixnum))
-				 (y (if -c/fixnum (fixnum y) y)))
+				 (y (if -c/fixnum (fixnumize y) y)))
 			    (declare (optimize (inhibit-warnings 3)))
 			    ,@generator)))))
 	       '(/fixnum -c/fixnum /signed -c/signed /unsigned -c/unsigned)
@@ -530,7 +530,7 @@
 	     (inst blez x target)
 	     (inst bgtz x target)))
 	((integerp y)
-	 (let ((y (+ y (if -c/fixnum (fixnum 1) 1))))
+	 (let ((y (+ y (if -c/fixnum (fixnumize 1) 1))))
 	   (if signed
 	       (inst slt temp x y)
 	       (inst sltu temp x y))
@@ -592,7 +592,7 @@
   (:generator 2
     (let ((y (cond ((eql y 0) zero-tn)
 		   (t
-		    (inst li temp (fixnum y))
+		    (inst li temp (fixnumize y))
 		    temp))))
       (if not-p
 	  (inst bne x y target)
diff --git a/compiler/mips/array.lisp b/compiler/mips/array.lisp
index d9021531d..1d66a2276 100644
--- a/compiler/mips/array.lisp
+++ b/compiler/mips/array.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/array.lisp,v 1.52 1999/06/17 15:18:14 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/array.lisp,v 1.53 2003/08/03 11:27:48 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -35,7 +35,7 @@
 			     lowtag-mask))
     (inst li header (lognot lowtag-mask))
     (inst and bytes header)
-    (inst addu header rank (fixnum (1- array-dimensions-offset)))
+    (inst addu header rank (fixnumize (1- array-dimensions-offset)))
     (inst sll header type-bits)
     (inst or header header type)
     (inst srl header 2)
@@ -58,8 +58,8 @@
   (:results (result :scs (descriptor-reg)))
   (:ignore nl2)
   (:generator 13
-    (inst addu a0 rank (fixnum (1+ array-dimensions-offset)))
-    (inst addu nl1 rank (fixnum (1- array-dimensions-offset)))
+    (inst addu a0 rank (fixnumize (1+ array-dimensions-offset)))
+    (inst addu nl1 rank (fixnumize (1- array-dimensions-offset)))
     (inst sll nl1 type-bits)
     (inst or nl1 type)
     (inst srl nl1 2)
diff --git a/compiler/mips/call.lisp b/compiler/mips/call.lisp
index 7ffdb78af..167774205 100644
--- a/compiler/mips/call.lisp
+++ b/compiler/mips/call.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/call.lisp,v 1.63 1998/03/04 14:53:29 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/call.lisp,v 1.64 2003/08/03 11:27:48 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -325,7 +325,7 @@ default-value-8
 	  (inst b regs-defaulted)
 	  ;; If there are no stack results, clear the stack now.
 	  (if (> nvals register-arg-count)
-	      (inst addu temp nargs-tn (fixnum (- register-arg-count)))
+	      (inst addu temp nargs-tn (fixnumize (- register-arg-count)))
 	      (move csp-tn ocfp-tn)))
 	
 	;; Do the single value calse.
@@ -356,7 +356,7 @@ default-value-8
 		
 		(inst blez temp default-lab)
 		(inst lw move-temp ocfp-tn (* i word-bytes))
-		(inst addu temp temp (fixnum -1))
+		(inst addu temp temp (fixnumize -1))
 		(store-stack-tn tn move-temp)))
 	    
 	    (emit-label defaulting-done)
@@ -415,7 +415,7 @@ default-value-8
     (inst addu csp-tn csp-tn 4)
     (storew (first register-arg-tns) csp-tn -1)
     (inst addu start csp-tn -4)
-    (inst li count (fixnum 1))
+    (inst li count (fixnumize 1))
     
     (emit-label done)
     
@@ -792,7 +792,7 @@ default-value-8
 						      ,(ash (incf index)
 							    word-shift)))
 					   register-arg-names)))
-			     '((inst li nargs-pass (fixnum nargs)))))
+			     '((inst li nargs-pass (fixnumize nargs)))))
 		      ,@(if (eq return :tail)
 			    '((:load-ocfp
 			       (sc-case ocfp
@@ -1027,7 +1027,7 @@ default-value-8
 	      (bytes-needed-for-non-descriptor-stack-frame))))
     ;; Establish the values pointer and values count.
     (move val-ptr cfp-tn)
-    (inst li nargs (fixnum nvals))
+    (inst li nargs (fixnumize nvals))
     ;; restore the frame pointer and clear as much of the control
     ;; stack as possible.
     (move cfp-tn ocfp)
@@ -1081,7 +1081,7 @@ default-value-8
 		(bytes-needed-for-non-descriptor-stack-frame))))
 
       ;; Check for the single case.
-      (inst li a0 (fixnum 1))
+      (inst li a0 (fixnumize 1))
       (inst bne nvals-arg a0 not-single)
       (inst lw a0 vals-arg)
 
@@ -1158,14 +1158,14 @@ default-value-8
 	     (inst beq nargs-tn done)
 	     (inst addu csp-tn csp-tn nargs-tn))
 	    (t
-	     (inst addu count nargs-tn (fixnum (- fixed)))
+	     (inst addu count nargs-tn (fixnumize (- fixed)))
 	     (inst blez count done)
 	     (inst nop)
 	     (inst addu csp-tn csp-tn count)))
       (when (< fixed register-arg-count)
 	;; We must stop when we run out of stack args, not when we run out of
 	;; more args.
-	(inst addu count nargs-tn (fixnum (- register-arg-count))))
+	(inst addu count nargs-tn (fixnumize (- register-arg-count))))
       ;; Everything of interest in registers.
       (inst blez count do-regs)
       ;; Initialize dst to be end of stack.
@@ -1176,7 +1176,7 @@ default-value-8
       (emit-label loop)
       ;; *--dst = *--src, --count
       (inst addu src src (- word-bytes))
-      (inst addu count count (fixnum -1))
+      (inst addu count count (fixnumize -1))
       (loadw temp src)
       (inst addu dst dst (- word-bytes))
       (inst bgtz count loop)
@@ -1187,7 +1187,7 @@ default-value-8
 	;; Now we have to deposit any more args that showed up in registers.
 	;; We know there is at least one more arg, otherwise we would have
 	;; branched to done up at the top.
-	(inst subu count nargs-tn (fixnum (1+ fixed)))
+	(inst subu count nargs-tn (fixnumize (1+ fixed)))
 	(do ((i fixed (1+ i)))
 	    ((>= i register-arg-count))
 	  ;; Is this the last one?
@@ -1195,7 +1195,7 @@ default-value-8
 	  ;; Store it relative to the pointer saved at the start.
 	  (storew (nth i register-arg-tns) result (- i fixed))
 	  ;; Decrement count.
-	  (inst subu count (fixnum 1))))
+	  (inst subu count (fixnumize 1))))
       (emit-label done))))
 
 
@@ -1249,7 +1249,7 @@ default-value-8
 	(inst addu context context word-bytes)
 
 	;; Dec count, and if != zero, go back for more.
-	(inst addu count count (fixnum -1))
+	(inst addu count count (fixnumize -1))
 	(inst bne count zero-tn loop)
 
 	;; Store the value in the car (in delay slot)
@@ -1331,7 +1331,7 @@ default-value-8
   (:result-types t tagged-num)
   (:note "more-arg-context")
   (:generator 5
-    (inst addu count supplied (fixnum (- fixed)))
+    (inst addu count supplied (fixnumize (- fixed)))
     (inst subu context csp-tn count)))
 
 
@@ -1353,7 +1353,7 @@ default-value-8
 	     (inst bne nargs zero-tn err-lab)
 	     (inst nop))
 	    (t
-	     (inst li temp (fixnum count))
+	     (inst li temp (fixnumize count))
 	     (inst bne nargs temp err-lab)
 	     (inst nop))))))
 
diff --git a/compiler/mips/move.lisp b/compiler/mips/move.lisp
index 5f3d422bf..a52e316fe 100644
--- a/compiler/mips/move.lisp
+++ b/compiler/mips/move.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/move.lisp,v 1.35 1994/10/31 04:44:16 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/move.lisp,v 1.36 2003/08/03 11:27:48 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -24,7 +24,7 @@
   (let ((val (tn-value x)))
     (etypecase val
       (integer
-       (inst li y (fixnum val)))
+       (inst li y (fixnumize val)))
       (null
        (move y null-tn))
       (symbol
diff --git a/compiler/mips/nlx.lisp b/compiler/mips/nlx.lisp
index 4b9bf8e17..0de38da31 100644
--- a/compiler/mips/nlx.lisp
+++ b/compiler/mips/nlx.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/nlx.lisp,v 1.21 1998/03/04 14:53:27 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/nlx.lisp,v 1.22 2003/08/03 11:27:48 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -249,7 +249,7 @@
 		 (defaults (cons default-lab tn))
 		 
 		 (inst beq count zero-tn default-lab)
-		 (inst addu count count (fixnum -1))
+		 (inst addu count count (fixnumize -1))
 		 (sc-case tn
 			  ((descriptor-reg any-reg)
 			   (loadw tn start i))
@@ -312,7 +312,7 @@
       (loadw temp src)
       (inst addu src src vm:word-bytes)
       (storew temp dst)
-      (inst addu num num (fixnum -1))
+      (inst addu num num (fixnumize -1))
       (inst bne num zero-tn loop)
       (inst addu dst dst vm:word-bytes)
 
diff --git a/compiler/mips/static-fn.lisp b/compiler/mips/static-fn.lisp
index a5ba63c62..6818bd7d7 100644
--- a/compiler/mips/static-fn.lisp
+++ b/compiler/mips/static-fn.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/static-fn.lisp,v 1.21 1994/10/31 04:44:16 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/static-fn.lisp,v 1.22 2003/08/03 11:27:48 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -86,7 +86,7 @@
 	   (let ((lra-label (gen-label))
 		 (cur-nfp (current-nfp-tn vop)))
 	     ,@(moves (temp-names) (arg-names))
-	     (inst li nargs (fixnum ,num-args))
+	     (inst li nargs (fixnumize ,num-args))
 	     (inst lw entry-point null-tn (static-function-offset symbol))
 	     (when cur-nfp
 	       (store-stack-tn nfp-save cur-nfp))
diff --git a/compiler/mips/subprim.lisp b/compiler/mips/subprim.lisp
index 34a1a56b3..82ed06e19 100644
--- a/compiler/mips/subprim.lisp
+++ b/compiler/mips/subprim.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/subprim.lisp,v 1.22 1994/10/31 04:44:16 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/subprim.lisp,v 1.23 2003/08/03 11:27:48 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -47,7 +47,7 @@
     
     (loadw ptr ptr cons-cdr-slot list-pointer-type)
     (inst b loop)
-    (inst addu count count (fixnum 1))
+    (inst addu count count (fixnumize 1))
     
     NOT-LIST
     (cerror-call vop done object-not-list-error ptr)
diff --git a/compiler/mips/values.lisp b/compiler/mips/values.lisp
index 54ee7c36b..d7dd46dcc 100644
--- a/compiler/mips/values.lisp
+++ b/compiler/mips/values.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/values.lisp,v 1.17 1994/10/31 04:44:16 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/values.lisp,v 1.18 2003/08/03 11:27:47 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -58,7 +58,7 @@
 	   (load-stack-tn temp tn)
 	   (storew temp start-temp i)))))
     (move start start-temp)
-    (inst li count (fixnum nvals))))
+    (inst li count (fixnumize nvals))))
 
 
 ;;; Push a list of values on the stack, returning Start and Count as used in
diff --git a/compiler/ppc/alloc.lisp b/compiler/ppc/alloc.lisp
index 76a9ea747..5293de773 100644
--- a/compiler/ppc/alloc.lisp
+++ b/compiler/ppc/alloc.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ppc/alloc.lisp,v 1.1 2001/02/11 14:22:03 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ppc/alloc.lisp,v 1.2 2003/08/03 11:27:47 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -87,7 +87,7 @@
   (:temporary (:scs (non-descriptor-reg) :from (:argument 1)) unboxed)
   (:temporary (:sc non-descriptor-reg :offset nl3-offset) pa-flag)
   (:generator 100
-    (inst addi boxed boxed-arg (fixnum (1+ code-trace-table-offset-slot)))
+    (inst addi boxed boxed-arg (fixnumize (1+ code-trace-table-offset-slot)))
     (inst clrrwi boxed boxed lowtag-bits)
     (inst srwi unboxed unboxed-arg word-shift)
     (inst addi unboxed unboxed lowtag-mask)
diff --git a/compiler/ppc/arith.lisp b/compiler/ppc/arith.lisp
index 8f41e2e69..4a7ad4474 100644
--- a/compiler/ppc/arith.lisp
+++ b/compiler/ppc/arith.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman (FAHLMAN@CMUC). 
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ppc/arith.lisp,v 1.2 2001/02/11 16:43:18 dtc Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ppc/arith.lisp,v 1.3 2003/08/03 11:27:47 gerd Exp $
 ;;;
 ;;;    This file contains the VM definition arithmetic VOPs for the MIPS.
 ;;;
@@ -55,7 +55,7 @@
 (define-vop (fast-lognot/fixnum fixnum-unop)
   (:translate lognot)
   (:generator 2
-    (inst xori res x (fixnum -1))))
+    (inst xori res x (fixnumize -1))))
 
 (define-vop (fast-lognot/signed signed-unop)
   (:translate lognot)
@@ -176,7 +176,7 @@
 		  fast-fixnum-binop-c)
        (:translate ,translate)
        (:generator 1
-	 (inst ,op r x (fixnum y))))
+	 (inst ,op r x (fixnumize y))))
      (define-vop (,(symbolicate 'fast- translate '-c/signed=>signed)
 		  fast-signed-binop-c)
        (:translate ,translate)
@@ -195,7 +195,7 @@
 		  fast-fixnum-logop-c)
        (:translate ,translate)
        (:generator 1
-	 (inst ,op r x (fixnum y))))
+	 (inst ,op r x (fixnumize y))))
      (define-vop (,(symbolicate 'fast- translate '-c/signed=>signed)
 		  fast-signed-logop-c)
        (:translate ,translate)
@@ -355,7 +355,7 @@
       (inst cntlzw shift shift)
       (emit-label nonneg)
       (inst slwi shift shift 2)
-      (inst subfic res  shift (fixnum 32)))))
+      (inst subfic res  shift (fixnumize 32)))))
 
 (define-vop (unsigned-byte-32-count)
   (:translate logcount)
@@ -376,7 +376,7 @@
       (emit-label loop)
       (inst subi temp shift 1)
       (inst and. shift shift temp)
-      (inst addi res res (fixnum 1))
+      (inst addi res res (fixnumize 1))
       (inst bne loop)
 
       (emit-label done))))
@@ -442,7 +442,7 @@
 (define-vop (fast-if-<-c/fixnum fast-conditional-c/fixnum)
   (:translate <)
   (:generator 3
-    (inst cmpwi x (fixnum y))
+    (inst cmpwi x (fixnumize y))
     (inst b? (if not-p :ge :lt) target)))
 
 (define-vop (fast-if-</signed fast-conditional/signed)
@@ -478,7 +478,7 @@
 (define-vop (fast-if->-c/fixnum fast-conditional-c/fixnum)
   (:translate >)
   (:generator 3
-    (inst cmpwi x (fixnum y))
+    (inst cmpwi x (fixnumize y))
     (inst b? (if not-p :le :gt) target)))
 
 (define-vop (fast-if->/signed fast-conditional/signed)
@@ -560,7 +560,7 @@
   (:info target not-p y)
   (:translate eql)
   (:generator 2
-    (inst cmpwi x (fixnum y))
+    (inst cmpwi x (fixnumize y))
     (inst b? (if not-p :ne :eq) target)))
 ;;;
 (define-vop (generic-eql-c/fixnum fast-eql-c/fixnum)
diff --git a/compiler/ppc/array.lisp b/compiler/ppc/array.lisp
index 493cca663..3c7fc5e74 100644
--- a/compiler/ppc/array.lisp
+++ b/compiler/ppc/array.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ppc/array.lisp,v 1.2 2001/02/11 16:43:18 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ppc/array.lisp,v 1.3 2003/08/03 11:27:47 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -36,7 +36,7 @@
       (inst addi ndescr rank (* (1+ array-dimensions-offset) vm:word-bytes))
       (inst clrrwi ndescr ndescr lowtag-bits)
       (inst add alloc-tn alloc-tn ndescr)
-      (inst addi ndescr rank (fixnum (1- vm:array-dimensions-offset)))
+      (inst addi ndescr rank (fixnumize (1- vm:array-dimensions-offset)))
       (inst slwi ndescr ndescr vm:type-bits)
       (inst or ndescr ndescr type)
       (inst srwi ndescr ndescr 2)
diff --git a/compiler/ppc/call.lisp b/compiler/ppc/call.lisp
index dba443d07..cf3e36f56 100644
--- a/compiler/ppc/call.lisp
+++ b/compiler/ppc/call.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ppc/call.lisp,v 1.2 2001/02/11 16:43:18 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ppc/call.lisp,v 1.3 2003/08/03 11:27:47 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -314,7 +314,7 @@ default-value-8
 	(new-assem:without-scheduling ()
 	  (note-this-location vop :unknown-return)
 	  (if (> nvals register-arg-count)
-	      (inst addic. temp nargs-tn (- (fixnum register-arg-count)))
+	      (inst addic. temp nargs-tn (- (fixnumize register-arg-count)))
 	      (move csp-tn ocfp-tn))
 	  (inst b regs-defaulted))
 	
@@ -343,7 +343,7 @@ default-value-8
 		
 		(inst lwz move-temp ocfp-tn (* i vm:word-bytes))
 		(inst ble default-lab)
-		(inst addic. temp temp (- (fixnum 1)))
+		(inst addic. temp temp (- (fixnumize 1)))
 		(store-stack-tn tn move-temp)))
 	    
 	    (emit-label defaulting-done)
@@ -400,7 +400,7 @@ default-value-8
     (inst addi csp-tn csp-tn 4)
     (storew (first register-arg-tns) csp-tn -1)
     (inst subi start csp-tn 4)
-    (inst li count (fixnum 1))
+    (inst li count (fixnumize 1))
     
     (emit-label done)
     
@@ -762,7 +762,7 @@ default-value-8
 					       `(loadw ,name new-fp
 						       ,(incf index)))
 					   register-arg-names)))
-			     '((inst lr nargs-pass (fixnum nargs)))))
+			     '((inst lr nargs-pass (fixnumize nargs)))))
 		      ,@(if (eq return :tail)
 			    '((:load-old-fp
 			       (sc-case old-fp
@@ -974,7 +974,7 @@ default-value-8
 	  (t
 	   ;; Establish the values pointer and values count.
 	   (move val-ptr cfp-tn)
-	   (inst lr nargs (fixnum nvals))
+	   (inst lr nargs (fixnumize nvals))
 	   ;; restore the frame pointer and clear as much of the control
 	   ;; stack as possible.
 	   (move cfp-tn old-fp)
@@ -1019,7 +1019,7 @@ default-value-8
 		   number-stack-displacement))))
 
       ;; Check for the single case.
-      (inst cmpwi nvals-arg (fixnum 1))
+      (inst cmpwi nvals-arg (fixnumize 1))
       (inst lwz a0 vals-arg 0)
       (inst bne not-single)
 
@@ -1088,13 +1088,13 @@ default-value-8
 	     (inst add csp-tn csp-tn nargs-tn)
 	     (inst beq done))
 	    (t
-	     (inst addic. count nargs-tn (- (fixnum fixed)))
+	     (inst addic. count nargs-tn (- (fixnumize fixed)))
 	     (inst ble done)
 	     (inst add csp-tn csp-tn count)))
       (when (< fixed register-arg-count)
 	;; We must stop when we run out of stack args, not when we run out of
 	;; more args.
-	(inst addic. count nargs-tn (- (fixnum register-arg-count)))
+	(inst addic. count nargs-tn (- (fixnumize register-arg-count)))
 	;; Everything of interest is in registers.
 	(inst ble do-regs))
       ;; Initialize dst to be end of stack.
@@ -1105,7 +1105,7 @@ default-value-8
       (emit-label loop)
       ;; *--dst = *--src, --count
       (inst addi src src (- vm:word-bytes))
-      (inst addic. count count (- (fixnum 1)))
+      (inst addic. count count (- (fixnumize 1)))
       (loadw temp src)
       (inst addi dst dst (- vm:word-bytes))
       (storew temp dst)
@@ -1114,12 +1114,12 @@ default-value-8
       (emit-label do-regs)
       (when (< fixed register-arg-count)
 	;; Now we have to deposit any more args that showed up in registers.
-	(inst subic. count nargs-tn (fixnum fixed))
+	(inst subic. count nargs-tn (fixnumize fixed))
 	(do ((i fixed (1+ i)))
 	    ((>= i register-arg-count))
 	  ;; Don't deposit any more than there are.
 	  (inst beq done)
-	  (inst subic. count count (fixnum 1))
+	  (inst subic. count count (fixnumize 1))
 	  ;; Store it relative to the pointer saved at the start.
 	  (storew (nth i register-arg-tns) result (- i fixed))))
       (emit-label done))))
@@ -1177,7 +1177,7 @@ default-value-8
 	(inst addi context context vm:word-bytes)
 
 	;; Dec count, and if != zero, go back for more.
-	(inst addic. count count (- (fixnum 1)))
+	(inst addic. count count (- (fixnumize 1)))
 	;; Store the value into the car of the current cons (in the delay
 	;; slot).
 	(storew temp dst 0 vm:list-pointer-type)
@@ -1210,7 +1210,7 @@ default-value-8
   (:result-types t tagged-num)
   (:note "more-arg-context")
   (:generator 5
-    (inst subi count supplied (fixnum fixed))
+    (inst subi count supplied (fixnumize fixed))
     (inst sub context csp-tn count)))
 
 
@@ -1228,7 +1228,7 @@ default-value-8
   (:generator 3
     (let ((err-lab
 	   (generate-error-code vop invalid-argument-count-error nargs)))
-      (inst cmpwi nargs (fixnum count))
+      (inst cmpwi nargs (fixnumize count))
       (inst bne err-lab))))
 |#
 (define-vop (verify-argument-count)
@@ -1240,7 +1240,7 @@ default-value-8
   (:vop-var vop)
   (:save-p :compute-only)
   (:generator 3
-   (inst twi :ne nargs (fixnum count))))
+   (inst twi :ne nargs (fixnumize count))))
 
 
 ;;; Signal various errors.
diff --git a/compiler/ppc/move.lisp b/compiler/ppc/move.lisp
index 056ae77b0..56920f585 100644
--- a/compiler/ppc/move.lisp
+++ b/compiler/ppc/move.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman (FAHLMAN@CMUC). 
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ppc/move.lisp,v 1.1 2001/02/11 14:22:05 dtc Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ppc/move.lisp,v 1.2 2003/08/03 11:27:47 gerd Exp $
 ;;;
 ;;;    This file contains the SPARC VM definition of operand loading/saving and
 ;;; the Move VOP.
@@ -24,7 +24,7 @@
   (let ((val (tn-value x)))
     (etypecase val
       (integer
-       (inst lr y (fixnum val)))
+       (inst lr y (fixnumize val)))
       (null
        (move y null-tn))
       (symbol
diff --git a/compiler/ppc/nlx.lisp b/compiler/ppc/nlx.lisp
index 40e99ac14..1040fd770 100644
--- a/compiler/ppc/nlx.lisp
+++ b/compiler/ppc/nlx.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman (FAHLMAN@CMUC). 
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ppc/nlx.lisp,v 1.2 2001/02/11 16:43:19 dtc Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ppc/nlx.lisp,v 1.3 2003/08/03 11:27:47 gerd Rel $
 ;;;
 ;;;    This file contains the definitions of VOPs used for non-local exit
 ;;; (throw, lexical exit, etc.)
@@ -197,7 +197,7 @@
 	     (emit-label no-values)))
 	  (t
 	   (collect ((defaults))
-	     (inst addic. count count (- (fixnum 1)))
+	     (inst addic. count count (- (fixnumize 1)))
 	     (do ((i 0 (1+ i))
 		  (tn-ref values (tn-ref-across tn-ref)))
 		 ((null tn-ref))
@@ -205,7 +205,7 @@
 		     (tn (tn-ref-tn tn-ref)))
 		 (defaults (cons default-lab tn))
 		 
-		 (inst subi count count (fixnum 1))
+		 (inst subi count count (fixnumize 1))
 		 (inst blt default-lab)
 		 (sc-case tn
 			  ((descriptor-reg any-reg)
@@ -262,7 +262,7 @@
       ;; Copy stuff down the stack.
       (emit-label loop)
       (inst lwzx temp src num)
-      (inst addi num num (fixnum 1))
+      (inst addi num num (fixnumize 1))
       (inst cmpw num count)
       (inst stwx temp dst num)
       (inst bne loop)
diff --git a/compiler/ppc/static-fn.lisp b/compiler/ppc/static-fn.lisp
index ca0841d4b..2222b013d 100644
--- a/compiler/ppc/static-fn.lisp
+++ b/compiler/ppc/static-fn.lisp
@@ -7,7 +7,7 @@
 ;;; Lisp, please contact Scott Fahlman (Scott.Fahlman@CS.CMU.EDU)
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ppc/static-fn.lisp,v 1.1 2001/02/11 14:22:05 dtc Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ppc/static-fn.lisp,v 1.2 2003/08/03 11:27:47 gerd Exp $
 ;;;
 ;;; This file contains the VOPs and macro magic necessary to call static
 ;;; functions.
@@ -87,7 +87,7 @@
 		 (cur-nfp (current-nfp-tn vop)))
 	     ,@(moves (temp-names) (arg-names))
 	     (inst lwz func null-tn (static-function-offset symbol))
-	     (inst lr nargs (fixnum ,num-args))
+	     (inst lr nargs (fixnumize ,num-args))
 	     (when cur-nfp
 	       (store-stack-tn nfp-save cur-nfp))
 	     (inst mr old-fp cfp-tn)
diff --git a/compiler/ppc/subprim.lisp b/compiler/ppc/subprim.lisp
index 1fa27b910..d11bb2cb6 100644
--- a/compiler/ppc/subprim.lisp
+++ b/compiler/ppc/subprim.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ppc/subprim.lisp,v 1.1 2001/02/11 14:22:05 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ppc/subprim.lisp,v 1.2 2003/08/03 11:27:47 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -48,7 +48,7 @@
       (test-type ptr temp not-list t vm:list-pointer-type)
 
       (loadw ptr ptr vm:cons-cdr-slot vm:list-pointer-type)
-      (inst addi count count (fixnum 1))
+      (inst addi count count (fixnumize 1))
       (test-type ptr temp loop nil vm:list-pointer-type)
 
       (cerror-call vop done object-not-list-error ptr)
diff --git a/compiler/ppc/values.lisp b/compiler/ppc/values.lisp
index 6da1aeea5..d83260bb6 100644
--- a/compiler/ppc/values.lisp
+++ b/compiler/ppc/values.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ppc/values.lisp,v 1.1 2001/02/11 14:22:05 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ppc/values.lisp,v 1.2 2003/08/03 11:27:47 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -53,7 +53,7 @@
 	  (control-stack
 	   (load-stack-tn temp tn)
 	   (storew temp start i)))))
-    (inst lr count (fixnum nvals))))
+    (inst lr count (fixnumize nvals))))
 
 ;;; Push a list of values on the stack, returning Start and Count as used in
 ;;; unknown values continuations.
diff --git a/compiler/rt/alloc.lisp b/compiler/rt/alloc.lisp
index 9a58852c1..637f3b00c 100644
--- a/compiler/rt/alloc.lisp
+++ b/compiler/rt/alloc.lisp
@@ -5,11 +5,11 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/alloc.lisp,v 1.5 1994/10/31 04:45:41 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/alloc.lisp,v 1.6 2003/08/03 11:27:47 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/alloc.lisp,v 1.5 1994/10/31 04:45:41 ram Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/alloc.lisp,v 1.6 2003/08/03 11:27:47 gerd Rel $
 ;;;
 ;;; Allocation VOPs for the IBM RT port.
 ;;;
@@ -98,7 +98,7 @@
   (:temporary (:scs (non-descriptor-reg) :from (:argument 1)) unboxed)
   (:generator 100
     (inst li ndescr (lognot lowtag-mask))
-    (inst cal boxed boxed-arg (fixnum (1+ vm:code-trace-table-offset-slot)))
+    (inst cal boxed boxed-arg (fixnumize (1+ vm:code-trace-table-offset-slot)))
     (inst n boxed ndescr)
     (move unboxed unboxed-arg)
     (inst sr unboxed word-shift)
diff --git a/compiler/rt/arith.lisp b/compiler/rt/arith.lisp
index 7f9c8252c..8e16c2c6e 100644
--- a/compiler/rt/arith.lisp
+++ b/compiler/rt/arith.lisp
@@ -5,11 +5,11 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/arith.lisp,v 1.11 1994/10/31 04:45:41 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/arith.lisp,v 1.12 2003/08/03 11:27:47 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/arith.lisp,v 1.11 1994/10/31 04:45:41 ram Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/arith.lisp,v 1.12 2003/08/03 11:27:47 gerd Rel $
 ;;;
 ;;; This file contains the VM definition arithmetic VOPs for the IBM RT.
 ;;;
@@ -55,7 +55,7 @@
 	      temp)
   (:translate lognot)
   (:generator 2
-    (inst li temp (fixnum -1))
+    (inst li temp (fixnumize -1))
     (inst x temp x)
     (move res temp)))
 
@@ -122,7 +122,7 @@
 	    (move r x)
 	    (inst ,op r y))
 	   (immediate
-	    (let ((value (fixnum (tn-value y))))
+	    (let ((value (fixnumize (tn-value y))))
 	      ,@imm-body)))))
      (define-vop (,(intern (concatenate 'simple-string
 					"FAST-"
@@ -351,7 +351,7 @@
       (inst s temp 1)
       (inst n number temp)
       (inst bncx :eq loop)
-      (inst a res (fixnum 1))
+      (inst a res (fixnumize 1))
       ;; We're done and res already has result.
       (emit-label done))))      
 
@@ -415,7 +415,7 @@
 			(:generator ,cost
 			  (let* ((signed ,signed)
 				 (-c/fixnum ,(eq suffix '-c/fixnum))
-				 (y (if -c/fixnum (fixnum y) y)))
+				 (y (if -c/fixnum (fixnumize y) y)))
 			    ,@generator)))))
 	       '(/fixnum -c/fixnum /signed -c/signed /unsigned -c/unsigned)
 	       ;; All these really take six cycles, but we decrease the -c/...
@@ -474,7 +474,7 @@
   (:info target not-p y)
   (:translate eql)
   (:generator 3
-    (inst c x (fixnum y))
+    (inst c x (fixnumize y))
     (if not-p
 	(inst bnc :eq target)
 	(inst bc :eq target))))
diff --git a/compiler/rt/array.lisp b/compiler/rt/array.lisp
index 19525c3f5..53d75fcf1 100644
--- a/compiler/rt/array.lisp
+++ b/compiler/rt/array.lisp
@@ -5,11 +5,11 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/array.lisp,v 1.11 1994/10/31 04:45:41 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/array.lisp,v 1.12 2003/08/03 11:27:47 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/array.lisp,v 1.11 1994/10/31 04:45:41 ram Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/array.lisp,v 1.12 2003/08/03 11:27:47 gerd Rel $
 ;;;
 ;;; This file contains the IBM RT definitions for array operations.
 ;;;
@@ -47,7 +47,7 @@
       (inst cas alloc rank alloc)
       (inst nilo alloc (logand #xFFFF (lognot vm:lowtag-mask)))
       (store-symbol-value alloc *allocation-pointer*)
-      (inst cal ndescr rank (fixnum (1- vm:array-dimensions-offset)))
+      (inst cal ndescr rank (fixnumize (1- vm:array-dimensions-offset)))
       ;; Shift the fixnum representation of the length, then OR in the fixnum
       ;; rep of the type code, and then shift off the two extra fixnum zeros.
       (inst sl ndescr vm:type-bits)
diff --git a/compiler/rt/call.lisp b/compiler/rt/call.lisp
index 0e6205070..ce697492f 100644
--- a/compiler/rt/call.lisp
+++ b/compiler/rt/call.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/call.lisp,v 1.12 1994/10/31 04:45:41 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/call.lisp,v 1.13 2003/08/03 11:27:47 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -368,7 +368,7 @@ default-value-5
 	    (let ((default-lab (gen-label))
 		  (tn (tn-ref-tn val)))
 	      (defaults (cons default-lab tn))
-	      (inst c nargs-tn (fixnum i))
+	      (inst c nargs-tn (fixnumize i))
 	      (inst bnbx :gt default-lab)
 	      (loadw move-temp ocfp-tn i)
 	      (store-stack-tn move-temp tn)))
@@ -423,7 +423,7 @@ default-value-5
     (inst inc csp-tn vm:word-bytes)
     (storew (first register-arg-tns) csp-tn -1)
     (inst cal start csp-tn -4)
-    (inst li count (fixnum 1))
+    (inst li count (fixnumize 1))
     
     (emit-label done)
     
@@ -754,7 +754,7 @@ default-value-5
 		     (mapcar #'(lambda (name)
 				 `(loadw ,name new-fp ,(incf index)))
 			     register-arg-names)))
-	       `((inst li nargs-pass (fixnum nargs))))
+	       `((inst li nargs-pass (fixnumize nargs))))
  
 
 	 ,@(if named
@@ -901,7 +901,7 @@ default-value-5
 	   (inst bx lip)
 	   (move code-tn return-pc))
 	  (t
-	   (inst li nargs (fixnum nvals))
+	   (inst li nargs (fixnumize nvals))
 	   ;; Clear the number stack.
 	   (let ((cur-nfp (current-nfp-tn vop)))
 	     (when cur-nfp
@@ -957,7 +957,7 @@ default-value-5
 		(component-non-descriptor-stack-usage))))
       
       ;; Single case?
-      (inst c nvals-arg (fixnum 1))
+      (inst c nvals-arg (fixnumize 1))
       (inst bnc :eq not-single)
       
       ;; Return with one value.
@@ -1027,12 +1027,12 @@ default-value-5
   (:generator 20
     (let ((do-more-args (gen-label))
 	  (done-more-args (gen-label)))
-      (inst c nargs-tn (fixnum fixed))
+      (inst c nargs-tn (fixnumize fixed))
       (inst bc :gt do-more-args)
       (assemble (*elsewhere*)
 	(emit-label do-more-args)
 	;; Jump to assembler routine passing fixed at cname-offset.
-	(inst li temp (fixnum fixed))
+	(inst li temp (fixnumize fixed))
 	(inst bala (make-fixup 'really-copy-more-args :assembly-routine))
 	(inst b done-more-args))
       (emit-label done-more-args))))
@@ -1093,7 +1093,7 @@ default-value-5
 	(storew temp dst 0 vm:list-pointer-type)
 
 	;; Dec count, and if != zero, go back for more.
-	(inst s count (fixnum 1))
+	(inst s count (fixnumize 1))
 	(inst bncx :eq loop)
 	(inst inc dst (* 2 vm:word-bytes))
 
@@ -1123,7 +1123,7 @@ default-value-5
    (context :scs (descriptor-reg))
    (count :scs (any-reg)))
   (:generator 5
-    (inst s count supplied (fixnum fixed))
+    (inst s count supplied (fixnumize fixed))
     (move context csp-tn)
     (inst s context count)))
 
@@ -1139,7 +1139,7 @@ default-value-5
   (:generator 3
     (let ((err-lab
 	   (generate-error-code vop invalid-argument-count-error nargs)))
-      (inst c nargs (fixnum count))
+      (inst c nargs (fixnumize count))
       (inst bnc :eq err-lab))))
 
 ;;; Signal an argument count error.
diff --git a/compiler/rt/move.lisp b/compiler/rt/move.lisp
index 0ce77d37f..14b2ea25d 100644
--- a/compiler/rt/move.lisp
+++ b/compiler/rt/move.lisp
@@ -5,11 +5,11 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/move.lisp,v 1.6 1994/10/31 04:45:41 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/move.lisp,v 1.7 2003/08/03 11:27:47 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/move.lisp,v 1.6 1994/10/31 04:45:41 ram Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/move.lisp,v 1.7 2003/08/03 11:27:47 gerd Rel $
 ;;;
 ;;; This file contains the IBM RT VM definition of operand loading/saving and the
 ;;; Move VOP.
@@ -28,7 +28,7 @@
   (let ((val (tn-value x)))
     (etypecase val
       (integer
-       (inst li y (fixnum val)))
+       (inst li y (fixnumize val)))
       (null
        (move y null-tn))
       (symbol
diff --git a/compiler/rt/nlx.lisp b/compiler/rt/nlx.lisp
index 96bcb1f9e..1555f6f65 100644
--- a/compiler/rt/nlx.lisp
+++ b/compiler/rt/nlx.lisp
@@ -5,11 +5,11 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/nlx.lisp,v 1.5 1994/10/31 04:45:41 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/nlx.lisp,v 1.6 2003/08/03 11:27:47 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/nlx.lisp,v 1.5 1994/10/31 04:45:41 ram Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/nlx.lisp,v 1.6 2003/08/03 11:27:47 gerd Rel $
 ;;;
 ;;; This file contains the definitions of VOPs used for non-local exit (throw,
 ;;; lexical exit, etc.)
@@ -224,7 +224,7 @@
 		 (defaults (cons default-lab tn))
 		 
 		 (inst bc :eq default-lab)
-		 (inst s count (fixnum 1))
+		 (inst s count (fixnumize 1))
 		 (sc-case tn
 		   ((descriptor-reg any-reg)
 		    (loadw tn start i))
@@ -285,7 +285,7 @@
       (loadw temp src)
       (inst inc src vm:word-bytes)
       (storew temp dst)
-      (inst s num num (fixnum 1))
+      (inst s num num (fixnumize 1))
       (inst bncx :eq loop)
       (inst inc dst vm:word-bytes)
 
diff --git a/compiler/rt/static-fn.lisp b/compiler/rt/static-fn.lisp
index ea27a9f70..802b0815e 100644
--- a/compiler/rt/static-fn.lisp
+++ b/compiler/rt/static-fn.lisp
@@ -5,11 +5,11 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/static-fn.lisp,v 1.2 1994/10/31 04:45:41 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/static-fn.lisp,v 1.3 2003/08/03 11:27:47 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/static-fn.lisp,v 1.2 1994/10/31 04:45:41 ram Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/static-fn.lisp,v 1.3 2003/08/03 11:27:47 gerd Rel $
 ;;;
 ;;; This file contains the VOPs and macro magic necessary to call static
 ;;; functions.
@@ -89,7 +89,7 @@
 	   (let ((lra-label (gen-label))
 		 (cur-nfp (current-nfp-tn vop)))
 	     ,@(moves (temp-names) (arg-names))
-	     (inst li nargs (fixnum ,num-args))
+	     (inst li nargs (fixnumize ,num-args))
 	     (load-symbol cname symbol)
 	     (loadw lip cname vm:symbol-raw-function-addr-slot
 		    vm:other-pointer-type)
diff --git a/compiler/rt/subprim.lisp b/compiler/rt/subprim.lisp
index 83a0a2a73..1e245165d 100644
--- a/compiler/rt/subprim.lisp
+++ b/compiler/rt/subprim.lisp
@@ -5,11 +5,11 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/subprim.lisp,v 1.2 1994/10/31 04:45:41 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/subprim.lisp,v 1.3 2003/08/03 11:27:46 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/subprim.lisp,v 1.2 1994/10/31 04:45:41 ram Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/subprim.lisp,v 1.3 2003/08/03 11:27:46 gerd Rel $
 ;;;
 ;;; Linkage information for standard static functions, and random vops.
 ;;;
@@ -50,7 +50,7 @@
       (test-type ptr temp not-list t vm:list-pointer-type)
 
       (loadw ptr ptr vm:cons-cdr-slot vm:list-pointer-type)
-      (inst inc count (fixnum 1))
+      (inst inc count (fixnumize 1))
       (test-type ptr temp loop nil vm:list-pointer-type)
 
       (cerror-call vop done object-not-list-error ptr)
diff --git a/compiler/rt/values.lisp b/compiler/rt/values.lisp
index ced96b8a6..1b96ec43b 100644
--- a/compiler/rt/values.lisp
+++ b/compiler/rt/values.lisp
@@ -5,11 +5,11 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/values.lisp,v 1.4 1994/10/31 04:45:41 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/values.lisp,v 1.5 2003/08/03 11:27:46 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/values.lisp,v 1.4 1994/10/31 04:45:41 ram Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/rt/values.lisp,v 1.5 2003/08/03 11:27:46 gerd Rel $
 ;;;
 ;;; This file contains the implementation of unknown-values VOPs.
 ;;;
@@ -63,7 +63,7 @@
 	   (load-stack-tn temp tn)
 	   (storew temp start-temp i)))))
     (move start start-temp)
-    (inst li count (fixnum nvals))))
+    (inst li count (fixnumize nvals))))
 
 
 ;;; VALUES-LIST -- VOP.
diff --git a/compiler/sparc/alloc.lisp b/compiler/sparc/alloc.lisp
index 40dd14cf9..0241a7fb3 100644
--- a/compiler/sparc/alloc.lisp
+++ b/compiler/sparc/alloc.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/alloc.lisp,v 1.13 2002/05/10 14:48:23 toy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/alloc.lisp,v 1.14 2003/08/03 11:27:46 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -83,7 +83,7 @@
   (:temporary (:scs (any-reg) :from (:argument 0)) boxed)
   (:temporary (:scs (non-descriptor-reg) :from (:argument 1)) unboxed)
   (:generator 100
-    (inst add boxed boxed-arg (fixnum (1+ code-trace-table-offset-slot)))
+    (inst add boxed boxed-arg (fixnumize (1+ code-trace-table-offset-slot)))
     (inst and boxed (lognot lowtag-mask))
     (inst srl unboxed unboxed-arg word-shift)
     (inst add unboxed lowtag-mask)
diff --git a/compiler/sparc/arith.lisp b/compiler/sparc/arith.lisp
index 84ffa8578..1ec195ee8 100644
--- a/compiler/sparc/arith.lisp
+++ b/compiler/sparc/arith.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/arith.lisp,v 1.32 2003/03/31 17:48:28 toy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/arith.lisp,v 1.33 2003/08/03 11:27:46 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -56,7 +56,7 @@
 (define-vop (fast-lognot/fixnum fixnum-unop)
   (:translate lognot)
   (:generator 2
-    (inst xor res x (fixnum -1))))
+    (inst xor res x (fixnumize -1))))
 
 (define-vop (fast-lognot/signed signed-unop)
   (:translate lognot)
@@ -132,7 +132,7 @@
 		  fast-fixnum-binop-c)
        (:translate ,translate)
        (:generator 1
-	 (inst ,op r x (fixnum y))))
+	 (inst ,op r x (fixnumize y))))
      (define-vop (,(symbolicate "FAST-" translate "/SIGNED=>SIGNED")
 		  fast-signed-binop)
        (:translate ,translate)
@@ -200,7 +200,7 @@
   (:result-types tagged-num)
   (:note "safe inline fixnum arithmetic")
   (:generator 3
-    (inst taddcctv r x (fixnum y))))
+    (inst taddcctv r x (fixnumize y))))
 
 (define-vop (-/fixnum fast--/fixnum=>fixnum)
   (:policy :safe)
@@ -216,7 +216,7 @@
   (:result-types tagged-num)
   (:note "safe inline fixnum arithmetic")
   (:generator 3
-    (inst tsubcctv r x (fixnum y))))
+    (inst tsubcctv r x (fixnumize y))))
 
 )
 
@@ -677,7 +677,7 @@
       (inst not shift)
 
       (emit-label loop)
-      (inst add res (fixnum 1))
+      (inst add res (fixnumize 1))
       
       (emit-label test)
       (inst cmp shift)
@@ -862,7 +862,7 @@
 			(:translate ,tran)
 			(:generator ,cost
 			  (inst cmp x
-				,(if (eq suffix '-c/fixnum) '(fixnum y) 'y))
+				,(if (eq suffix '-c/fixnum) '(fixnumize y) 'y))
 			  (inst b (if not-p
 				      ,(if signed not-cond not-unsigned)
 				      ,(if signed cond unsigned))
@@ -911,7 +911,7 @@
   (:info target not-p y)
   (:translate eql)
   (:generator 2
-    (inst cmp x (fixnum y))
+    (inst cmp x (fixnumize y))
     (inst b (if not-p :ne :eq) target)
     (inst nop)))
 ;;;
diff --git a/compiler/sparc/array.lisp b/compiler/sparc/array.lisp
index 5023f8525..49cc2140d 100644
--- a/compiler/sparc/array.lisp
+++ b/compiler/sparc/array.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/array.lisp,v 1.27 2003/07/19 15:47:36 emarsden Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/array.lisp,v 1.28 2003/08/03 11:27:46 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -34,7 +34,7 @@
       (inst add ndescr rank (* (1+ array-dimensions-offset) vm:word-bytes))
       (inst andn ndescr 4)
       (allocation header ndescr other-pointer-type)
-      (inst add ndescr rank (fixnum (1- vm:array-dimensions-offset)))
+      (inst add ndescr rank (fixnumize (1- vm:array-dimensions-offset)))
       (inst sll ndescr ndescr vm:type-bits)
       (inst or ndescr ndescr type)
       ;; Remove the extraneous fixnum tag bits because TYPE and RANK
@@ -360,7 +360,7 @@
   (:temporary (:scs (non-descriptor-reg)) temp)
   (:result-types single-float)
   (:generator 3
-    (let ((offset (+ (fixnum index)
+    (let ((offset (+ (fixnumize index)
 		     (- (* vm:vector-data-offset vm:word-bytes)
 			vm:other-pointer-type))))
       (if (typep offset '(signed-byte 13))
@@ -403,7 +403,7 @@
   (:result-types single-float)
   (:temporary (:scs (non-descriptor-reg)) temp)
   (:generator 2
-    (let ((offset (+ (fixnum index)
+    (let ((offset (+ (fixnumize index)
 		     (- (* vm:vector-data-offset vm:word-bytes)
 			vm:other-pointer-type))))
       (if (typep offset '(signed-byte 13))
diff --git a/compiler/sparc/call.lisp b/compiler/sparc/call.lisp
index 70cf8b1ad..68092edd7 100644
--- a/compiler/sparc/call.lisp
+++ b/compiler/sparc/call.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/call.lisp,v 1.30 2002/05/10 14:48:24 toy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/call.lisp,v 1.31 2003/08/03 11:27:46 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -340,7 +340,7 @@ default-value-8
 	  (note-this-location vop :unknown-return)
 	  (inst b regs-defaulted)
 	  (if (> nvals register-arg-count)
-	      (inst subcc temp nargs-tn (fixnum register-arg-count))
+	      (inst subcc temp nargs-tn (fixnumize register-arg-count))
 	      (move csp-tn ocfp-tn)))
 	
 	;; Do the single value calse.
@@ -368,7 +368,7 @@ default-value-8
 		
 		(inst b :le default-lab)
 		(inst ld move-temp ocfp-tn (* i vm:word-bytes))
-		(inst subcc temp (fixnum 1))
+		(inst subcc temp (fixnumize 1))
 		(store-stack-tn tn move-temp)))
 	    
 	    (emit-label defaulting-done)
@@ -425,7 +425,7 @@ default-value-8
     (inst add csp-tn 4)
     (storew (first register-arg-tns) csp-tn -1)
     (inst sub start csp-tn 4)
-    (inst li count (fixnum 1))
+    (inst li count (fixnumize 1))
     
     (emit-label done)
     
@@ -791,7 +791,7 @@ default-value-8
 					       `(loadw ,name new-fp
 						       ,(incf index)))
 					   register-arg-names)))
-			     '((inst li nargs-pass (fixnum nargs)))))
+			     '((inst li nargs-pass (fixnumize nargs)))))
 		      ,@(if (eq return :tail)
 			    '((:load-old-fp
 			       (sc-case old-fp
@@ -1002,7 +1002,7 @@ default-value-8
 	  (t
 	   ;; Establish the values pointer and values count.
 	   (move val-ptr cfp-tn)
-	   (inst li nargs (fixnum nvals))
+	   (inst li nargs (fixnumize nvals))
 	   ;; restore the frame pointer and clear as much of the control
 	   ;; stack as possible.
 	   (move cfp-tn old-fp)
@@ -1048,7 +1048,7 @@ default-value-8
 		   number-stack-displacement))))
 
       ;; Check for the single case.
-      (inst cmp nvals-arg (fixnum 1))
+      (inst cmp nvals-arg (fixnumize 1))
       (inst b :ne not-single)
       (inst ld a0 vals-arg)
 
@@ -1118,14 +1118,14 @@ default-value-8
 	     (inst b :eq done)
 	     (inst add csp-tn csp-tn nargs-tn))
 	    (t
-	     (inst subcc count nargs-tn (fixnum fixed))
+	     (inst subcc count nargs-tn (fixnumize fixed))
 	     (inst b :le done)
 	     (inst nop)
 	     (inst add csp-tn csp-tn count)))
       (when (< fixed register-arg-count)
 	;; We must stop when we run out of stack args, not when we run out of
 	;; more args.
-	(inst subcc count nargs-tn (fixnum register-arg-count))
+	(inst subcc count nargs-tn (fixnumize register-arg-count))
 	;; Everything of interest in registers.
 	(inst b :le do-regs))
       ;; Initialize dst to be end of stack.
@@ -1136,7 +1136,7 @@ default-value-8
       (emit-label loop)
       ;; *--dst = *--src, --count
       (inst add src src (- vm:word-bytes))
-      (inst subcc count count (fixnum 1))
+      (inst subcc count count (fixnumize 1))
       (loadw temp src)
       (inst add dst dst (- vm:word-bytes))
       (inst b :gt loop)
@@ -1145,12 +1145,12 @@ default-value-8
       (emit-label do-regs)
       (when (< fixed register-arg-count)
 	;; Now we have to deposit any more args that showed up in registers.
-	(inst subcc count nargs-tn (fixnum fixed))
+	(inst subcc count nargs-tn (fixnumize fixed))
 	(do ((i fixed (1+ i)))
 	    ((>= i register-arg-count))
 	  ;; Don't deposit any more than there are.
 	  (inst b :eq done)
-	  (inst subcc count (fixnum 1))
+	  (inst subcc count (fixnumize 1))
 	  ;; Store it relative to the pointer saved at the start.
 	  (storew (nth i register-arg-tns) result (- i fixed))))
       (emit-label done))))
@@ -1206,7 +1206,7 @@ default-value-8
 	(inst add context context vm:word-bytes)
 
 	;; Dec count, and if != zero, go back for more.
-	(inst subcc count (fixnum 1))
+	(inst subcc count (fixnumize 1))
 	(inst b :gt loop)
 
 	;; Store the value into the car of the current cons (in the delay
@@ -1239,7 +1239,7 @@ default-value-8
   (:result-types t tagged-num)
   (:note "more-arg-context")
   (:generator 5
-    (inst sub count supplied (fixnum fixed))
+    (inst sub count supplied (fixnumize fixed))
     (inst sub context csp-tn count)))
 
 
@@ -1256,7 +1256,7 @@ default-value-8
   (:generator 3
     (let ((err-lab
 	   (generate-error-code vop invalid-argument-count-error nargs)))
-      (inst cmp nargs (fixnum count))
+      (inst cmp nargs (fixnumize count))
       ;; Assume we don't take the branch
       (inst b :ne err-lab #+sparc-v9 :pn)
       (inst nop))))
diff --git a/compiler/sparc/move.lisp b/compiler/sparc/move.lisp
index 140b99236..d86a0c872 100644
--- a/compiler/sparc/move.lisp
+++ b/compiler/sparc/move.lisp
@@ -5,11 +5,11 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/move.lisp,v 1.10 2002/09/12 15:57:59 toy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/move.lisp,v 1.11 2003/08/03 11:27:46 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/move.lisp,v 1.10 2002/09/12 15:57:59 toy Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/move.lisp,v 1.11 2003/08/03 11:27:46 gerd Exp $
 ;;;
 ;;;    This file contains the SPARC VM definition of operand loading/saving and
 ;;; the Move VOP.
@@ -26,7 +26,7 @@
   (let ((val (tn-value x)))
     (etypecase val
       (integer
-       (inst li y (fixnum val)))
+       (inst li y (fixnumize val)))
       (null
        (move y null-tn))
       (symbol
diff --git a/compiler/sparc/nlx.lisp b/compiler/sparc/nlx.lisp
index f05372084..97e4159c1 100644
--- a/compiler/sparc/nlx.lisp
+++ b/compiler/sparc/nlx.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/nlx.lisp,v 1.11 2002/02/19 15:46:09 toy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/nlx.lisp,v 1.12 2003/08/03 11:27:46 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -214,7 +214,7 @@
 	     (emit-label no-values)))
 	  (t
 	   (collect ((defaults))
-	     (inst subcc count (fixnum 1))
+	     (inst subcc count (fixnumize 1))
 	     (do ((i 0 (1+ i))
 		  (tn-ref values (tn-ref-across tn-ref)))
 		 ((null tn-ref))
@@ -223,7 +223,7 @@
 		 (defaults (cons default-lab tn))
 		 
 		 (inst b :lt default-lab)
-		 (inst subcc count (fixnum 1))
+		 (inst subcc count (fixnumize 1))
 		 (sc-case tn
 			  ((descriptor-reg any-reg)
 			   (loadw tn start i))
@@ -279,7 +279,7 @@
       ;; Copy stuff down the stack.
       (emit-label loop)
       (inst ld temp src num)
-      (inst add num (fixnum 1))
+      (inst add num (fixnumize 1))
       (inst cmp num count)
       (inst b :ne loop)
       (inst st temp dst num)
diff --git a/compiler/sparc/static-fn.lisp b/compiler/sparc/static-fn.lisp
index 746d791db..c97a054c4 100644
--- a/compiler/sparc/static-fn.lisp
+++ b/compiler/sparc/static-fn.lisp
@@ -5,11 +5,11 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/static-fn.lisp,v 1.5 1994/10/31 04:46:41 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/static-fn.lisp,v 1.6 2003/08/03 11:27:46 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/static-fn.lisp,v 1.5 1994/10/31 04:46:41 ram Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/static-fn.lisp,v 1.6 2003/08/03 11:27:46 gerd Exp $
 ;;;
 ;;; This file contains the VOPs and macro magic necessary to call static
 ;;; functions.
@@ -89,7 +89,7 @@
 		 (cur-nfp (current-nfp-tn vop)))
 	     ,@(moves (temp-names) (arg-names))
 	     (inst ld func null-tn (static-function-offset symbol))
-	     (inst li nargs (fixnum ,num-args))
+	     (inst li nargs (fixnumize ,num-args))
 	     (when cur-nfp
 	       (store-stack-tn nfp-save cur-nfp))
 	     (inst move old-fp cfp-tn)
diff --git a/compiler/sparc/subprim.lisp b/compiler/sparc/subprim.lisp
index 1db1ef1fa..875e7c275 100644
--- a/compiler/sparc/subprim.lisp
+++ b/compiler/sparc/subprim.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/subprim.lisp,v 1.3 1994/10/31 04:46:41 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/subprim.lisp,v 1.4 2003/08/03 11:27:46 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -47,7 +47,7 @@
       (test-type ptr temp not-list t vm:list-pointer-type)
 
       (loadw ptr ptr vm:cons-cdr-slot vm:list-pointer-type)
-      (inst add count count (fixnum 1))
+      (inst add count count (fixnumize 1))
       (test-type ptr temp loop nil vm:list-pointer-type)
 
       (cerror-call vop done object-not-list-error ptr)
diff --git a/compiler/sparc/values.lisp b/compiler/sparc/values.lisp
index 0fc6e8df4..4904f0787 100644
--- a/compiler/sparc/values.lisp
+++ b/compiler/sparc/values.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/values.lisp,v 1.5 1994/10/31 04:46:41 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/values.lisp,v 1.6 2003/08/03 11:27:46 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -51,7 +51,7 @@
 	  (control-stack
 	   (load-stack-tn temp tn)
 	   (storew temp start i)))))
-    (inst li count (fixnum nvals))))
+    (inst li count (fixnumize nvals))))
 
 ;;; Push a list of values on the stack, returning Start and Count as used in
 ;;; unknown values continuations.
diff --git a/compiler/x86/alloc.lisp b/compiler/x86/alloc.lisp
index ce977406e..fe09a71d7 100644
--- a/compiler/x86/alloc.lisp
+++ b/compiler/x86/alloc.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
- "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/alloc.lisp,v 1.8 2002/08/27 22:18:28 moore Exp $")
+ "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/alloc.lisp,v 1.9 2003/08/03 11:27:46 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -89,7 +89,7 @@
   (:temporary (:sc unsigned-reg :from (:argument 1)) unboxed)
   (:generator 100
     (move boxed boxed-arg)
-    (inst add boxed (fixnum (1+ code-trace-table-offset-slot)))
+    (inst add boxed (fixnumize (1+ code-trace-table-offset-slot)))
     (inst and boxed (lognot lowtag-mask))
     (move unboxed unboxed-arg)
     (inst shr unboxed word-shift)
@@ -120,7 +120,7 @@
   (:node-var node)
   (:generator 100
     (move boxed boxed-arg)
-    (inst add boxed (fixnum (1+ code-trace-table-offset-slot)))
+    (inst add boxed (fixnumize (1+ code-trace-table-offset-slot)))
     (inst and boxed (lognot lowtag-mask))
     (move unboxed unboxed-arg)
     (inst shr unboxed word-shift)
diff --git a/compiler/x86/arith.lisp b/compiler/x86/arith.lisp
index 266602e10..e5eceebba 100644
--- a/compiler/x86/arith.lisp
+++ b/compiler/x86/arith.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
- "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/arith.lisp,v 1.14 2001/11/03 22:27:01 pw Exp $")
+ "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/arith.lisp,v 1.15 2003/08/03 11:27:45 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -61,7 +61,7 @@
   (:translate lognot)
   (:generator 2
     (move res x)
-    (inst xor res (fixnum -1))))
+    (inst xor res (fixnumize -1))))
 
 (define-vop (fast-lognot/signed signed-unop)
   (:translate lognot)
@@ -166,7 +166,7 @@
        (:translate ,translate)
        (:generator 1
 	 (move r x)
-	 (inst ,op r (fixnum y))))
+	 (inst ,op r (fixnumize y))))
      (define-vop (,(symbolicate "FAST-" translate "/SIGNED=>SIGNED")
 		  fast-signed-binop)
        (:translate ,translate)
@@ -240,10 +240,10 @@
   (:note "inline fixnum arithmetic")
   (:generator 1
     (cond ((and (sc-is x any-reg) (sc-is r any-reg) (not (location= x r)))
-	   (inst lea r (make-ea :dword :base x :disp (fixnum y))))
+	   (inst lea r (make-ea :dword :base x :disp (fixnumize y))))
 	  (t
 	   (move r x)
-	   (inst add r (fixnum y))))))
+	   (inst add r (fixnumize y))))))
 
 (define-vop (fast-+/signed=>signed fast-safe-arith-op)
   (:translate +)
@@ -481,7 +481,7 @@
   (:generator 30
     (move eax x)
     (inst cdq)
-    (inst mov y-arg (fixnum y))
+    (inst mov y-arg (fixnumize y))
     (inst idiv eax y-arg)
     (if (location= quo eax)
 	(inst shl eax 2)
@@ -951,7 +951,7 @@
 	       (:translate ,tran)
 	       (:generator ,cost
 		 (inst cmp x
-		       ,(if (eq suffix '-c/fixnum) '(fixnum y) 'y))
+		       ,(if (eq suffix '-c/fixnum) '(fixnumize y) 'y))
 		 (inst jmp (if not-p
 			       ,(if signed not-cond not-unsigned)
 			     ,(if signed cond unsigned))
@@ -1033,7 +1033,7 @@
     (cond ((and (sc-is x any-reg descriptor-reg) (zerop y))
 	   (inst test x x))  ; Smaller instruction
 	  (t
-	   (inst cmp x (fixnum y))))
+	   (inst cmp x (fixnumize y))))
     (inst jmp (if not-p :ne :e) target)))
 ;;;
 (define-vop (generic-eql-c/fixnum fast-eql-c/fixnum)
diff --git a/compiler/x86/array.lisp b/compiler/x86/array.lisp
index 160943352..c2ae130c5 100644
--- a/compiler/x86/array.lisp
+++ b/compiler/x86/array.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
- "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/array.lisp,v 1.17 1999/03/08 00:57:32 dtc Exp $")
+ "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/array.lisp,v 1.18 2003/08/03 11:27:45 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -41,7 +41,7 @@
 			    lowtag-mask)))
     (inst and bytes (lognot lowtag-mask))
     (inst lea header (make-ea :dword :base rank
-			      :disp (fixnum (1- array-dimensions-offset))))
+			      :disp (fixnumize (1- array-dimensions-offset))))
     (inst shl header type-bits)
     (inst or  header type)
     (inst shr header 2)
@@ -101,7 +101,7 @@
   (:generator 5
     (let ((error (generate-error-code vop invalid-array-index-error
 				      array bound index))
-	  (index (if (sc-is index immediate) (fixnum (tn-value index)) index)))
+	  (index (if (sc-is index immediate) (fixnumize (tn-value index)) index)))
       (inst cmp bound index)
       ;; We use below-or-equal even though it's an unsigned test, because
       ;; negative indexes appear as real large unsigned numbers.  Therefore,
diff --git a/compiler/x86/call.lisp b/compiler/x86/call.lisp
index af8720457..e99a9ea6e 100644
--- a/compiler/x86/call.lisp
+++ b/compiler/x86/call.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
- "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/call.lisp,v 1.17 2002/08/01 13:06:06 toy Exp $")
+ "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/call.lisp,v 1.18 2003/08/03 11:27:45 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -350,7 +350,7 @@
 		(tn (tn-ref-tn val)))
 	    (defaults (cons default-lab tn))
 
-	    (inst cmp ecx-tn (fixnum i))
+	    (inst cmp ecx-tn (fixnumize i))
 	    (inst jmp :be default-lab)
 	    (loadw edx-tn ebx-tn (- (1+ i)))
 	    (inst mov tn edx-tn)))
@@ -407,13 +407,13 @@
       (storew edi-tn ebx-tn (- (1+ 1)))
       ;; Compute the number of stack arguments, and if it's zero or less,
       ;; don't copy any stack arguments.
-      (inst sub ecx-tn (fixnum register-arg-count))
+      (inst sub ecx-tn (fixnumize register-arg-count))
       (inst jmp :le no-stack-args)
 
       ;; Throw away any unwanted args.
-      (inst cmp ecx-tn (fixnum (- nvals register-arg-count)))
+      (inst cmp ecx-tn (fixnumize (- nvals register-arg-count)))
       (inst jmp :be count-okay)
-      (inst mov ecx-tn (fixnum (- nvals register-arg-count)))
+      (inst mov ecx-tn (fixnumize (- nvals register-arg-count)))
       (emit-label count-okay)
       ;; Save the number of stack values.
       (inst mov eax-tn ecx-tn)
@@ -434,7 +434,7 @@
       ;; Restore ESI.
       (loadw esi-tn ebx-tn (- (1+ 2)))
       ;; Now we have to default the remaining args.  Find out how many.
-      (inst sub eax-tn (fixnum (- nvals register-arg-count)))
+      (inst sub eax-tn (fixnumize (- nvals register-arg-count)))
       (inst neg eax-tn)
       ;; If none, then just blow out of here.
       (inst jmp :le restore-edi)
@@ -483,7 +483,7 @@
     
     (inst mov start esp-tn)
     (inst push (first register-arg-tns))
-    (inst mov count (fixnum 1))
+    (inst mov count (fixnumize 1))
     (inst jmp done)
 
     (emit-label variable-values)
@@ -912,7 +912,7 @@
 		    (noise))
 	   '((if (zerop nargs)
 		 (inst xor ecx ecx)
-	       (inst mov ecx (fixnum nargs)))))
+	       (inst mov ecx (fixnumize nargs)))))
      ,@(cond ((eq return :tail)
 	      '(;; Python has figured out what frame we should return
 		;; to so might as well use that clue. This seems
@@ -953,7 +953,7 @@
 		;; there are at least 3 slots. This hack just adds 3
 		;; more.
 		,(if variable
-		     '(inst sub esp-tn (fixnum 3)))
+		     '(inst sub esp-tn (fixnumize 3)))
 
 		;; Save the fp
 		(storew ebp-tn new-fp (- (1+ ocfp-save-offset)))
@@ -1089,7 +1089,7 @@
     (move ebx ebp-tn)
     (if (zerop nvals)
 	(inst xor ecx ecx) ; smaller
-      (inst mov ecx (fixnum nvals)))
+      (inst mov ecx (fixnumize nvals)))
     ;; restore the frame pointer.
     (move ebp-tn old-fp)
     ;; clear as much of the stack as possible, but not past the return
@@ -1153,7 +1153,7 @@
     (unless (policy node (> space speed))
       ;; Check for the single case.
       (let ((not-single (gen-label)))
-	(inst cmp nvals (fixnum 1))
+	(inst cmp nvals (fixnumize 1))
 	(inst jmp :ne not-single)
 	
 	;; Return with one value.
@@ -1226,14 +1226,14 @@
     (cond ((zerop fixed)
 	   (inst jecxz just-alloc-frame))
 	  (t
-	   (inst cmp ecx-tn (fixnum fixed))
+	   (inst cmp ecx-tn (fixnumize fixed))
 	   (inst jmp :be just-alloc-frame)))
     
     ;; Allocate the space on the stack.
     ;; stack = ebp - (max 3 frame-size) - (nargs - fixed)
     (inst lea ebx-tn
 	  (make-ea :dword :base ebp-tn
-		   :disp (- (fixnum fixed)
+		   :disp (- (fixnumize fixed)
 			    (* vm:word-bytes
 			       (max 3 (sb-allocated-size 'stack))))))
     (inst sub ebx-tn ecx-tn)  ; Got the new stack in ebx
@@ -1248,12 +1248,12 @@
 	   ;; We must stop when we run out of stack args, not when we
 	   ;; run out of more args.
 	   ;; Number to copy = nargs-3
-	   (inst sub ecx-tn (fixnum register-arg-count))
+	   (inst sub ecx-tn (fixnumize register-arg-count))
 	   ;; Everything of interest in registers.
 	   (inst jmp :be do-regs))
 	  (t
 	   ;; Number to copy = nargs-fixed
-	   (inst sub ecx-tn (fixnum fixed))))
+	   (inst sub ecx-tn (fixnumize fixed))))
     
     ;; Save edi and esi register args.
     (inst push edi-tn)
@@ -1304,7 +1304,7 @@
 	      ;; Don't deposit any more than there are.
 	      (if (zerop i)
 		  (inst test ecx-tn ecx-tn)
-		(inst cmp ecx-tn (fixnum i)))
+		(inst cmp ecx-tn (fixnumize i)))
 	      (inst jmp :eq done)))
 
     (inst jmp done)
@@ -1425,9 +1425,9 @@
     ;; Point to the first more-arg, not above it.
     (inst lea context (make-ea :dword :base esp-tn
 			       :index count :scale 1
-			       :disp (- (+ (fixnum fixed) 4))))
+			       :disp (- (+ (fixnumize fixed) 4))))
     (unless (zerop fixed)
-      (inst sub count (fixnum fixed)))))
+      (inst sub count (fixnumize fixed)))))
 
 ;;; Signal wrong argument count error if Nargs isn't = to Count.
 ;;;
@@ -1444,7 +1444,7 @@
 	   (generate-error-code vop invalid-argument-count-error nargs)))
       (if (zerop count)
 	  (inst test nargs nargs)  ; smaller instruction
-	(inst cmp nargs (fixnum count)))
+	(inst cmp nargs (fixnumize count)))
       (inst jmp :ne err-lab))))
 
 ;;; Various other error signallers.
diff --git a/compiler/x86/cell.lisp b/compiler/x86/cell.lisp
index 140f21f9f..1be1b6472 100644
--- a/compiler/x86/cell.lisp
+++ b/compiler/x86/cell.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
- "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/cell.lisp,v 1.12 2000/08/20 14:44:23 dtc Exp $")
+ "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/cell.lisp,v 1.13 2003/08/03 11:27:45 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -48,7 +48,7 @@
 	       (inst mov
 		     (make-ea :dword :base object
 			      :disp (- (* offset word-bytes) lowtag))
-		     (fixnum val)))
+		     (fixnumize val)))
 	      (symbol
 	       (inst mov
 		     (make-ea :dword :base object
diff --git a/compiler/x86/macros.lisp b/compiler/x86/macros.lisp
index fcfa3d06f..7a8042d63 100644
--- a/compiler/x86/macros.lisp
+++ b/compiler/x86/macros.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
- "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/macros.lisp,v 1.16 2002/08/27 22:18:28 moore Exp $")
+ "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/macros.lisp,v 1.17 2003/08/03 11:27:45 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -346,7 +346,7 @@
 					   'lisp::*pseudo-atomic-atomic*)
 					  (ash symbol-value-slot word-shift)
 					  (- other-pointer-type)))
-	      (fixnum 1)))
+	      (fixnumize 1)))
       ,@forms
       (when *enable-pseudo-atomic*
 	(inst mov (make-ea :byte :disp (+ nil-value
diff --git a/compiler/x86/memory.lisp b/compiler/x86/memory.lisp
index 2a8d9649b..9f3a6e49d 100644
--- a/compiler/x86/memory.lisp
+++ b/compiler/x86/memory.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
- "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/memory.lisp,v 1.8 2000/08/20 14:44:23 dtc Exp $")
+ "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/memory.lisp,v 1.9 2003/08/03 11:27:45 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -138,7 +138,7 @@
 	      (inst mov
 		    (make-ea :dword :base object
 			     :disp (- (* (+ base offset) word-bytes) lowtag))
-		    (fixnum val)))
+		    (fixnumize val)))
 	     (symbol
 	      (inst mov
 		    (make-ea :dword :base object
diff --git a/compiler/x86/move.lisp b/compiler/x86/move.lisp
index 15196c38d..02142c53e 100644
--- a/compiler/x86/move.lisp
+++ b/compiler/x86/move.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
- "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/move.lisp,v 1.7 1998/02/19 19:34:59 dtc Exp $")
+ "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/move.lisp,v 1.8 2003/08/03 11:27:45 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -29,7 +29,7 @@
       (integer
        (if (zerop val)
 	   (inst xor y y)
-	 (inst mov y (fixnum val))))
+	 (inst mov y (fixnumize val))))
       (symbol
        (load-symbol y val))
       (character
@@ -89,7 +89,7 @@
 	    (integer
 	     (if (and (zerop val) (sc-is y any-reg descriptor-reg))
 		 (inst xor y y)
-	       (inst mov y (fixnum val))))
+	       (inst mov y (fixnumize val))))
 	    (symbol
 	     (inst mov y (+ nil-value (static-symbol-offset val))))
 	    (character
@@ -130,7 +130,7 @@
 	      (integer
 	       (if (zerop val)
 		   (inst xor y y)
-		 (inst mov y (fixnum val))))
+		 (inst mov y (fixnumize val))))
 	      (symbol
 	       (load-symbol y val))
 	      (character
@@ -144,7 +144,7 @@
 		 ;; C-call
 		 (etypecase val
 	           (integer
-		    (storew (fixnum val) fp (tn-offset y)))
+		    (storew (fixnumize val) fp (tn-offset y)))
 		   (symbol
 		    (storew (+ nil-value (static-symbol-offset val))
 			    fp (tn-offset y)))
@@ -155,7 +155,7 @@
 	       ;; Lisp stack
 	       (etypecase val
 		 (integer
-		  (storew (fixnum val) fp (- (1+ (tn-offset y)))))
+		  (storew (fixnumize val) fp (- (1+ (tn-offset y)))))
 		 (symbol
 		  (storew (+ nil-value (static-symbol-offset val))
 			  fp (- (1+ (tn-offset y)))))
diff --git a/compiler/x86/nlx.lisp b/compiler/x86/nlx.lisp
index 48c54c5d8..a9e3df240 100644
--- a/compiler/x86/nlx.lisp
+++ b/compiler/x86/nlx.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
- "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/nlx.lisp,v 1.14 2001/11/29 16:45:35 pmai Exp $")
+ "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/nlx.lisp,v 1.15 2003/08/03 11:27:45 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -192,7 +192,7 @@
 		     (tn (tn-ref-tn tn-ref)))
 		 (defaults (cons default-lab tn))
 		 
-		 (inst cmp count (fixnum i))
+		 (inst cmp count (fixnumize i))
 		 (inst jmp :le default-lab)
 		 (sc-case tn
 		   ((descriptor-reg any-reg)
diff --git a/compiler/x86/pred.lisp b/compiler/x86/pred.lisp
index 910c4c160..540ed9b64 100644
--- a/compiler/x86/pred.lisp
+++ b/compiler/x86/pred.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
- "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/pred.lisp,v 1.3 1997/11/18 10:53:24 dtc Exp $")
+ "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/pred.lisp,v 1.4 2003/08/03 11:27:45 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -55,7 +55,7 @@
 	  (integer
 	   (if (and (zerop val) (sc-is x any-reg descriptor-reg))
 	       (inst test x x) ; smaller
-	     (inst cmp x (fixnum val))))
+	     (inst cmp x (fixnumize val))))
 	  (symbol
 	   (inst cmp x (+ nil-value (static-symbol-offset val))))
 	  (character
@@ -68,7 +68,7 @@
 	  (integer
 	   (if (and (zerop val) (sc-is y any-reg descriptor-reg))
 	       (inst test y y) ; smaller
-	     (inst cmp y (fixnum val))))
+	     (inst cmp y (fixnumize val))))
 	  (symbol
 	   (inst cmp y (+ nil-value (static-symbol-offset val))))
 	  (character
diff --git a/compiler/x86/static-fn.lisp b/compiler/x86/static-fn.lisp
index 0a76fe804..885b413e8 100644
--- a/compiler/x86/static-fn.lisp
+++ b/compiler/x86/static-fn.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
- "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/static-fn.lisp,v 1.5 1998/06/16 18:20:45 pw Exp $")
+ "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/static-fn.lisp,v 1.6 2003/08/03 11:27:45 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -96,18 +96,18 @@
 		(inst push ebp-tn)
 		;; Ensure that at least three slots are available; one
 		;; above, two more needed.
-		(inst sub esp-tn (fixnum 2))
+		(inst sub esp-tn (fixnumize 2))
 		(inst mov ebp-tn ebx))
 	       (t
-		(inst enter (fixnum 2))
+		(inst enter (fixnumize 2))
 		;; The enter instruction pushes EBP and then copies
 		;; ESP into EBP.  We want the new EBP to be the
 		;; original ESP, so we fix it up afterwards.
-		(inst add ebp-tn (fixnum 1))))
+		(inst add ebp-tn (fixnumize 1))))
 	 
 	 ,(if (zerop num-args)
 	      '(inst xor ecx ecx)
-	      `(inst mov ecx (fixnum ,num-args)))
+	      `(inst mov ecx (fixnumize ,num-args)))
 	 
 	 (note-this-location vop :call-site)
 	 ;; Static-function-offset gives the offset from the start of
diff --git a/compiler/x86/subprim.lisp b/compiler/x86/subprim.lisp
index 4c56cf0e0..e3be604f3 100644
--- a/compiler/x86/subprim.lisp
+++ b/compiler/x86/subprim.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
- "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/subprim.lisp,v 1.4 1998/05/13 04:01:12 dtc Exp $")
+ "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/subprim.lisp,v 1.5 2003/08/03 11:27:45 gerd Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -46,7 +46,7 @@
     LOOP
     ;; Get the CDR and boost the count.
     (loadw ptr ptr cons-cdr-slot list-pointer-type)
-    (inst add count (fixnum 1))
+    (inst add count (fixnumize 1))
     ;; If we hit NIL, then we are done.
     (inst cmp ptr nil-value)
     (inst jmp :e done)
@@ -82,7 +82,7 @@
     ;; Indirect the next cons cell, and boost the count.
     LOOP
     (loadw ptr ptr cons-cdr-slot list-pointer-type)
-    (inst add count (fixnum 1))
+    (inst add count (fixnumize 1))
     ;; If we arn't done, go back for more.
     (inst cmp ptr nil-value)
     (inst jmp :ne loop)
diff --git a/compiler/x86/values.lisp b/compiler/x86/values.lisp
index bf19cab39..e2e287513 100644
--- a/compiler/x86/values.lisp
+++ b/compiler/x86/values.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
- "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/values.lisp,v 1.4 1998/02/19 19:35:10 dtc Exp $")
+ "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/values.lisp,v 1.5 2003/08/03 11:27:45 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -45,7 +45,7 @@
 	((null val))
       (inst push (tn-ref-tn val)))
     (move start temp)
-    (inst mov count (fixnum nvals))))
+    (inst mov count (fixnumize nvals))))
 
 ;;; Push a list of values on the stack, returning Start and Count as used in
 ;;; unknown values continuations.
diff --git a/general-info/release-19a.txt b/general-info/release-19a.txt
index f58ad7622..114a2ba9b 100644
--- a/general-info/release-19a.txt
+++ b/general-info/release-19a.txt
@@ -135,6 +135,7 @@ New in this release:
        are now equivalent to (X &REST Y).
      - LAST, BUTLAST, NBUTLAST accepting bignum counts.
      - WITH-OUTPUT-TO-STRING accepting :ELEMENT-TYPE.
+     - FIXNUM no longer naming a function.
 
   * Numerous bugfixes:
      - NSET-EXCLUSIVE-OR returns the same results as SET-EXCLUSIVE-OR
-- 
GitLab