X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fdebug-var-io.lisp;h=eac1df33029128c0d13a6bb99d272652360ad563;hb=cee8ef591040db9a79cdd19297867672a9529051;hp=08ce07d3ad6bc5dc5d031bcaf959b56f4276b893;hpb=4898ef32c639b1c7f4ee13a5ba566ce6debd03e6;p=sbcl.git

diff --git a/src/code/debug-var-io.lisp b/src/code/debug-var-io.lisp
index 08ce07d..eac1df3 100644
--- a/src/code/debug-var-io.lisp
+++ b/src/code/debug-var-io.lisp
@@ -21,28 +21,29 @@
 
 ;;; Given a byte vector VEC and an index variable INDEX, read a
 ;;; variable length integer and advance index.
-;;;
-;;; FIXME: This is called O(20) times. It should be reimplemented
-;;; with much of its logic in a single service function which can
-;;; be called by the macro expansion:
-;;;   `(SETF ,INDEX (%READ-VAR-INTEGER ,VEC ,INDEX)).
+(defun %read-var-integer (vec index)
+  (let ((val (aref vec index)))
+    (cond ((<= val 253)
+           (values val (1+ index)))
+          ((= val 254)
+           (values
+            (logior (aref vec (+ index 1))
+                    (ash (aref vec (+ index 2)) 8))
+            (+ index 3)))
+          (t
+           (values
+            (logior (aref vec (+ index 1))
+                    (ash (aref vec (+ index 2)) 8)
+                    (ash (aref vec (+ index 3)) 16)
+                    (ash (aref vec (+ index 4)) 24))
+            (+ index 5))))))
+
 (defmacro read-var-integer (vec index)
-  (once-only ((val `(aref ,vec ,index)))
-    `(cond ((<= ,val 253)
-            (incf ,index)
-            ,val)
-           ((= ,val 254)
-            (prog1
-                (logior (aref ,vec (+ ,index 1))
-                        (ash (aref ,vec (+ ,index 2)) 8))
-              (incf ,index 3)))
-           (t
-            (prog1
-                (logior (aref ,vec (+ ,index 1))
-                        (ash (aref ,vec (+ ,index 2)) 8)
-                        (ash (aref ,vec (+ ,index 3)) 16)
-                        (ash (aref ,vec (+ ,index 4)) 24))
-              (incf ,index 5))))))
+  (once-only ((vec vec))
+    `(multiple-value-bind (value new-index)
+         (%read-var-integer ,vec ,index)
+       (setf ,index new-index)
+       value)))
 
 ;;; Take an adjustable vector VEC with a fill pointer and push the
 ;;; variable length representation of INT on the end.
@@ -70,8 +71,9 @@
   (once-only ((len `(read-var-integer ,vec ,index)))
     (once-only ((res `(make-string ,len)))
       `(progn
-         (%byte-blt ,vec ,index ,res 0 ,len)
-         (incf ,index ,len)
+         (loop for i from 0 below ,len
+               do (setf (aref ,res i)
+                        (code-char (read-var-integer ,vec ,index))))
          ,res))))
 
 ;;; Write STRING into VEC (adjustable, with fill-pointer) represented
@@ -82,7 +84,7 @@
   (let ((len (length string)))
     (write-var-integer len vec)
     (dotimes (i len)
-      (vector-push-extend (char-code (schar string i)) vec)))
+      (write-var-integer (char-code (schar string i)) vec)))
   (values))
 
 ;;;; packed bit vectors