From c67865ff093cb1c06027f2612c6ca78b84877837 Mon Sep 17 00:00:00 2001
From: Abdulaziz Ghuloum <aghuloum@cs.indiana.edu>
Date: Sun, 2 Aug 2009 15:12:58 +0300
Subject: [PATCH] alignment requirement for bytevector-u64-ref and
 bytevector-s64-ref is removed.

---
 scheme/ikarus.bytevectors.ss | 24 ++++++++++++++++++------
 scheme/last-revision         |  2 +-
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/scheme/ikarus.bytevectors.ss b/scheme/ikarus.bytevectors.ss
index d6f20c5..333833d 100644
--- a/scheme/ikarus.bytevectors.ss
+++ b/scheme/ikarus.bytevectors.ss
@@ -1058,8 +1058,8 @@
             (die who "not a flonum" x))
         (die who "not a bytevector" bv)))
 
-  (define ($bytevector-ref/64 bv i who decoder endianness)
-    (if (bytevector? bv) 
+  (define ($bytevector-ref/64/aligned bv i who decoder endianness)
+    (if (bytevector? bv)
         (if (and (fixnum? i) 
                  ($fx>= i 0)
                  ($fxzero? ($fxlogand i 7))
@@ -1071,17 +1071,29 @@
             (die who "invalid index" i))
         (die who "not a bytevector" bv)))
 
+  (define ($bytevector-ref/64 bv i who decoder endianness)
+    (if (bytevector? bv) 
+        (if (and (fixnum? i)
+                 ($fx>= i 0)
+                 ($fx< i ($fx- ($bytevector-length bv) 7)))
+            (case endianness
+              [(little big)
+               (decoder bv i endianness 8)]
+              [else (die who "invalid endianness" endianness)])
+            (die who "invalid index" i))
+        (die who "not a bytevector" bv)))
+
   (define (bytevector-u64-native-ref bv i) 
-    ($bytevector-ref/64 bv i 'bytevector-u64-native-ref 
+    ($bytevector-ref/64/aligned bv i 'bytevector-u64-native-ref 
        bytevector-uint-ref 'little))
   (define (bytevector-s64-native-ref bv i) 
-    ($bytevector-ref/64 bv i 'bytevector-s64-native-ref 
+    ($bytevector-ref/64/aligned bv i 'bytevector-s64-native-ref 
        bytevector-sint-ref 'little))
   (define (bytevector-u64-ref bv i endianness)
-    ($bytevector-ref/64 bv i 'bytevector-u64-native-ref 
+    ($bytevector-ref/64 bv i 'bytevector-u64-ref 
        bytevector-uint-ref endianness))
   (define (bytevector-s64-ref bv i endianness)
-    ($bytevector-ref/64 bv i 'bytevector-s64-native-ref 
+    ($bytevector-ref/64 bv i 'bytevector-s64-ref 
        bytevector-sint-ref endianness))
 
   (define ($bytevector-set/64 bv i n lo hi who setter endianness)
diff --git a/scheme/last-revision b/scheme/last-revision
index c6aaf49..c5a86fa 100644
--- a/scheme/last-revision
+++ b/scheme/last-revision
@@ -1 +1 @@
-1838
+1839