Sagittarius fixes

foreign/c.sld

@@ -120,7 +120,7 @@
               (scheme file)
               (scheme inexact)
               (scheme process-context)
-              (except (sagittarius ffi) c-free c-malloc)
+              (except (sagittarius ffi) c-free c-malloc define-c-struct)
               (sagittarius)))
     #;(skint
       (import (scheme base)

foreign/c/pointer.scm

@@ -76,8 +76,6 @@
 
 (define c-utf8->string
   (lambda (c-bytevector)
-    (display c-bytevector)
-    (newline)
     (when (c-null? c-bytevector)
       (error "Can not turn null pointer into string" c-bytevector))
     (let ((size (c-strlen c-bytevector)))

foreign/c/primitives/mosh.scm

@@ -58,8 +58,12 @@
 
 (define c-bytevector-u8-set! pointer-set-c-uint8!)
 (define c-bytevector-u8-ref pointer-ref-c-uint8)
-(define c-bytevector-pointer-set! pointer-set-c-pointer!)
-(define c-bytevector-pointer-ref pointer-ref-c-pointer)
+(define c-bytevector-pointer-set!
+  (lambda (pointer offset value)
+  (pointer-set-c-pointer! pointer offset value)))
+(define c-bytevector-pointer-ref
+  (lambda (pointer offset)
+  (pointer-ref-c-pointer pointer offset)))
 
 (define type->native-type
   (lambda (type)

foreign/c/primitives/stklos.scm

@@ -110,6 +110,13 @@
   (lambda (pointer offset value)
     (cpointer-set-abs! pointer :pointer value offset)))
 
-(define c-bytevector-pointer-ref
+#;(define c-bytevector-pointer-ref
   (lambda (pointer offset)
     (cpointer-ref-abs pointer :pointer offset)))
+
+(define c-bytevector-pointer-ref
+  (lambda (c-bytevector k)
+    (address->c-bytevector (c-bytevector-uint-ref c-bytevector
+                                                  0
+                                                  (native-endianness)
+                                                  (c-type-size 'pointer)))))