Merge branch 'new-knock'

This includes many updates+fixes. Here are the highlights:

  * New implementations for Knock+Jig
  * Update of notes from the sexpr style to the a86 style (up to Knock)
  * Update of test suite for Hustle+Iniquity+Jig
    (not Knock because Racket doesn't have the `call` functionality built-in)

Author: jmct

langs/a86/ast.rkt

@@ -16,7 +16,7 @@
 
 (define check:target
   (λ (x n)
-    (unless (symbol? x) ; either register or label
+    (unless (or (symbol? x) (offset? x)); either register or label
       (error n "expects symbol; given ~v" x))
     x))
 

langs/a86/printer.rkt

@@ -50,6 +50,8 @@
   (define (jump-target->string t)
     (match t
       [(? reg?) (reg->string t)]
+      [(Offset (? reg? r) i)
+       (string-append "[" (reg->string r) " + " (number->string i) "]")]
       [_ (label-symbol->string t)]))
 
   (define tab (make-string 8 #\space))

langs/extort/main.c

@@ -4,6 +4,10 @@
 #include "types.h"
 #include "runtime.h"
 
+FILE* in;
+FILE* out;
+void (*error_handler)();
+
 void print_result(int64_t);
 void print_char(int64_t);
 

langs/extort/runtime.h

@@ -1,4 +1,7 @@
+#ifndef RUNTIME_H
+#define RUNTIME_H
 int64_t entry();
-FILE* in;
-FILE* out;
-void (*error_handler)();
+extern FILE* in;
+extern FILE* out;
+extern void (*error_handler)();
+#endif /* RUNTIME_H */

langs/fraud/main.c

@@ -4,6 +4,10 @@
 #include "types.h"
 #include "runtime.h"
 
+FILE* in;
+FILE* out;
+void (*error_handler)();
+
 void print_result(int64_t);
 void print_char(int64_t);
 

langs/fraud/runtime.h

@@ -1,4 +1,7 @@
+#ifndef RUNTIME_H
+#define RUNTIME_H
 int64_t entry();
-FILE* in;
-FILE* out;
-void (*error_handler)();
+extern FILE* in;
+extern FILE* out;
+extern void (*error_handler)();
+#endif /* RUNTIME_H */

langs/hustle/interp-io.rkt

@@ -1,12 +1,12 @@
 #lang racket
-(provide make-interp/io)
+(provide interp/io)
+(require "interp.rkt")
 
-;; (Expr -> Answer) -> (Expr String -> String)
+;; Expr String -> (Cons Value String)
 ;; Interpret e with given string as input,
 ;; collect output as string (including printed result)
-(define (make-interp/io interp)
-  (λ (e in)
-    (parameterize ((current-output-port (open-output-string))
-                   (current-input-port  (open-input-string in)))
+(define (interp/io e input)
+  (parameterize ((current-output-port (open-output-string))
+                 (current-input-port  (open-input-string input)))
       (cons (interp e)
-            (get-output-string (current-output-port))))))
+            (get-output-string (current-output-port)))))

langs/hustle/interp-prims-heap-bits.rkt

@@ -10,10 +10,10 @@
     [(list 'sub1  (? int-bits? i))        (cons h (- i (imm->bits 1)))]
     [(list 'zero? (? int-bits? i))        (cons h (imm->bits (zero? i)))]
     [(list 'char? v)                      (cons h (imm->bits (char-bits? v)))]
-    [(list 'char->integer (? char-bits?)) (cons h (imm->bits (char->integer (bits->imm v))))]
-    [(list 'integer->char (? cp-bits?))   (cons h (imm->bits (integer->char (bits->imm v))))]
+    [(list 'char->integer (? char-bits?)) (cons h (imm->bits (char->integer (bits->value v))))]
+    [(list 'integer->char (? cp-bits?))   (cons h (imm->bits (integer->char (bits->value v))))]
     [(list 'eof-object? v)                (cons h (if (= v (imm->bits eof)) val-true val-false))]
-    [(list 'write-byte (? byte-bits?))    (cons h (begin (write-byte (bits->imm v)) val-void))]
+    [(list 'write-byte (? byte-bits?))    (cons h (begin (write-byte (bits->value v)) val-void))]
     [(list 'box v)                        (alloc-box v h)]
     [(list 'unbox (? box-bits?  i))       (cons h (heap-ref h i))]
     [(list 'car   (? cons-bits? i))       (cons h (heap-ref h i))]

langs/hustle/main.c

@@ -4,6 +4,11 @@
 #include "types.h"
 #include "runtime.h"
 
+FILE* in;
+FILE* out;
+void (*error_handler)();
+int64_t *heap;
+
 void print_result(int64_t);
 
 void error_exit() {
@@ -19,11 +24,16 @@ int main(int argc, char** argv) {
   in = stdin;
   out = stdout;
   error_handler = &error_exit;
-  heap = malloc(8 * heap_size);
+  heap = malloc(8 * heap_size); // 8-byte words * number of words we want
+
+  // `heap` gets passed in `rdi`
+  // (defined by the calling convention, not up to us!)
   int64_t result = entry(heap);
+  // See if we need to print the initial tick
+  if (cons_type_tag == (ptr_type_mask & result)) printf("'");
   print_result(result);
   if (result != val_void) printf("\n");
-  free(heap);
+  free(heap); // good memory hygiene
   return 0;
 }
 

langs/hustle/runtime.h

@@ -1,8 +1,11 @@
+#ifndef RUNTIME_H
+#define RUNTIME_H
 int64_t entry();
-FILE* in;
-FILE* out;
-void (*error_handler)();
+extern FILE* in;
+extern FILE* out;
+extern void (*error_handler)();
 
 // in words
 #define heap_size 10000
-int64_t *heap;
+extern int64_t *heap;
+#endif /* RUNTIME_H */