X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fdebug-int.lisp;h=fb1af04595d4cfd2a4f4168e9fd29d1ab48fb358;hb=a8161e77843ee18a99ec30dd57f796264dfac05a;hp=db17f755f50f806b2210027a273dcd1a4c276d86;hpb=aca45f35fc54bc29e2c79397e3538ff27f6e0db9;p=sbcl.git

diff --git a/src/code/debug-int.lisp b/src/code/debug-int.lisp
index db17f75..fb1af04 100644
--- a/src/code/debug-int.lisp
+++ b/src/code/debug-int.lisp
@@ -624,11 +624,11 @@
                                (format t
 				       "debug: both still valid ~S ~S ~S ~S~%"
                                        lisp-ocfp lisp-ra c-ocfp c-ra))
-		      #+freebsd
+		      #!+freebsd
 		      (if (sap> lisp-ocfp c-ocfp)
                         (values lisp-ra lisp-ocfp)
 			(values c-ra c-ocfp))
-                       #-freebsd
+                       #!-freebsd
                        (values lisp-ra lisp-ocfp))
 		     (lisp-path-fp
 		      ;; The lisp convention is looking good.
@@ -1513,19 +1513,18 @@
 		       (list successors))
 	      (dotimes (k (ldb sb!c::compiled-debug-block-nsucc-byte
 			       succ-and-flags))
-		(push (sb!c::read-var-integer blocks i) successors))
+		(push (sb!c:read-var-integer blocks i) successors))
 	      (let* ((locations
-		      (dotimes (k (sb!c::read-var-integer blocks i)
+		      (dotimes (k (sb!c:read-var-integer blocks i)
 				  (result locations-buffer))
 			(let ((kind (svref sb!c::*compiled-code-location-kinds*
 					   (aref+ blocks i)))
 			      (pc (+ last-pc
-				     (sb!c::read-var-integer blocks i)))
+				     (sb!c:read-var-integer blocks i)))
 			      (tlf-offset (or tlf-number
-					      (sb!c::read-var-integer blocks
-								      i)))
-			      (form-number (sb!c::read-var-integer blocks i))
-			      (live-set (sb!c::read-packed-bit-vector
+					      (sb!c:read-var-integer blocks i)))
+			      (form-number (sb!c:read-var-integer blocks i))
+			      (live-set (sb!c:read-packed-bit-vector
 					 live-set-len blocks i)))
 			  (vector-push-extend (make-known-code-location
 					       pc debug-fun tlf-offset
@@ -2051,7 +2050,7 @@
             (sb!vm:context-float-register
              escaped (sb!c:sc-offset-offset sc-offset) 'double-float)
             (sb!vm:context-float-register
-             escaped (+ (sb!c:sc-offset-offset sc-offset) #!+sparc 2 #-sparc 1)
+             escaped (+ (sb!c:sc-offset-offset sc-offset) #!+sparc 2 #!-sparc 1)
              'double-float))
            :invalid-value-for-unescaped-register-storage))
       #!+long-float
@@ -2861,7 +2860,7 @@
     (do ((frame frame (frame-down frame)))
 	((not frame) nil)
       (when (and (compiled-frame-p frame)
-                 (#-x86 eq #+x86 sap=
+                 (#!-x86 eq #!+x86 sap=
 		  lra
 		  (get-context-value frame lra-save-offset lra-sc-offset)))
 	(return t)))))
@@ -3139,9 +3138,9 @@
       (breakpoint-do-displaced-inst signal-context
 				    (breakpoint-data-instruction data))
       ;; Some platforms have no usable sigreturn() call.  If your
-      ;; implementation of arch_do_displaced_inst() doesn't sigreturn(),
-      ;; add it to this list.
-      #!-(or hpux irix x86 alpha)
+      ;; implementation of arch_do_displaced_inst() _does_ sigreturn(),
+      ;; it's polite to warn here
+      #!+(and sparc solaris)
       (error "BREAKPOINT-DO-DISPLACED-INST returned?"))))
 
 (defun invoke-breakpoint-hooks (breakpoints component offset)