projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix "unable to read" compiler-error reporting during SBCL build
[sbcl.git]
/
src
/
compiler
/
ppc
/
type-vops.lisp
diff --git
a/src/compiler/ppc/type-vops.lisp
b/src/compiler/ppc/type-vops.lisp
index
2780264
..
712d4de
100644
(file)
--- a/
src/compiler/ppc/type-vops.lisp
+++ b/
src/compiler/ppc/type-vops.lisp
@@
-144,7
+144,7
@@
((lowtag-mask) type-codes)))
(move result value))
`((let ((err-lab
((lowtag-mask) type-codes)))
(move result value))
`((let ((err-lab
- (generate-error-code vop ,error-code value)))
+ (generate-error-code vop ',error-code value)))
(test-type value err-lab t (,@type-codes) :temp temp)
(move result value))))))))
,@(when ptype
(test-type value err-lab t (,@type-codes) :temp temp)
(move result value))))))))
,@(when ptype
@@
-164,7
+164,7
@@
(if not-p
(values not-target target)
(values target not-target))
(if not-p
(values not-target target)
(values target not-target))
- (inst andi. temp value #x3)
+ (inst andi. temp value fixnum-tag-mask)
(inst beq yep)
(test-type value nope t (other-pointer-lowtag) :temp temp)
(loadw temp value 0 other-pointer-lowtag)
(inst beq yep)
(test-type value nope t (other-pointer-lowtag) :temp temp)
(loadw temp value 0 other-pointer-lowtag)
@@
-175,9
+175,9
@@
(define-vop (check-signed-byte-32 check-type)
(:generator 45
(define-vop (check-signed-byte-32 check-type)
(:generator 45
- (let ((nope (generate-error-code vop object-not-signed-byte-32-error value))
+ (let ((nope (generate-error-code vop 'object-not-signed-byte-32-error value))
(yep (gen-label)))
(yep (gen-label)))
- (inst andi. temp value #x3)
+ (inst andi. temp value fixnum-tag-mask)
(inst beq yep)
(test-type value nope t (other-pointer-lowtag) :temp temp)
(loadw temp value 0 other-pointer-lowtag)
(inst beq yep)
(test-type value nope t (other-pointer-lowtag) :temp temp)
(loadw temp value 0 other-pointer-lowtag)
@@
-203,7
+203,7
@@
(values not-target target)
(values target not-target))
;; Is it a fixnum?
(values not-target target)
(values target not-target))
;; Is it a fixnum?
- (inst andi. temp value #x3)
+ (inst andi. temp value fixnum-tag-mask)
(inst cmpwi :cr1 value 0)
(inst beq fixnum)
(inst cmpwi :cr1 value 0)
(inst beq fixnum)
@@
-239,12
+239,12
@@
(define-vop (check-unsigned-byte-32 check-type)
(:generator 45
(let ((nope
(define-vop (check-unsigned-byte-32 check-type)
(:generator 45
(let ((nope
- (generate-error-code vop object-not-unsigned-byte-32-error value))
+ (generate-error-code vop 'object-not-unsigned-byte-32-error value))
(yep (gen-label))
(fixnum (gen-label))
(single-word (gen-label)))
;; Is it a fixnum?
(yep (gen-label))
(fixnum (gen-label))
(single-word (gen-label)))
;; Is it a fixnum?
- (inst andi. temp value #x3)
+ (inst andi. temp value fixnum-tag-mask)
(inst cmpwi :cr1 value 0)
(inst beq fixnum)
(inst cmpwi :cr1 value 0)
(inst beq fixnum)
@@
-299,7
+299,7
@@
(define-vop (check-symbol check-type)
(:generator 12
(let ((drop-thru (gen-label))
(define-vop (check-symbol check-type)
(:generator 12
(let ((drop-thru (gen-label))
- (error (generate-error-code vop object-not-symbol-error value)))
+ (error (generate-error-code vop 'object-not-symbol-error value)))
(inst cmpw value null-tn)
(inst beq drop-thru)
(test-type value error t (symbol-header-widetag) :temp temp)
(inst cmpw value null-tn)
(inst beq drop-thru)
(test-type value error t (symbol-header-widetag) :temp temp)
@@
-318,7
+318,7
@@
(define-vop (check-cons check-type)
(:generator 8
(define-vop (check-cons check-type)
(:generator 8
- (let ((error (generate-error-code vop object-not-cons-error value)))
+ (let ((error (generate-error-code vop 'object-not-cons-error value)))
(inst cmpw value null-tn)
(inst beq error)
(test-type value error t (list-pointer-lowtag) :temp temp)
(inst cmpw value null-tn)
(inst beq error)
(test-type value error t (list-pointer-lowtag) :temp temp)