Changeset 12845 for branches/generic-class-file/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

Timestamp:

08/01/10 21:16:48 (13 years ago)

Author:

ehuelsmann

Message:

Continued integration of CLASS-NAME: use it for
+lisp-fixnum+ and +lisp-bignum+.

File:

• branches/generic-class-file/abcl/src/org/armedbear/lisp/compiler-pass2.lisp (modified) (9 diffs)

branches/generic-class-file/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

@@ -215 +215 @@
 (defconstant +lisp-object-array+ "[Lorg/armedbear/lisp/LispObject;")
 (defconstant +closure-binding-array+ "[Lorg/armedbear/lisp/ClosureBinding;")
-(defconstant +lisp-fixnum-class+ "org/armedbear/lisp/Fixnum")
-(defconstant +lisp-fixnum+ "Lorg/armedbear/lisp/Fixnum;")
 (defconstant +lisp-fixnum-array+ "[Lorg/armedbear/lisp/Fixnum;")
-(defconstant +lisp-bignum-class+ "org/armedbear/lisp/Bignum")
-(defconstant +lisp-bignum+ "Lorg/armedbear/lisp/Bignum;")
 (defconstant +lisp-single-float-class+ "org/armedbear/lisp/SingleFloat")
 (defconstant +lisp-single-float+ "Lorg/armedbear/lisp/SingleFloat;")
@@ -767 +763 @@
                             (CONS       +lisp-cons+)
                             (HASH-TABLE +lisp-hash-table+)
-                            (FIXNUM     +lisp-fixnum-class+)
+                            (FIXNUM     +lisp-fixnum+)
                             (STREAM     +lisp-stream+)
                             (STRING     +lisp-abstract-string+)
@@ -918 +914 @@
   (declare (optimize speed))
   (cond ((= *safety* 3)
-         (emit-invokestatic +lisp-fixnum-class+ "getValue"
+         (emit-invokestatic +lisp-fixnum+ "getValue"
                             (lisp-object-arg-types 1) "I"))
         (t
-         (emit 'checkcast +lisp-fixnum-class+)
-         (emit 'getfield +lisp-fixnum-class+ "value" "I"))))
+         (emit 'checkcast +lisp-fixnum+)
+         (emit 'getfield +lisp-fixnum+ "value" "I"))))
 
 (defknown emit-unbox-long () t)
 (defun emit-unbox-long ()
-  (emit-invokestatic +lisp-bignum-class+ "longValue"
+  (emit-invokestatic +lisp-bignum+ "longValue"
                      (lisp-object-arg-types 1) "J"))
 
@@ -957 +953 @@
          (cond ((and (fixnum-type-p derived-type)
                      (< *safety* 3))
-                (emit 'checkcast +lisp-fixnum-class+)
-                (emit 'getfield +lisp-fixnum-class+ "value" "I"))
+                (emit 'checkcast +lisp-fixnum+)
+                (emit 'getfield +lisp-fixnum+ "value" "I"))
                (t
                 (emit-invokevirtual +lisp-object+ "intValue" nil "I"))))
@@ -2043 +2039 @@
   "Generates code to restore a serialized integer."
   (cond((<= 0 n 255)
-        (emit-getstatic +lisp-fixnum-class+ "constants" +lisp-fixnum-array+)
+        (emit-getstatic +lisp-fixnum+ "constants" +lisp-fixnum-array+)
         (emit-push-constant-int n)
         (emit 'aaload))
        ((<= most-negative-fixnum n most-positive-fixnum)
         (emit-push-constant-int n)
-        (emit-invokestatic +lisp-fixnum-class+ "getInstance"
+        (emit-invokestatic +lisp-fixnum+ "getInstance"
                            '("I") +lisp-fixnum+))
        ((<= most-negative-java-long n most-positive-java-long)
         (emit-push-constant-long n)
-        (emit-invokestatic +lisp-bignum-class+ "getInstance"
+        (emit-invokestatic +lisp-bignum+ "getInstance"
                            '("J") +lisp-integer+))
        (t
@@ -2059 +2055 @@
           (emit 'ldc (pool-string s))
           (emit-push-constant-int 10)
-          (emit-invokestatic +lisp-bignum-class+ "getInstance"
+          (emit-invokestatic +lisp-bignum+ "getInstance"
                              (list +java-string+ "I") +lisp-integer+)))))
 
@@ -3385 +3381 @@
 
 (defun p2-test-fixnump (form)
-  (p2-test-instanceof-predicate form +lisp-fixnum-class+))
+  (p2-test-instanceof-predicate form +lisp-fixnum+))
 
 (defun p2-test-stringp (form)
@@ -4608 +4604 @@
 
 (defun p2-fixnump (form target representation)
-  (p2-instanceof-predicate form target representation +lisp-fixnum-class+))
+  (p2-instanceof-predicate form target representation +lisp-fixnum+))
 
 (defun p2-packagep (form target representation)
@@ -7436 +7432 @@
                             (CONS       +lisp-cons+)
                             (HASH-TABLE +lisp-hash-table+)
-                            (FIXNUM     +lisp-fixnum-class+)
+                            (FIXNUM     +lisp-fixnum+)
           (STREAM     +lisp-stream+)
                             (STRING     +lisp-abstract-string+)