Merge branch 'main' of github.com:cmsc430/www

Author: dvanhorn

langs/a86/printer.rkt

@@ -206,7 +206,7 @@
     [(Label g)
      (begin
        (write-string (string-append
-                      tab "global " (label-symbol->string g) "\n"
+                      ; tab "global " (label-symbol->string g) "\n"
                       tab "default rel\n"
                       tab "section .text\n"))
        (instrs-display a))]

langs/dodger/test/all.rkt

@@ -32,9 +32,9 @@
   ;; Dupe examples
   (check-equal? (run #t) #t)
   (check-equal? (run #f) #f)
-  (check-equal? (run (if #t 1 2)) 1)
-  (check-equal? (run (if #f 1 2)) 2)
-  (check-equal? (run (if 0 1 2)) 1)
+  (check-equal? (run '(if #t 1 2)) 1)
+  (check-equal? (run '(if #f 1 2)) 2)
+  (check-equal? (run '(if 0 1 2)) 1)
   (check-equal? (run '(if #t 3 4)) 3)
   (check-equal? (run '(if #f 3 4)) 4)
   (check-equal? (run '(if  0 3 4)) 3)

langs/dupe/compile/help.rkt

@@ -33,9 +33,9 @@
   ;; Dupe examples
   (check-equal? (run #t) #t)
   (check-equal? (run #f) #f)
-  (check-equal? (run (if #t 1 2)) 1)
-  (check-equal? (run (if #f 1 2)) 2)
-  (check-equal? (run (if 0 1 2)) 1)
+  (check-equal? (run '(if #t 1 2)) 1)
+  (check-equal? (run '(if #f 1 2)) 2)
+  (check-equal? (run '(if 0 1 2)) 1)
   (check-equal? (run '(if #t 3 4)) 3)
   (check-equal? (run '(if #f 3 4)) 4)
   (check-equal? (run '(if  0 3 4)) 3)

langs/dupe/test/all.rkt

@@ -0,0 +1,12 @@
+#lang racket
+(provide runtime-path)
+
+(require racket/runtime-path)
+(define-runtime-path here ".")
+
+(system (string-append "make -C "
+                       (path->string (normalize-path here))
+		       " runtime.o"))
+
+(define runtime-path
+  (normalize-path (build-path here "runtime.o")))

langs/evildoer/build-runtime.rkt

@@ -4,14 +4,13 @@
          "../interp-io.rkt"
          "../parse.rkt"
          "../types.rkt"
+	 "../build-runtime.rkt"
          a86/interp
          rackunit)
 
 ;; link with runtime for IO operations
-(unless (file-exists? "../runtime.o")
-  (system "make -C .. runtime.o"))
 (current-objs
- (list (path->string (normalize-path "../runtime.o"))))
+ (list (path->string runtime-path)))
 
 (define (test-runner run)
   ;; Abscond examples
@@ -38,9 +37,9 @@
   ;; Dupe examples
   (check-equal? (run #t) #t)
   (check-equal? (run #f) #f)
-  (check-equal? (run (if #t 1 2)) 1)
-  (check-equal? (run (if #f 1 2)) 2)
-  (check-equal? (run (if 0 1 2)) 1)
+  (check-equal? (run '(if #t 1 2)) 1)
+  (check-equal? (run '(if #f 1 2)) 2)
+  (check-equal? (run '(if 0 1 2)) 1)
   (check-equal? (run '(if #t 3 4)) 3)
   (check-equal? (run '(if #f 3 4)) 4)
   (check-equal? (run '(if  0 3 4)) 3)

langs/evildoer/test/all.rkt

@@ -0,0 +1,12 @@
+#lang racket
+(provide runtime-path)
+
+(require racket/runtime-path)
+(define-runtime-path here ".")
+
+(system (string-append "make -C "
+                       (path->string (normalize-path here))
+		       " runtime.o"))
+
+(define runtime-path
+  (normalize-path (build-path here "runtime.o")))

langs/extort/build-runtime.rkt

@@ -4,7 +4,6 @@
 
 (define rax 'rax) ; return
 (define rdi 'rdi) ; arg
-(define r8  'r8)  ; scratch in +, -
 (define r9  'r9)  ; scratch in assert-type
 
 ;; Op0 -> Asm
@@ -56,20 +55,6 @@
           (Call 'write_byte)
           (Mov rax val-void))]))
 
-;; Op2 -> Asm
-(define (compile-op2 p)
-  (match p
-    ['+
-     (seq (Pop r8)
-          (assert-integer r8)
-          (assert-integer rax)
-          (Add rax r8))]
-    ['-
-     (seq (Pop r8)
-          (assert-integer r8)
-          (assert-integer rax)
-          (Sub r8 rax)
-          (Mov rax r8))]))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 

langs/extort/compile-ops.rkt

@@ -47,13 +47,6 @@
   (seq (compile-e e)
        (compile-op1 p)))
 
-;; Op2 Expr Expr -> Asm
-(define (compile-prim2 p e1 e2)
-  (seq (compile-e e1)
-       (Push rax)
-       (compile-e e2)
-       (compile-op2 p)))
-
 ;; Expr Expr Expr -> Asm
 (define (compile-if e1 e2 e3)
   (let ((l1 (gensym 'if))