From db6ba6852b8f6d6cf965c1363fc3e3e4b581589c Mon Sep 17 00:00:00 2001 From: Douglas Katzman Date: Tue, 17 Feb 2015 11:33:49 -0500 Subject: [PATCH] Fix print-object on sb!fasl::descriptor --- src/compiler/generic/genesis.lisp | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/src/compiler/generic/genesis.lisp b/src/compiler/generic/genesis.lisp index cb234ea13..6cc189068 100644 --- a/src/compiler/generic/genesis.lisp +++ b/src/compiler/generic/genesis.lisp @@ -290,16 +290,7 @@ (let ((lowtag (descriptor-lowtag des))) (print-unreadable-object (des stream :type t) (cond ((is-fixnum-lowtag lowtag) - (let ((unsigned (logior (ash (descriptor-high des) - (1+ (- descriptor-low-bits - sb!vm:n-lowtag-bits))) - (ash (descriptor-low des) - (- 1 sb!vm:n-lowtag-bits))))) - (format stream - "for fixnum: ~W" - (if (> unsigned #x1FFFFFFF) - (- unsigned #x40000000) - unsigned)))) + (format stream "for fixnum: ~W" (descriptor-fixnum des))) ((is-other-immediate-lowtag lowtag) (format stream "for other immediate: #X~X, type #b~8,'0B" @@ -307,10 +298,9 @@ (logand (descriptor-low des) sb!vm:widetag-mask))) (t (format stream - "for pointer: #X~X, lowtag #b~3,'0B, ~A" - (logior (ash (descriptor-high des) descriptor-low-bits) - (logandc2 (descriptor-low des) sb!vm:lowtag-mask)) - lowtag + "for pointer: #X~X, lowtag #b~v,'0B, ~A" + (logandc2 (descriptor-bits des) sb!vm:lowtag-mask) + sb!vm:n-lowtag-bits lowtag (let ((gspace (descriptor-gspace des))) (if gspace (gspace-name gspace) -- 2.11.4.GIT