diff options
| -rw-r--r-- | assembler/fvm-as.scm | 11 | ||||
| -rw-r--r-- | src/fvm.h | 2 | ||||
| -rw-r--r-- | src/main.c | 7 |
3 files changed, 13 insertions, 7 deletions
diff --git a/assembler/fvm-as.scm b/assembler/fvm-as.scm index 8730e66..555f36f 100644 --- a/assembler/fvm-as.scm +++ b/assembler/fvm-as.scm @@ -153,15 +153,14 @@ (define (output-prog prog output-file) (define (write-number x port) - (cond ((or (rational? x) - (real? x)) (write-string - (blob->string (f64vector->blob (f64vector x))) - #f - port)) - ((integer? x) (write-string (blob->string + (cond ((exact-integer? x) (write-string (blob->string (u64vector->blob (u64vector x))) #f port)) + ((real? x) (write-string + (blob->string (f64vector->blob (f64vector x))) + #f + port)) (else (abort "Expect a number")))) (call-with-output-file output-file (lambda (port) @@ -9,7 +9,7 @@ typedef double fvm_float_t;; struct fvm; // return non-zero if vm should be suspended -typedef int64_t (*fvm_syscall_fn_t)(struct fvm* vm); +typedef void (*fvm_syscall_fn_t)(struct fvm* vm); struct fvm { fvm_word_t sp; // stack pointer @@ -3,12 +3,19 @@ #include "fvm.h" +static void printnum(struct fvm *vm) { + int64_t n = fvm_pop(vm); + printf("%lld\n", n); +} + int main(int argc, char **argv) { struct fvm vm; if (argc < 2) { fprintf(stderr, "Usage: fvm <program-file>\n"); return -1; } + vm.syscall_table = malloc(256 * sizeof(fvm_syscall_fn_t)); + vm.syscall_table[1] = &printnum; FILE* fp = fopen(argv[1], "rb"); if (fp == NULL) { fprintf(stderr, "Failed to open file.\n"); |