More Shakedown fixes

Author: jmct

www/notes/shakedown/Makefile

@@ -24,7 +24,7 @@ clib.o: clib.c types.h
 %.o: %.s
 	nasm -f $(format) -o $@ $<
 
-%.s: %.rkt
+%.s: %.shk
 	racket -t compile-file.rkt -m $< > $@
 
 clean:

www/notes/shakedown/clib.c

@@ -4,6 +4,6 @@
 #include "types.h"
 
 int64_t c_fun() {
-  puts("yo yo yo");
+  puts("Hello, from C!");
   return (42 << imm_shift);
 }

www/notes/shakedown/compile-file.rkt

@@ -15,5 +15,4 @@
         (asm-display (compile (sexpr->prog p)))))))
 
 (define (read-program)
-  (regexp-match "^#lang racket" (current-input-port))
   (read))

www/notes/shakedown/example.shk

@@ -1,2 +1 @@
-#lang racket
 (let ((y (ccall c_fun))) ((lambda (x) y) 11))

www/notes/shakedown/test/compile.rkt

@@ -1,11 +1,12 @@
 #lang racket
 (require "../compile.rkt"
+         "../syntax.rkt"
          "../asm/interp.rkt"
          rackunit
          redex/reduction-semantics)
 
 (define (run e)
-  (asm-interp (compile e)))
+  (asm-interp (compile (sexpr->prog e))))
 
 (check-equal? (run 7) 7)
 (check-equal? (run -8) -8)
@@ -118,19 +119,19 @@
                            '())))))
  '(1 -1))
 
-(check-equal?
- (run
-  '(begin (define (map f ls)
-            (begin (define (mapper ls)
-                     (if (empty? ls)
-                         '()
-                         (cons (f (car ls)) (mapper (cdr ls)))))
-                   (mapper ls)))
-          (map (λ (f) (f 0))
-               (cons (λ (x) (add1 x))
-                     (cons (λ (x) (sub1 x))
-                           '())))))
- '(1 -1))
+;(check-equal?
+; (run
+;  '(begin (define (map f ls)
+;            (begin (define (mapper ls)
+;                     (if (empty? ls)
+;                         '()
+;                         (cons (f (car ls)) (mapper (cdr ls)))))
+;                   (mapper ls)))
+;          (map (λ (f) (f 0))
+;               (cons (λ (x) (add1 x))
+;                     (cons (λ (x) (sub1 x))
+;                           '())))))
+; '(1 -1))
 
 (check-equal? (run
                '(let ((id (λ (x) x)))

www/notes/shakedown/test/interp.rkt

@@ -148,8 +148,10 @@
                              '())))))
    '(1 -1)))
 
-(test-suite
- (λ (e)
-   (match (interp e)
-     [(? procedure?) 'procedure]
-     [v v])))
+; TODO: Not sure if I actually want to write an interpreter for this as it's
+; mostly about the System V calling convention
+;(test-suite
+; (λ (e)
+;   (match (interp e)
+;     [(? procedure?) 'procedure]
+;     [v v])))