Be more aggressive about substituting primitives for references.

diff --git a/v7/src/sf/gconst.scm b/v7/src/sf/gconst.scm
index 165536aa534f760b985c08f0e98ca43ddbdb0e7d..67394d8e3592aa7fdad59c6daf1d06025422f019 100644 (file)
--- a/v7/src/sf/gconst.scm
+++ b/v7/src/sf/gconst.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: gconst.scm,v 4.41 2008/02/13 23:30:18 cph Exp $
+$Id: gconst.scm,v 4.42 2008/09/16 07:10:45 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -49,14 +49,36 @@ USA.
     (%RECORD-REF %RECORD-REF)
     (%RECORD-SET! %RECORD-SET!)
     (%RECORD? %RECORD?)
+    (BIT-STRING->UNSIGNED-INTEGER BIT-STRING->UNSIGNED-INTEGER)
+    (BIT-STRING-ALLOCATE BIT-STRING-ALLOCATE)
+    (BIT-STRING-AND! BIT-STRING-AND!)
+    (BIT-STRING-ANDC! BIT-STRING-ANDC!)
+    (BIT-STRING-CLEAR! BIT-STRING-CLEAR!)
+    (BIT-STRING-FILL! BIT-STRING-FILL!)
     (BIT-STRING-LENGTH BIT-STRING-LENGTH)
+    (BIT-STRING-MOVE! BIT-STRING-MOVE!)
+    (BIT-STRING-MOVEC! BIT-STRING-MOVEC!)
+    (BIT-STRING-OR! BIT-STRING-OR!)
+    (BIT-STRING-REF BIT-STRING-REF)
+    (BIT-STRING-SET! BIT-STRING-SET!)
+    (BIT-STRING-XOR! BIT-STRING-XOR!)
+    (BIT-STRING-ZERO? BIT-STRING-ZERO?)
+    (BIT-STRING=? BIT-STRING=?)
     (BIT-STRING? BIT-STRING?)
+    (BIT-SUBSTRING-FIND-NEXT-SET-BIT BIT-SUBSTRING-FIND-NEXT-SET-BIT)
+    (BIT-SUBSTRING-MOVE-RIGHT! BIT-SUBSTRING-MOVE-RIGHT!)
     (CAR CAR)
     (CDR CDR)
+    (CELL-CONTENTS CELL-CONTENTS)
+    (CELL? CELL?)
     (CHAR->INTEGER CHAR->INTEGER)
     (CHAR? CHAR?)
+    (COMPILED-CODE-ADDRESS->BLOCK COMPILED-CODE-ADDRESS->BLOCK)
+    (COMPILED-CODE-ADDRESS->OFFSET COMPILED-CODE-ADDRESS->OFFSET)
     (CONS CONS)
     (EQ? EQ?)
+    (ERROR-PROCEDURE ERROR-PROCEDURE)
+    (EXACT-INTEGER? INTEGER?)
     (FALSE? NOT)
     (FIX:* MULTIPLY-FIXNUM)
     (FIX:+ PLUS-FIXNUM)
@@ -68,6 +90,7 @@ USA.
     (FIX:> GREATER-THAN-FIXNUM?)
     (FIX:AND FIXNUM-AND)
     (FIX:ANDC FIXNUM-ANDC)
+    (FIX:DIVIDE DIVIDE-FIXNUM)
     (FIX:FIXNUM? FIXNUM?)
     (FIX:GCD GCD-FIXNUM)
     (FIX:LSH FIXNUM-LSH)
@@ -93,25 +116,32 @@ USA.
     (FLO:ATAN FLONUM-ATAN)
     (FLO:ATAN2 FLONUM-ATAN2)
     (FLO:CEILING FLONUM-CEILING)
+    (FLO:CEILING->EXACT FLONUM-CEILING->EXACT)
     (FLO:COS FLONUM-COS)
     (FLO:EXP FLONUM-EXP)
+    (FLO:EXPT FLONUM-EXPT)
     (FLO:FLONUM? FLONUM?)
     (FLO:FLOOR FLONUM-FLOOR)
+    (FLO:FLOOR->EXACT FLONUM-FLOOR->EXACT)
     (FLO:LOG FLONUM-LOG)
     (FLO:NEGATE FLONUM-NEGATE)
     (FLO:NEGATIVE? FLONUM-NEGATIVE?)
     (FLO:POSITIVE? FLONUM-POSITIVE?)
     (FLO:ROUND FLONUM-ROUND)
+    (FLO:ROUND->EXACT FLONUM-ROUND->EXACT)
     (FLO:SIN FLONUM-SIN)
     (FLO:SQRT FLONUM-SQRT)
     (FLO:TAN FLONUM-TAN)
     (FLO:TRUNCATE FLONUM-TRUNCATE)
+    (FLO:TRUNCATE->EXACT FLONUM-TRUNCATE->EXACT)
     (FLO:VECTOR-CONS FLOATING-VECTOR-CONS)
     (FLO:VECTOR-LENGTH FLOATING-VECTOR-LENGTH)
     (FLO:VECTOR-REF FLOATING-VECTOR-REF)
     (FLO:VECTOR-SET! FLOATING-VECTOR-SET!)
     (FLO:ZERO? FLONUM-ZERO?)
+    (GET-FIXED-OBJECTS-VECTOR GET-FIXED-OBJECTS-VECTOR)
     (GET-INTERRUPT-ENABLES GET-INTERRUPT-ENABLES)
+    (HUNK3-CONS HUNK3-CONS)
     (INDEX-FIXNUM? INDEX-FIXNUM?)
     (INT:* INTEGER-MULTIPLY)
     (INT:+ INTEGER-ADD)
@@ -121,20 +151,41 @@ USA.
     (INT:< INTEGER-LESS?)
     (INT:= INTEGER-EQUAL?)
     (INT:> INTEGER-GREATER?)
+    (INT:DIVIDE INTEGER-DIVIDE)
+    (INT:INTEGER? INTEGER?)
+    (INT:NEGATE INTEGER-NEGATE)
     (INT:NEGATIVE? INTEGER-NEGATIVE?)
     (INT:POSITIVE? INTEGER-POSITIVE?)
     (INT:QUOTIENT INTEGER-QUOTIENT)
     (INT:REMAINDER INTEGER-REMAINDER)
     (INT:ZERO? INTEGER-ZERO?)
     (INTEGER->CHAR INTEGER->CHAR)
+    (LEXICAL-ASSIGNMENT LEXICAL-ASSIGNMENT)
+    (LEXICAL-REFERENCE LEXICAL-REFERENCE)
+    (LEXICAL-UNASSIGNED? LEXICAL-UNASSIGNED?)
+    (LEXICAL-UNBOUND? LEXICAL-UNBOUND?)
+    (LEXICAL-UNREFERENCEABLE? LEXICAL-UNREFERENCEABLE?)
+    (LOCAL-ASSIGNMENT LOCAL-ASSIGNMENT)
+    (MAKE-BIT-STRING MAKE-BIT-STRING)
+    (MAKE-CELL MAKE-CELL)
+    (MAKE-NON-POINTER-OBJECT MAKE-NON-POINTER-OBJECT)
     (NOT NOT)
     (NULL? NULL?)
+    (OBJECT-DATUM OBJECT-DATUM)
+    (OBJECT-NEW-TYPE OBJECT-SET-TYPE)
     (OBJECT-TYPE OBJECT-TYPE)
     (OBJECT-TYPE? OBJECT-TYPE?)
     (PAIR? PAIR?)
+    (PRIMITIVE-PROCEDURE-ARITY PRIMITIVE-PROCEDURE-ARITY)
+    (PRIMITIVE-PROCEDURE-DOCUMENTATION PRIMITIVE-PROCEDURE-DOCUMENTATION)
+    (READ-BITS! READ-BITS!)
     (SET-CAR! SET-CAR!)
     (SET-CDR! SET-CDR!)
+    (SET-CELL-CONTENTS! SET-CELL-CONTENTS!)
+    (SET-INTERRUPT-ENABLES! SET-INTERRUPT-ENABLES!)
     (SET-STRING-LENGTH! SET-STRING-LENGTH!)
+    (STACK-ADDRESS-OFFSET STACK-ADDRESS-OFFSET)
+    (STRING->CHAR-SYNTAX STRING->SYNTAX-ENTRY)
     (STRING-ALLOCATE STRING-ALLOCATE)
     (STRING-LENGTH STRING-LENGTH)
     (STRING-REF STRING-REF)
@@ -143,14 +194,30 @@ USA.
     (SYSTEM-HUNK3-CXR0 SYSTEM-HUNK3-CXR0)
     (SYSTEM-HUNK3-CXR1 SYSTEM-HUNK3-CXR1)
     (SYSTEM-HUNK3-CXR2 SYSTEM-HUNK3-CXR2)
+    (SYSTEM-HUNK3-SET-CXR0! SYSTEM-HUNK3-SET-CXR0!)
+    (SYSTEM-HUNK3-SET-CXR1! SYSTEM-HUNK3-SET-CXR1!)
+    (SYSTEM-HUNK3-SET-CXR2! SYSTEM-HUNK3-SET-CXR2!)
+    (SYSTEM-LIST->VECTOR SYSTEM-LIST-TO-VECTOR)
     (SYSTEM-PAIR-CAR SYSTEM-PAIR-CAR)
     (SYSTEM-PAIR-CDR SYSTEM-PAIR-CDR)
     (SYSTEM-PAIR-CONS SYSTEM-PAIR-CONS)
+    (SYSTEM-PAIR-SET-CAR! SYSTEM-PAIR-SET-CAR!)
+    (SYSTEM-PAIR-SET-CDR! SYSTEM-PAIR-SET-CDR!)
+    (SYSTEM-PAIR? SYSTEM-PAIR?)
+    (SYSTEM-SUBVECTOR->LIST SYSTEM-SUBVECTOR-TO-LIST)
+    (SYSTEM-VECTOR-LENGTH SYSTEM-VECTOR-SIZE)
     (SYSTEM-VECTOR-REF SYSTEM-VECTOR-REF)
+    (SYSTEM-VECTOR-SET! SYSTEM-VECTOR-SET!)
+    (SYSTEM-VECTOR? SYSTEM-VECTOR?)
+    (UNSIGNED-INTEGER->BIT-STRING UNSIGNED-INTEGER->BIT-STRING)
     (VECTOR VECTOR)
     (VECTOR-8B-REF VECTOR-8B-REF)
     (VECTOR-8B-SET! VECTOR-8B-SET!)
     (VECTOR-LENGTH VECTOR-LENGTH)
     (VECTOR-REF VECTOR-REF)
     (VECTOR-SET! VECTOR-SET!)
-    (VECTOR? VECTOR?)))
\ No newline at end of file
+    (VECTOR? VECTOR?)
+    (WITH-HISTORY-DISABLED WITH-HISTORY-DISABLED)
+    (WITH-INTERRUPT-MASK WITH-INTERRUPT-MASK)
+    (WRITE-BITS! WRITE-BITS!)
+    (X-CLOSE-ALL-DISPLAYS X-CLOSE-ALL-DISPLAYS)))
\ No newline at end of file