wire-format: Introduce ENCODE-INT and DECODE-INT

diff --git a/pkgdcl.lisp b/pkgdcl.lisp
index dde86a23e6d7dec92b3c9f4873832aacda208a4d..7f0f762f37eb3f587d7a843540d7554793ad1ce2 100644 (file)
--- a/pkgdcl.lisp
+++ b/pkgdcl.lisp
@@ -268,6 +268,7 @@
    "$WIRE-TYPE-END-GROUP"
    "$WIRE-TYPE-32BIT"
    "MAKE-TAG"
+   "ENCODE-INT"
    "ENCODE-UINT32"
    "ENCODE-UINT64"
    "ENCODE-FIXED32"
@@ -280,6 +281,7 @@
    "ENCODE-OCTETS"
    "ZIG-ZAG-ENCODE32"
    "ZIG-ZAG-ENCODE64"
+   "DECODE-INT"
    "DECODE-UINT32"
    "DECODE-UINT64"
    "DECODE-INT32"

diff --git a/wire-format.lisp b/wire-format.lisp
index b4840a9756a6ae2f9d9bcb52c2a4caab66464f1d..6c6170bbd6d3ff40d62437cbba2cd33476225ede 100644 (file)
--- a/wire-format.lisp
+++ b/wire-format.lisp
@@ -829,6 +829,25 @@
 (generate-integer-encoders 32)
 (generate-integer-encoders 64)
 
+(defun encode-int (val buffer index)
+  "Encodes the signed integer 'val' as a varint into the buffer at the given index.
+   Modifies the buffer, and returns the new index into the buffer.
+   Watch out, this function turns off all type checking and array bounds checking."
+  (declare #.$optimize-serialization)
+  (let ((val (ldb (byte 64 0) val))) ;clamp val to 64-bits maximum
+    (declare (type (unsigned-byte 64) val)
+             (type (simple-array (unsigned-byte 8)) buffer)
+             (type fixnum index))
+    ;; Seven bits at a time, least significant bits first
+    (loop do (let ((bits (ldb (byte 7 0) val)))
+               (declare (type (unsigned-byte 8) bits))
+               (setq val (ash val -7))
+               (setf (aref buffer index)
+                     (ilogior bits (if (zerop val) 0 128)))
+               (iincf index))
+          until (zerop val))
+    (values index buffer)))  ;return the buffer to improve 'trace'
+
 (defun encode-single (val buffer index)
   "Encodes the single float 'val' into the buffer at the given index.
    Modifies the buffer, and returns the new index into the buffer.
@@ -995,6 +1014,19 @@
 (generate-integer-decoders 32)
 (generate-integer-decoders 64)
 
+(defun decode-int (buffer index)
+  "Decodes the next varint integer in the buffer at the given index.
+   Returns both the decoded value and the new index into the buffer.
+   Watch out, this function turns off all type checking and array bounds checking."
+  (declare #.$optimize-serialization)
+  (declare (type (simple-array (unsigned-byte 8)) buffer)
+           (type fixnum index))
+  (multiple-value-bind (val index)
+      (decode-uint64 buffer index)
+    (when (i= (ldb (byte 1 63) val) 1)
+      (decf val (ash 1 64)))
+    (values val index)))
+
 (defun decode-single (buffer index)
   "Decodes the next single float in the buffer at the given index.
    Returns both the decoded value and the new index into the buffer.