- (when (and offset (or firstp (not (zerop offset))))
- (unless (or firstp (minusp offset))
- (write-char #\+ stream))
- (cond
- (rip-p
- (princ offset stream)
- (let ((addr (+ offset (sb!disassem:dstate-next-addr dstate))))
- (or (nth-value 1
- (sb!disassem::note-code-constant-absolute
- addr dstate))
- (sb!disassem:maybe-note-assembler-routine addr
- nil
- dstate))))
- (firstp
- (progn
- (sb!disassem:princ16 offset stream)
- (or (minusp offset)
- (nth-value 1
- (sb!disassem::note-code-constant-absolute offset dstate))
- (sb!disassem:maybe-note-assembler-routine offset
- nil
- dstate))))
+ (when (and offset (or firstp (not (zerop offset))))
+ (unless (or firstp (minusp offset))
+ (write-char #\+ stream))
+ (cond
+ (rip-p
+ (princ offset stream)
+ (let ((addr (+ offset (sb!disassem:dstate-next-addr dstate))))
+ (when (plusp addr)
+ (or (nth-value 1
+ (sb!disassem::note-code-constant-absolute
+ addr dstate))
+ (sb!disassem:maybe-note-assembler-routine addr
+ nil
+ dstate)))))
+ (firstp
+ (progn
+ (sb!disassem:princ16 offset stream)
+ (or (minusp offset)
+ (nth-value 1
+ (sb!disassem::note-code-constant-absolute offset dstate))
+ (sb!disassem:maybe-note-assembler-routine offset
+ nil
+ dstate))))