Replace main with next.

abscond/compiler/compile.rkt

@@ -1,6 +1,5 @@
 #lang racket
-(provide compile
-         compile-e)
+(provide compile)
 
 (require "../syntax/ast.rkt")
 (require a86/ast a86/registers)
@@ -9,11 +8,7 @@
 (define (compile e)
   (prog (Global 'entry)
         (Label 'entry)
-        (compile-e e)
+        (match e
+          [(Lit i) (Mov rax i)])
         (Ret)))
 
-;; Expr -> Asm
-(define (compile-e e)
-  (match e
-    [(Lit i) (seq (Mov rax i))]))
-

abscond/correct.rkt

@@ -2,11 +2,11 @@
 (provide check-compiler)
 (require rackunit)
 (require "interpreter/interp.rkt")
-(require "executor/run.rkt")
 (require "compiler/compile.rkt")
+(require a86/interp)
 
 ;; Expr -> Void
 (define (check-compiler e)
   (check-equal? (interp e)
-                (run (compile e))))
+                (asm-interp (compile e))))
 

blackmail/executor/run-stdin.rkt → abscond/executor/exec-stdin.rkt

@@ -2,11 +2,11 @@
 (provide main)
 (require "../syntax/parse.rkt")
 (require "../compiler/compile.rkt")
-(require "run.rkt")
+(require a86/interp)
 
 ;; -> Void
 ;; Compile contents of stdin and use asm-interp to run
 (define (main)
   (read-line) ; ignore #lang racket line
-  (run (compile (parse (read)))))
+  (asm-interp (compile (parse (read)))))
 

abscond/main.rkt

@@ -3,12 +3,8 @@
 (require "syntax/parse.rkt")
 (require "interpreter/interp.rkt")
 (require "compiler/compile.rkt")
-(require "executor/run.rkt")
-(require "executor/exec.rkt")
 (provide (all-from-out "syntax/ast.rkt"))
 (provide (all-from-out "syntax/parse.rkt"))
 (provide (all-from-out "interpreter/interp.rkt"))
 (provide (all-from-out "compiler/compile.rkt"))
-(provide (all-from-out "executor/run.rkt"))
-(provide (all-from-out "executor/exec.rkt"))
 

abscond/runtime/Makefile

@@ -6,11 +6,9 @@ else
   LANGS_AS ?= clang -c
 endif
 
-CFLAGS   += -fPIC -g
+CFLAGS   += -g
 
-OBJS = \
-	main.o \
-	print.o
+OBJS = main.o
 
 default: runtime.o
 

abscond/runtime/main.c

@@ -1,13 +1,12 @@
 #include <stdio.h>
 #include <inttypes.h>
-#include "print.h"
 
 int64_t entry();
 
 int main(int argc, char** argv)
 {
   int64_t result = entry();
-  print_result(result);
+  printf("%" PRId64, result);
   putchar('\n');
   return 0;
 }

abscond/test/run-compile-tests.rkt

@@ -1,8 +1,8 @@
 #lang racket
 (require "../compiler/compile.rkt")
 (require "../syntax/parse.rkt")
-(require "../executor/run.rkt")
 (require "define-tests.rkt")
+(require a86/interp)
 
-(test (λ (e) (run (compile (parse e)))))
+(test (λ (e) (asm-interp (compile (parse e)))))
 

blackmail/correct.rkt

@@ -2,11 +2,11 @@
 (provide check-compiler)
 (require rackunit)
 (require "interpreter/interp.rkt")
-(require "executor/run.rkt")
 (require "compiler/compile.rkt")
+(require a86/interp)
 
 ;; Expr -> Void
 (define (check-compiler e)
   (check-equal? (interp e)
-                (run (compile e))))
+                (asm-interp (compile e))))
 

abscond/executor/run-stdin.rkt → blackmail/executor/exec-stdin.rkt

@@ -2,11 +2,11 @@
 (provide main)
 (require "../syntax/parse.rkt")
 (require "../compiler/compile.rkt")
-(require "run.rkt")
+(require a86/interp)
 
 ;; -> Void
 ;; Compile contents of stdin and use asm-interp to run
 (define (main)
   (read-line) ; ignore #lang racket line
-  (run (compile (parse (read)))))
+  (asm-interp (compile (parse (read)))))
 

blackmail/main.rkt

@@ -3,12 +3,8 @@
 (require "syntax/parse.rkt")
 (require "interpreter/interp.rkt")
 (require "compiler/compile.rkt")
-(require "executor/run.rkt")
-(require "executor/exec.rkt")
 (provide (all-from-out "syntax/ast.rkt"))
 (provide (all-from-out "syntax/parse.rkt"))
 (provide (all-from-out "interpreter/interp.rkt"))
 (provide (all-from-out "compiler/compile.rkt"))
-(provide (all-from-out "executor/run.rkt"))
-(provide (all-from-out "executor/exec.rkt"))
 

blackmail/runtime/Makefile

@@ -6,11 +6,9 @@ else
   LANGS_AS ?= clang -c
 endif
 
-CFLAGS   += -fPIC -g
+CFLAGS   += -g
 
-OBJS = \
-	main.o \
-	print.o
+OBJS = main.o
 
 default: runtime.o
 

blackmail/runtime/main.c

@@ -1,13 +1,12 @@
 #include <stdio.h>
 #include <inttypes.h>
-#include "print.h"
 
 int64_t entry();
 
 int main(int argc, char** argv)
 {
   int64_t result = entry();
-  print_result(result);
+  printf("%" PRId64, result);
   putchar('\n');
   return 0;
 }

blackmail/test/run-compile-tests.rkt

@@ -1,8 +1,8 @@
 #lang racket
 (require "../compiler/compile.rkt")
 (require "../syntax/parse.rkt")
-(require "../executor/run.rkt")
 (require "define-tests.rkt")
+(require a86/interp)
 
-(test (λ (e) (run (compile (parse e)))))
+(test (λ (e) (asm-interp (compile (parse e)))))
 

con/correct.rkt

@@ -2,11 +2,11 @@
 (provide check-compiler)
 (require rackunit)
 (require "interpreter/interp.rkt")
-(require "executor/run.rkt")
 (require "compiler/compile.rkt")
+(require a86/interp)
 
 ;; Expr -> Void
 (define (check-compiler e)
   (check-equal? (interp e)
-                (run (compile e))))
+                (asm-interp (compile e))))
 

con/executor/run-stdin.rkt → con/executor/exec-stdin.rkt

@@ -2,11 +2,11 @@
 (provide main)
 (require "../syntax/parse.rkt")
 (require "../compiler/compile.rkt")
-(require "run.rkt")
+(require a86/interp)
 
 ;; -> Void
 ;; Compile contents of stdin and use asm-interp to run
 (define (main)
   (read-line) ; ignore #lang racket line
-  (run (compile (parse (read)))))
+  (asm-interp (compile (parse (read)))))