aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-05-01 21:38:53 +0200
committerLudovic Courtès <ludo@gnu.org>2016-05-02 00:05:36 +0200
commit00cd41974e9579eccedb948d5eebed442efb600e (patch)
tree488c0b6e487baebd7b626d0c61e06a926f2001db
parentacb31b5dcd008ee7b34d83c8d2170dcdffb3199b (diff)
downloadguix-00cd41974e9579eccedb948d5eebed442efb600e.tar
guix-00cd41974e9579eccedb948d5eebed442efb600e.tar.gz
syscalls: Implement arrays in 'define-c-struct' and use it.
* guix/build/syscalls.scm (sizeof*, alignof*, write-type, read-type): Add support for (array ...) forms. * guix/build/syscalls.scm (<file-system>)[spare0, spare1]: Remove. [spare]: New field. * guix/build/syscalls.scm (%statfs)[identifier]: Change to (array int 2). [spare0, spare1]: Remove. [spare]: New field.
-rw-r--r--guix/build/syscalls.scm37
1 files changed, 27 insertions, 10 deletions
diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm
index ed7942c10a..721c590f69 100644
--- a/guix/build/syscalls.scm
+++ b/guix/build/syscalls.scm
@@ -123,9 +123,11 @@
(define-syntax sizeof*
;; XXX: This duplicates 'compile-time-value'.
- (syntax-rules (int128)
+ (syntax-rules (int128 array)
((_ int128)
16)
+ ((_ (array type n))
+ (* (sizeof* type) n))
((_ type)
(let-syntax ((v (lambda (s)
(let ((val (sizeof type)))
@@ -135,9 +137,11 @@
(define-syntax alignof*
;; XXX: This duplicates 'compile-time-value'.
- (syntax-rules (int128)
+ (syntax-rules (int128 array)
((_ int128)
16)
+ ((_ (array type n))
+ (alignof* type))
((_ type)
(let-syntax ((v (lambda (s)
(let ((val (alignof type)))
@@ -182,10 +186,19 @@ result is the alignment of the \"most strictly aligned component\"."
types ...))))
(define-syntax write-type
- (syntax-rules (~)
+ (syntax-rules (~ array)
((_ bv offset (type ~ order) value)
(bytevector-uint-set! bv offset value
(endianness order) (sizeof* type)))
+ ((_ bv offset (array type n) value)
+ (let loop ((i 0)
+ (value value)
+ (o offset))
+ (unless (= i n)
+ (match value
+ ((head . tail)
+ (write-type bv o type head)
+ (loop (+ 1 i) tail (+ o (sizeof* type))))))))
((_ bv offset type value)
(bytevector-uint-set! bv offset value
(native-endianness) (sizeof* type)))))
@@ -202,7 +215,7 @@ result is the alignment of the \"most strictly aligned component\"."
(types ...) (fields ...))))))
(define-syntax read-type
- (syntax-rules (~ quote *)
+ (syntax-rules (~ array quote *)
((_ bv offset '*)
(make-pointer (bytevector-uint-ref bv offset
(native-endianness)
@@ -210,6 +223,12 @@ result is the alignment of the \"most strictly aligned component\"."
((_ bv offset (type ~ order))
(bytevector-uint-ref bv offset
(endianness order) (sizeof* type)))
+ ((_ bv offset (array type n))
+ (unfold (lambda (i) (= i n))
+ (lambda (i)
+ (read-type bv (+ offset (* i (sizeof* type))) type))
+ 1+
+ 0))
((_ bv offset type)
(bytevector-uint-ref bv offset
(native-endianness) (sizeof* type)))))
@@ -476,7 +495,7 @@ string TMPL and return its file name. TMPL must end with 'XXXXXX'."
(define-record-type <file-system>
(file-system type block-size blocks blocks-free
blocks-available files free-files identifier
- name-length fragment-size mount-flags spare0 spare1)
+ name-length fragment-size mount-flags spare)
file-system?
(type file-system-type)
(block-size file-system-block-size)
@@ -489,8 +508,7 @@ string TMPL and return its file name. TMPL must end with 'XXXXXX'."
(name-length file-system-maximum-name-length)
(fragment-size file-system-fragment-size)
(mount-flags file-system-mount-flags)
- (spare0 file-system--spare0)
- (spare1 file-system--spare1))
+ (spare file-system--spare))
(define-syntax fsword ;fsword_t
(identifier-syntax long))
@@ -507,12 +525,11 @@ string TMPL and return its file name. TMPL must end with 'XXXXXX'."
(blocks-available uint64)
(files uint64)
(free-files uint64)
- (identifier uint64) ;really "int[2]"
+ (identifier (array int 2))
(name-length fsword)
(fragment-size fsword)
(mount-flags fsword)
- (spare0 int128) ;really "fsword[4]"
- (spare1 int128))
+ (spare (array fsword 4)))
(define statfs
(let ((proc (syscall->procedure int "statfs64" '(* *))))