diff --git a/Makefile b/Makefile index 8a54822..a1722e0 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,16 @@ build: --doc=README.html \ --foreign-depends=ffi \ --description="Portable foreign function interface for R7RS Schemes" \ - foreign/c.sld + --test=test.scm \ + foreign/c.sld \ + foreign/c/chibi-primitives.sld \ + foreign/c/chicken-primitives.sld \ + foreign/c/guile-primitives.sld \ + foreign/c/kawa-primitives.sld \ + foreign/c/mosh-primitives.sld \ + foreign/c/racket-primitives.sld \ + foreign/c/stklos-primitives.sld \ + foreign/c/ypsilon-primitives.sld build-gauche: snow-chibi package \ diff --git a/foreign/c.sld b/foreign/c.sld index cc203e7..5ed1a14 100644 --- a/foreign/c.sld +++ b/foreign/c.sld @@ -25,8 +25,7 @@ (export c-function c-callback bytevector-c-int8-set! - bytevector-c-uint8-ref)) - ) + bytevector-c-uint8-ref))) (export ;;;; Primitives 1 c-type-size c-type-align diff --git a/foreign/c/gauche-primitives.scm b/foreign/c/gauche-primitives.scm index bd0461a..2107da9 100644 --- a/foreign/c/gauche-primitives.scm +++ b/foreign/c/gauche-primitives.scm @@ -1,26 +1,104 @@ +(define size-of-type + (lambda (type) + (cond ((eq? type 'int8) size-of-int8_t) + ((eq? type 'uint8) size-of-uint8_t) + ((eq? type 'int16) size-of-int16_t) + ((eq? type 'uint16) size-of-uint16_t) + ((eq? type 'int32) size-of-int32_t) + ((eq? type 'uint32) size-of-uint32_t) + ((eq? type 'int64) size-of-int64_t) + ((eq? type 'uint64) size-of-uint64_t) + ((eq? type 'char) size-of-char) + ((eq? type 'unsigned-char) size-of-char) + ((eq? type 'short) size-of-short) + ((eq? type 'unsigned-short) size-of-unsigned-short) + ((eq? type 'int) size-of-int) + ((eq? type 'unsigned-int) size-of-unsigned-int) + ((eq? type 'long) size-of-long) + ((eq? type 'unsigned-long) size-of-unsigned-long) + ((eq? type 'float) size-of-float) + ((eq? type 'double) size-of-double) + ((eq? type 'pointer) size-of-void*) + ((eq? type 'void) 0) + ((eq? type 'callback) size-of-void*) + (else #f)))) -;;;; This file is dependent on content of other files added trough (include...) -;;;; And that's why it is separated +(define align-of-type + (lambda (type) + (cond ((eq? type 'int8) align-of-int8_t) + ((eq? type 'uint8) align-of-uint8_t) + ((eq? type 'int16) align-of-int16_t) + ((eq? type 'uint16) align-of-uint16_t) + ((eq? type 'int32) align-of-int32_t) + ((eq? type 'uint32) align-of-uint32_t) + ((eq? type 'int64) align-of-int64_t) + ((eq? type 'uint64) align-of-uint64_t) + ((eq? type 'char) align-of-char) + ((eq? type 'unsigned-char) align-of-char) + ((eq? type 'short) align-of-short) + ((eq? type 'unsigned-short) align-of-unsigned-short) + ((eq? type 'int) align-of-int) + ((eq? type 'unsigned-int) align-of-unsigned-int) + ((eq? type 'long) align-of-long) + ((eq? type 'unsigned-long) align-of-unsigned-long) + ((eq? type 'float) align-of-float) + ((eq? type 'double) align-of-double) + ((eq? type 'pointer) align-of-void*) + ((eq? type 'void) 0) + ((eq? type 'callback) align-of-void*) + (else #f)))) -(define make-c-function - (lambda (shared-object c-name return-type argument-types) - (dlerror) ;; Clean all previous errors - (let ((c-function (dlsym shared-object c-name)) - (maybe-dlerror (dlerror))) - (lambda arguments - (let ((return-pointer (internal-ffi-call (length argument-types) - (type->libffi-type-number return-type) - (map type->libffi-type-number argument-types) - c-function - (size-of-type return-type) - arguments))) - (c-bytevector-get return-pointer return-type 0)))))) +(define shared-object-load + (lambda (path options) + (open-shared-library path))) + +(define type->native-type + (lambda (type) + (cond ((equal? type 'int8) 'int8_t) + ((equal? type 'uint8) 'uint8_t) + ((equal? type 'int16) 'int16_t) + ((equal? type 'uint16) 'uint16_t) + ((equal? type 'int32) 'int32_t) + ((equal? type 'uint32) 'uint32_t) + ((equal? type 'int64) 'int64_t) + ((equal? type 'uint64) 'uint64_t) + ((equal? type 'char) 'char) + ((equal? type 'unsigned-char) 'char) + ((equal? type 'short) 'short) + ((equal? type 'unsigned-short) 'unsigned-short) + ((equal? type 'int) 'int) + ((equal? type 'unsigned-int) 'unsigned-int) + ((equal? type 'long) 'long) + ((equal? type 'unsigned-long) 'unsigned-long) + ((equal? type 'float) 'float) + ((equal? type 'double) 'double) + ((equal? type 'pointer) 'void*) + ((equal? type 'void) 'void) + ((equal? type 'callback) 'callback) + (else #f)))) (define-syntax define-c-procedure (syntax-rules () ((_ scheme-name shared-object c-name return-type argument-types) (define scheme-name (make-c-function shared-object - (symbol->string c-name) - return-type - argument-types))))) + (type->native-type return-type) + c-name + (map type->native-type argument-types)))))) + +(define-syntax define-c-callback + (syntax-rules () + ((_ scheme-name return-type argument-types procedure) + (define scheme-name + (make-c-callback (type->native-type return-type) + (map type->native-type argument-types) + procedure))))) + +(define c-bytevector? + (lambda (object) + (pointer? object))) + +(define c-bytevector-u8-set! pointer-set-c-uint8_t!) +(define c-bytevector-u8-ref pointer-ref-c-uint8_t) +(define c-bytevector-pointer-set! pointer-set-c-pointer!) +(define c-bytevector-pointer-ref pointer-ref-c-pointer) diff --git a/foreign/c/gauche-primitives.sld b/foreign/c/gauche-primitives.sld index 9be5fac..58a7c03 100644 --- a/foreign/c/gauche-primitives.sld +++ b/foreign/c/gauche-primitives.sld @@ -6,8 +6,7 @@ (scheme file) (scheme inexact) (scheme process-context) - (gauche base) - (foreign c primitives gauche)) + (gauche ffi)) (export size-of-type align-of-type shared-object-load diff --git a/foreign/c/sagittarius-primitives.scm b/foreign/c/sagittarius-primitives.scm index aa9be93..2107da9 100644 --- a/foreign/c/sagittarius-primitives.scm +++ b/foreign/c/sagittarius-primitives.scm @@ -102,48 +102,3 @@ (define c-bytevector-u8-ref pointer-ref-c-uint8_t) (define c-bytevector-pointer-set! pointer-set-c-pointer!) (define c-bytevector-pointer-ref pointer-ref-c-pointer) - -#;(define pointer-set! - (lambda (pointer type offset value) - (cond ((equal? type 'int8) (pointer-set-c-int8_t! pointer offset value)) - ((equal? type 'uint8) (pointer-set-c-uint8_t! pointer offset value)) - ((equal? type 'int16) (pointer-set-c-int16_t! pointer offset value)) - ((equal? type 'uint16) (pointer-set-c-uint16_t! pointer offset value)) - ((equal? type 'int32) (pointer-set-c-int32_t! pointer offset value)) - ((equal? type 'uint32) (pointer-set-c-uint32_t! pointer offset value)) - ((equal? type 'int64) (pointer-set-c-int64_t! pointer offset value)) - ((equal? type 'uint64) (pointer-set-c-uint64_t! pointer offset value)) - ((equal? type 'char) (pointer-set-c-char! pointer offset (char->integer value))) - ((equal? type 'short) (pointer-set-c-short! pointer offset value)) - ((equal? type 'unsigned-short) (pointer-set-c-unsigned-short! pointer offset value)) - ((equal? type 'int) (pointer-set-c-int! pointer offset value)) - ((equal? type 'unsigned-int) (pointer-set-c-unsigned-int! pointer offset value)) - ((equal? type 'long) (pointer-set-c-long! pointer offset value)) - ((equal? type 'unsigned-long) (pointer-set-c-unsigned-long! pointer offset value)) - ((equal? type 'float) (pointer-set-c-float! pointer offset value)) - ((equal? type 'double) (pointer-set-c-double! pointer offset value)) - ((equal? type 'void) (pointer-set-c-pointer! pointer offset value)) - ((equal? type 'pointer) (pointer-set-c-pointer! pointer offset value))))) - -#;(define pointer-get - (lambda (pointer type offset) - (cond ((equal? type 'int8) (pointer-ref-c-int8_t pointer offset)) - ((equal? type 'uint8) (pointer-ref-c-uint8_t pointer offset)) - ((equal? type 'int16) (pointer-ref-c-int16_t pointer offset)) - ((equal? type 'uint16) (pointer-ref-c-uint16_t pointer offset)) - ((equal? type 'int32) (pointer-ref-c-int32_t pointer offset)) - ((equal? type 'uint32) (pointer-ref-c-uint32_t pointer offset)) - ((equal? type 'int64) (pointer-ref-c-int64_t pointer offset)) - ((equal? type 'uint64) (pointer-ref-c-uint64_t pointer offset)) - ((equal? type 'char) (integer->char (pointer-ref-c-char pointer offset))) - ((equal? type 'short) (pointer-ref-c-short pointer offset)) - ((equal? type 'unsigned-short) (pointer-ref-c-unsigned-short pointer offset)) - ((equal? type 'int) (pointer-ref-c-int pointer offset)) - ((equal? type 'unsigned-int) (pointer-ref-c-unsigned-int pointer offset)) - ((equal? type 'long) (pointer-ref-c-long pointer offset)) - ((equal? type 'unsigned-long) (pointer-ref-c-unsigned-long pointer offset)) - ((equal? type 'float) (pointer-ref-c-float pointer offset)) - ((equal? type 'double) (pointer-ref-c-double pointer offset)) - ((equal? type 'void) (pointer-ref-c-pointer pointer offset)) - ((equal? type 'pointer) (pointer-ref-c-pointer pointer offset))))) -