From 2924fe75e0d5b5e70ae4850a9538c279c26abd4c Mon Sep 17 00:00:00 2001
From: Javier Olaechea <pirata@gmail.com>
Date: Sun, 24 Mar 2019 16:14:43 -0500
Subject: [PATCH] Reuse uint decoders when possible

The int decoder does the same work as its corresponding uint decoder
before encoding the integer in Two's complement. We can re-use the
uint decoder instead of writing the same code in the corresponding int
decoder.
---
 osc.lisp | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/osc.lisp b/osc.lisp
index 261debe..a0f7c1f 100644
--- a/osc.lisp
+++ b/osc.lisp
@@ -352,6 +352,7 @@ with the current time use (encode-timetag :time)."
                                          (ldb (byte 16 0) (decode-int32 s)))
   #-(or sbcl cmucl openmcl allegro) (error "cant decode floats using this implementation"))
 
+<<<<<<< HEAD
 (defun decode-int32 (s)
   "4 byte -> 32 bit int -> two's compliment (in network byte order)"
   (let ((i (+ (ash (elt s 0) 24)
@@ -362,6 +363,8 @@ with the current time use (encode-timetag :time)."
         (- 0 (- #x100000000 i))
         i)))
 
+=======
+>>>>>>> d130e45 (Reuse uint decoders when possible)
 (defun decode-uint32 (s)
   "4 byte -> 32 bit unsigned int"
   (let ((i (+ (ash (elt s 0) 24)
@@ -370,6 +373,18 @@ with the current time use (encode-timetag :time)."
               (elt s 3))))
     i))
 
+(defun decode-uint64 (s)
+  "8 byte -> 64 bit unsigned int"
+  (let ((i (+ (ash (elt s 0) 56)
+	      (ash (elt s 1) 48)
+	      (ash (elt s 2) 40)
+	      (ash (elt s 3) 32)
+	      (ash (elt s 4) 24)
+	      (ash (elt s 5) 16)
+	      (ash (elt s 6) 8)
+	      (elt s 7))))
+    i))
+
 (defmacro defint-encoder (num-of-octets &optional docstring)
   (let ((enc-name (intern (format nil "~:@(encode-int~)~D" (* 8 num-of-octets))))
         (buf (gensym))
@@ -388,6 +403,7 @@ with the current time use (encode-timetag :time)."
 (defint-encoder 4 "Convert an integer into a sequence of 4 bytes in network byte order.")
 (defint-encoder 8 "Convert an integer into a sequence of 8 bytes in network byte order.")
 
+<<<<<<< HEAD
 (defun decode-uint64 (s)
   "8 byte -> 64 bit unsigned int"
   (let ((i (+ (ash (elt s 0) 56)
@@ -410,6 +426,18 @@ with the current time use (encode-timetag :time)."
               (ash (elt s 5) 16)
               (ash (elt s 6) 8)
               (elt s 7))))
+=======
+(defun decode-int32 (s)
+  "4 byte -> 32 bit int -> two's complement (in network byte order)"
+  (let ((i (decode-uint32 s)))
+    (if (>= i #x7fffffff)
+        (- 0 (- #x100000000 i))
+	i)))
+
+(defun decode-int64 (s)
+  "8 byte -> 64 bit int -> two's complement (in network byte order)"
+  (let ((i (decode-uint64 s)))
+>>>>>>> d130e45 (Reuse uint decoders when possible)
     (if (>= i #x7fffffffffffffff)
         (- 0 (- #x10000000000000000 i))
         i)))