master: - debugging code
stassats via Sbcl-commits <[email protected]>
| Newsgroups | gmane.lisp.steel-bank.cvs |
|---|---|
| Message-ID | <[email protected]> |
The branch "master" has been updated in SBCL:
via 8d53b4ca6ee9f46419231eb2485dcdab3b4fa979 (commit)
from c8639b1234d1dec758c7a4a641545a087472bc87 (commit)
- Log -----------------------------------------------------------------
commit 8d53b4ca6ee9f46419231eb2485dcdab3b4fa979
Author: Stas Boukarev <[email protected]>
Date: Sat Aug 29 10:06:15 2026 +0300
- debugging code
---
src/code/debug-int.lisp | 26 +++++++++++++-------------
src/code/debug-var-io.lisp | 4 ----
2 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/src/code/debug-int.lisp b/src/code/debug-int.lisp
index 87ee1c951..b1dd1cbcb 100644
--- a/src/code/debug-int.lisp
+++ b/src/code/debug-int.lisp
@@ -1530,7 +1530,7 @@
tag-and-info)
result))
(var-or-deleted (index-or-deleted)
- (if (eq index-or-deleted 'sb-c::deleted)
+ (if (eq index-or-deleted 'sb-c::%deleted)
:deleted
(svref vars index-or-deleted))))
(loop
@@ -1538,24 +1538,24 @@
do
(let ((ele (aref args i)))
(cond
- ((eq ele 'sb-c::optional-args)
+ ((eq ele 'sb-c::%optional)
(setf optionalp t))
- ((eq ele 'sb-c::rest-arg)
+ ((eq ele 'sb-c::%rest)
(push-var '(:rest) 1))
;; The next two args are the &MORE arg context and
;; count.
- ((eq ele 'sb-c::more-arg)
+ ((eq ele 'sb-c::%more)
(push-var '(:more) 2))
;; SUPPLIED-P var immediately following keyword or
;; optional. Stick the extra var in the result element
;; representing the keyword or optional, which is the
;; previous one.
- ((eq ele 'sb-c::supplied-p)
+ ((eq ele 'sb-c::%supplied-p)
(push-var (pop result) 1))
;; The keyword of a keyword parameter. Store it so the next
;; element can be used to form a (:keyword KEYWORD VALUE)
;; entry.
- ((typep ele '(and symbol (not (eql sb-c::deleted))))
+ ((typep ele '(and symbol (not (eql sb-c::%deleted))))
(setf keyword ele))
;; The previous element was the keyword of a keyword
;; parameter and is stored in KEYWORD. The current element
@@ -1569,7 +1569,7 @@
(optionalp
(push-var (list :optional (var-or-deleted ele))))
;; Deleted required, optional or keyword argument.
- ((eq ele 'sb-c::deleted)
+ ((eq ele 'sb-c::%deleted)
(push-var :deleted))
;; Required arg at beginning of args array.
(t
@@ -1583,7 +1583,7 @@
(simple-vector vars))
(let ((ele (aref args i)))
(cond ((typep ele 'index) (svref vars ele))
- ((eq ele 'sb-c::deleted) :deleted)
+ ((eq ele 'sb-c::%deleted) :deleted)
(t (error "malformed arguments description")))))
(defun compiled-debug-fun-debug-info (debug-fun)
@@ -1885,15 +1885,15 @@
(let ((arg (sb-c::read-var-integerf map i)))
(case arg
(#.sb-c::packed-debug-fun-arg-deleted
- (vector-push-extend 'sb-c::deleted buffer))
+ (vector-push-extend 'sb-c::%deleted buffer))
(#.sb-c::packed-debug-fun-arg-supplied-p
- (vector-push-extend 'sb-c::supplied-p buffer))
+ (vector-push-extend 'sb-c::%supplied-p buffer))
(#.sb-c::packed-debug-fun-arg-optional
- (vector-push-extend 'sb-c::optional buffer))
+ (vector-push-extend 'sb-c::%optional buffer))
(#.sb-c::packed-debug-fun-arg-rest
- (vector-push-extend 'sb-c::rest buffer))
+ (vector-push-extend 'sb-c::%rest buffer))
(#.sb-c::packed-debug-fun-arg-more
- (vector-push-extend 'sb-c::more buffer))
+ (vector-push-extend 'sb-c::%more buffer))
(#.sb-c::packed-debug-fun-key-arg-keyword
(vector-push-extend (intern (sb-c::read-var-string map i)
*keyword-package*)
diff --git a/src/code/debug-var-io.lisp b/src/code/debug-var-io.lisp
index 2888b4e6a..d07112f5a 100644
--- a/src/code/debug-var-io.lisp
+++ b/src/code/debug-var-io.lisp
@@ -97,14 +97,10 @@
;;; Write STRING into VEC (adjustable, with fill-pointer) represented
;;; as the length (in a var-length integer) followed by the codes of
;;; the characters.
-(defvar *int* (make-hash-table))
(defun write-var-string (string vec)
(declare (simple-string string))
(let ((len (length string)))
(write-var-integer len vec)
- (when (equalp string "SB-C")
- (break))
- (incf (gethash string *int* 0))
(dotimes (i len)
(write-var-integer (char-code (schar string i)) vec)))
(values))
-----------------------------------------------------------------------
hooks/post-receive
--
SBCL