diff --git a/Makefile b/Makefile index a605579..fc1a651 100644 --- a/Makefile +++ b/Makefile @@ -33,6 +33,10 @@ uninstall: logs: mkdir -p logs +snow: + snow-chibi install --impls=generic --skip-tests?=1 --always-yes --install-source-dir=snow --install-library-dir=snow retropikzel.ctrf || true + snow-chibi install --impls=generic --skip-tests?=1 --always-yes --install-source-dir=snow --install-library-dir=snow srfi.64 || true + ${VENV}: scheme-venv ${SCHEME} ${RNRS} ${VENV} if [ "${RNRS}" = "r7rs" ]; then ${VENV}/bin/snow-chibi install --always-yes srfi.64; fi @@ -58,22 +62,17 @@ run-test-venv: ${VENV} logs build cd ${VENV} && ./test mv ${VENV}/*.json logs/ || true -run-test-system: logs build +run-test-system: logs snow build printf "#!r6rs\n(import (rnrs) (srfi :64) (srfi :98) (retropikzel mouth) (retropikzel ctrf) (retropikzel ${LIBRARY}))" > run-test.sps echo "(test-runner-current (ctrf-runner))" >> run-test.sps cat ${TESTFILE} >> run-test.sps echo "(import (scheme base) (scheme write) (scheme read) (scheme char) (scheme file) (scheme process-context) (retropikzel mouth) (srfi 64) (retropikzel ctrf) (retropikzel ${LIBRARY}))" > run-test.scm echo "(test-runner-current (ctrf-runner))" >> run-test.scm cat ${TESTFILE} >> run-test.scm + if [ "${RNRS}" = "r6rs" ]; then akku install akku-r7rs; fi if [ "${RNRS}" = "r7rs" ]; then snow-chibi install --impls=${SCHEME} --always-yes srfi.64; fi if [ "${RNRS}" = "r7rs" ]; then snow-chibi install --impls=${SCHEME} --always-yes retropikzel.mouth; fi if [ "${RNRS}" = "r7rs" ]; then snow-chibi install --impls=${SCHEME} --always-yes retropikzel.ctrf; fi - if [ "${RNRS}" = "r6rs" ]; then snow-chibi install --impls=generic --always-yes --install-source-dir=. --install-library-dir=. srfi.180; fi - if [ "${SCHEME}" = "chezscheme" ]; then akku install akku-r7rs chez-srfi; fi - if [ "${SCHEME}" = "ikarus" ]; then akku install akku-r7rs chez-srfi; fi - if [ "${SCHEME}" = "ironscheme" ]; then akku install akku-r7rs chez-srfi; fi - if [ "${SCHEME}" = "racket" ]; then akku install akku-r7rs chez-srfi; fi - if [ "${RNRS}" = "r6rs" ]; then akku install; fi if [ "${RNRS}" = "r7rs" ]; then snow-chibi install --impls=${SCHEME} ${PKG}; fi rm -rf run-test if [ "${RNRS}" = "r6rs" ]; then COMPILE_R7RS=${SCHEME} compile-scheme -I .akku/lib run-test.sps; fi diff --git a/retropikzel/ctrf.sld b/retropikzel/ctrf.sld index 8304e96..10ad544 100644 --- a/retropikzel/ctrf.sld +++ b/retropikzel/ctrf.sld @@ -40,18 +40,6 @@ (tr7 (begin (define implementation-name "tr7"))) (ypsilon (begin (define implementation-name "ypsilon"))) (else (begin (define implementation-name "unknown")))) - (cond-expand - #;(r6rs - (import (srfi :19)) - (begin - (define (time-s) - (time-second (current-time))))) - #;(srfi-19 - (import (srfi 19)) - (begin - (define (time-s) - (time-second (current-time))))) - (else - (begin - (define (time-s) (current-second))))) + (begin + (define (time-s) (current-second))) (include "ctrf.scm")) diff --git a/retropikzel/wasm.scm b/retropikzel/wasm.scm new file mode 100644 index 0000000..0b11392 --- /dev/null +++ b/retropikzel/wasm.scm @@ -0,0 +1,84 @@ +(define (wasm-bytevector? bytes) + (equal? (bytevector-copy bytes 0 4) (bytevector #x0 #x61 #x73 #x6D))) + +(define (wasm-version bytes) + (bytevector-copy bytes 4 8)) + +(define (section-id->name id) + (cond ((= id 0) 'custom) + ((= id 1) 'type) + ((= id 2) 'import) + ((= id 3) 'function) + ((= id 4) 'table) + ((= id 5) 'memory) + ((= id 6) 'global) + ((= id 7) 'export) + ((= id 8) 'start) + ((= id 9) 'element) + ((= id 10) 'code) + ((= id 11) 'data) + ((= id 12) 'data-count) + ((= id 13) 'tag) + (else (error "section-id->name: unrecognized section id" id)))) + +(define (bytes->type bytes) + (let ((first-byte (bytevector-u8-ref bytes 0))) + (display "HERE: ") + (display first-byte) + (newline) + (cond + ((equal? first-byte #x7C) 'f64) + ((equal? first-byte #x7D) 'f32) + ((equal? first-byte #x7E) 'f64) + ((equal? first-byte #x7F) 'f32) + (else 'unknown) + ;(else (error "Unsupported type byte" first-byte)) + ))) + +(define (bytes->types bytes) + (letrec* + ((bytes-length (bytevector-length bytes)) + (looper + (lambda (index types) + (if (>= index bytes-length) + types + (looper (+ index 1) (bytes->type (bytevector-copy bytes index))))))) + (looper 0 '()))) + +(define (section-bytes->sexp name bytes) + (cond + ((equal? name 'type) + (let* ((number-of-types (leb128->integer-and-length bytes)) + (types (bytes->types (bytevector-copy bytes (cdr number-of-types))))) + (display "TYPE: ") + (write bytes) + (newline) + `((number-of-types . ,(car number-of-types)) + (types . ,types) + ))) + (else '()))) + +(define (wasm->sexp bytes) + (display bytes) + (newline) + (letrec* + ((bytes-length (bytevector-length bytes)) + (section-data '()) + (index 8) ;; Jump over magic bytes and version + (looper (lambda () + (when (< index bytes-length) + (let* ((id (bytevector-u8-ref bytes index)) + (name (section-id->name id)) + (len (uleb128->integer-and-length bytes (+ index 1) 0 0)) + (data-bytes (bytevector-copy bytes index (+ index (car len))))) + (set! section-data + (append section-data + `((id . ,id) + (name . ,name) + (data . ,(section-bytes->sexp name data-bytes))))) + (set! index (+ index 1 (car len) (cdr len))) + (looper) + ))))) + (looper) + section-data + )) diff --git a/retropikzel/wasm.sld b/retropikzel/wasm.sld new file mode 100644 index 0000000..c4e8f16 --- /dev/null +++ b/retropikzel/wasm.sld @@ -0,0 +1,7 @@ +(define-library + (retropikzel wasm) + (import (scheme base) + (scheme write) + (retropikzel leb128)) + (export wasm->sexp) + (include "wasm.scm")) diff --git a/retropikzel/wasm/LICENSE b/retropikzel/wasm/LICENSE new file mode 100644 index 0000000..0a04128 --- /dev/null +++ b/retropikzel/wasm/LICENSE @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/retropikzel/wasm/README.md b/retropikzel/wasm/README.md new file mode 100644 index 0000000..e69de29 diff --git a/retropikzel/wasm/VERSION b/retropikzel/wasm/VERSION new file mode 100644 index 0000000..6e8bf73 --- /dev/null +++ b/retropikzel/wasm/VERSION @@ -0,0 +1 @@ +0.1.0 diff --git a/retropikzel/wasm/plus.c b/retropikzel/wasm/plus.c new file mode 100644 index 0000000..8651553 --- /dev/null +++ b/retropikzel/wasm/plus.c @@ -0,0 +1,3 @@ +int plus(int a, int b) { + return a + b; +} diff --git a/retropikzel/wasm/test.scm b/retropikzel/wasm/test.scm new file mode 100644 index 0000000..60dcdc1 --- /dev/null +++ b/retropikzel/wasm/test.scm @@ -0,0 +1,14 @@ +(test-begin "wasm") + +(define testdir "retropikzel/wasm") +(define testfile1 (string-append testdir "/" "plus.wasm")) + +(when (not (file-exists? testfile1)) + (error (string-append testfile1 " does not exist"))) + +(define bytes (with-input-from-file testfile1 (lambda () (read-bytevector 10000)))) + +(write (wasm->sexp bytes)) +(newline) + +(test-end "wasm")