X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=jars.git;a=blobdiff_plain;f=mars.scm;h=994a2b8865686a6e9b5c043ca00c7e68ad7bfbe1;hp=b1aa9db8f03f1bd52c38fbce981ca6423de07d0a;hb=71145a5fd1ff3f563ad7307285580cc9cc733641;hpb=707bcb205c185815e2b94ab3fca5f769afb58264

diff --git a/mars.scm b/mars.scm
index b1aa9db..994a2b8 100644
--- a/mars.scm
+++ b/mars.scm
@@ -4,50 +4,144 @@
 
 (import (chicken io)
         (chicken string)
+        (chicken random)
         matchable)
 
 ;;; Constants
 ;;
 
-(define core-size 8000)
+(define core-size 20)
 (define max-steps 10000)
 
 
-;;; Memory setup
+;;; Instructions
+;;
+
+(define ((make-instr opcode modifier A-mode A-num B-mode B-num name) . args)
+  (match args
+    (('copy n) (make-instr opcode modifier A-mode A-num B-mode B-num n))
+    (('copy-from! other n)
+     (set! opcode (other 'opcode))
+     (set! modifier (other 'modifier))
+     (set! A-mode (other 'A-mode))
+     (set! A-num (other 'A-num))
+     (set! B-mode (other 'B-mode))
+     (set! B-num (other 'B-num))
+     (set! name n))
+    (('opcode) opcode)
+    (('modifier) modifier)
+    (('A-mode) A-mode)
+    (('A-num) A-num)
+    (('B-mode) B-mode)
+    (('B-num) B-num)
+    (('name) name)
+    (('print) (print opcode
+                     "." modifier
+                     " " (mode-string A-mode) A-num
+                     ", " (mode-string B-mode) B-num
+                     (if (null? name) "" (conc " ; " name))))
+    (('set-opcode! x n) (set! opcode x) (set! name n))
+    (('set-modifier! x n) (set! modifier x) (set! name n))
+    (('set-A-mode! x n) (set! A-mode x) (set! name n))
+    (('set-A-num! x n) (set! A-num x) (set! name n))
+    (('set-B-mode! x n) (set! B-mode x) (set! name n))
+    (('set-B-num! x n) (set! B-num x) (set! name n))))
+
+(define (mode-string mode)
+   (case mode
+     ((immediate) "#")
+     ((direct) "$")
+     ((indirect-A "*"))
+     ((indirect-B "@"))
+     ((pre-indirect-A "{"))
+     ((pre-indirect-B "<"))
+     ((post-indirect-A "}"))
+     ((post-indirect-B ">"))))
+
+(define initial-instruction
+  (make-instr 'DAT 'F 'immediate 0 'immediate 0 '()))
+
+
+;;; Memory setup and addressing
 ;;
 
 (define core (make-vector core-size '()))
 
+(define (core-get i)
+  (vector-ref core i))
 
-;;; Instructions
-;;
+(define (core-set! i x)
+  (vector-set! core i x))
 
-(define (make-instr opcode modifier A-mode A-num B-mode B-num))
-(define (instr-opcode instr) (list-ref instr 0))
-(define (instr-modifier instr) (list-ref instr 1))
-(define (instr-A-mode instr) (list-ref instr 2))
-(define (instr-A-num instr) (list-ref instr 3))
-(define (instr-B-mode instr) (list-ref instr 4))
-(define (instr-B-num instr) (list-ref instr 5))
+(define (initialize-core)
+  (let loop ((i 0))
+    (unless (>= i core-size)
+      (core-set! i (initial-instruction 'copy '()))
+      (loop (+ i 1)))))
 
+(define (core-dump)
+  (let loop ((i 0))
+    (unless (>= i core-size)
+      ((core-get i) 'print)
+      (loop (+ i 1)))))
 
-;;; Players
-;;
-
-(define (make-player name . ptrs)
-  (cons name ptrs))
+(define (addr+ . args)
+  (foldl (lambda (a b)
+           (modulo (+ a b core-size) core-size))
+         0 args))
 
-(define (player-ptrs player)
-  (cdr player))
+;;; Programmes
+;;
 
-(define (player-name player)
-  (car player))
+(define (make-prog name instrs offset)
+  (list name instrs offset))
+
+(define (prog-name prog) (list-ref prog 0))
+(define (prog-instrs prog) (list-ref prog 1))
+(define (prog-offset prog) (list-ref prog 2))
+
+(define (install-prog prog addr)
+  (let loop ((ptr addr)
+             (instrs (prog-instrs prog)))
+    (unless (null? instrs)
+      (core-set! ptr ((car instrs) 'copy (prog-name prog)))
+      (loop (addr+ ptr 1) (cdr instrs))))
+  (make-player (prog-name prog)
+               (addr+ addr (prog-offset prog))))
+
+(define (can-install-prog? prog-len addr)
+  (let loop ((ptr addr)
+             (remaining prog-len))
+    (if (= remaining 0)
+        #t
+        (if (null? ((core-get ptr) 'name))
+            (loop (addr+ ptr 1)
+                  (- remaining 1))
+            #f))))
+
+(define (install-progs progs)
+  (let loop ((players '())
+             (progs-left progs))
+    (if (null? progs-left)
+        players
+        (let ((addr (pseudo-random-integer core-size))
+              (prog (car progs-left)))
+          (if (can-install-prog? (length (prog-instrs prog)) addr)
+              (loop (cons (install-prog prog addr) players)
+                    (cdr progs-left))
+              (loop players progs-left))))))
+
+(define (make-player name ptr)
+  (list name ptr))
+
+(define (player-name player) (car player))
+(define (player-ptrs player) (cdr player))
 
 (define (player-set-ptrs! player ptrs)
-  (set-cdr! player ptrs))
+  (set-cdr! prog-queue ptrs))
 
 
-;;; Main loop
+;;; Executive function
 ;;
 
 (define (run players step)
@@ -58,59 +152,87 @@
     (let ((player (car players))
           (other-players (cdr players))
           (ptrs (player-ptrs player)))
-      (let ((new-ptrs (execute-instr (car ptrs))))
+      (let ((new-ptrs (execute-instr (car ptrs) (player-name player))))
         (if (null? new-ptrs)
             (run other-players (+ step 1))
             (begin
               (player-set-ptrs! (append (cdr ptrs) new-ptrs))
               (run (append other-players (list player)) (+ step 1)))))))))
 
-(define (execute-instr ptr)
-  (let* ((instr (vector-ref core ptr))
-         (A-pointer (eval-operand (instr-A-mode instr) (instr-A-num) ptr))
-         (B-pointer (eval-operand (instr-B-mode instr) (instr-B-num) ptr)))
+(define (execute-instr ptr name)
+  (let* ((instr (core-get ptr))
+         (A-pointer (eval-operand (instr 'A-mode) (instr 'A-num) ptr))
+         (B-pointer (eval-operand (instr 'B-mode) (instr 'B-num) ptr))
+         (modifier (instr-modifier instr)))
     (case (instr-opcode instr)
-      ((DAT))
-      ((MOV))
-      ((ADD))
-      ((SUB))
+      ((DAT) '()) ;Game over, man, game over!
+      ((MOV)
+       (case modifier
+         ((A) ((core-get B-pointer) 'set-A-num! ((core-get A-pointer) 'A-num) name))
+         ((B) ((core-get B-pointer) 'set-B-num! ((core-get A-pointer) 'B-num) name))
+         ((AB) ((core-get B-pointer) 'set-B-num! ((core-get A-pointer) 'A-num) name))
+         ((BA) ((core-get B-pointer) 'set-A-num! ((core-get A-pointer) 'B-num) name))
+         ((F) ((core-get B-pointer) 'set-A-num! ((core-get A-pointer) 'A-num) name)
+              ((core-get B-pointer) 'set-B-num! ((core-get A-pointer) 'B-num) name))
+         ((X) ((core-get B-pointer) 'set-A-num! ((core-get A-pointer) 'B-num) name)
+              ((core-get B-pointer) 'set-B-num! ((core-get A-pointer) 'A-num) name))
+         ((I) ((core-get B-pointer) 'copy-from! (core-get A-pointer) name)))
+       (list (addr+ ptr 1)))
+      ((ADD)
+       (case modifier
+         ((A))
+         ((B))
+         ((AB))
+         ((BA))
+         ((F))
+         ((X))))
+      ((SUB)
+       (case modifier
+         ((A))
+         ((B))
+         ((AB))
+         ((BA))
+         ((F))
+         ((X))))
       ((MUL))
       ((DIV))
       ((MOD))
       ((JMP))
+      ((JMZ))
       ((JMN))
       ((DJN))
       ((SEQ CMP))
       ((SNE))
       ((SLT))
       ((SPL))
-      ((NOP))
+      ((NOP) (list (addr+ ptr 1)))
       (else
        (error "Unrecognised opcode" (instr-opcode instr))))))
-               
+
 (define (eval-operand mode num ptr)
-  (case mode
-    ((immediate) 0)
-    ((direct) num)
-    ((indirect-A) (+ num (instr-A-num (vector-ref core (+ ptr num)))))
-    ((indirect-B) (+ num (instr-B-num (vector-ref core (+ ptr num)))))
-    ((pre-indirect-A)
-     (let ((aux-instr (vector-ref core (+ ptr num))))
-       (instr-set-A-num! aux-instr (- 1 (instr-A-num aux-instr)))
-       (+ num (instr-A-num aux-instr))))
-    ((pre-indirect-B)
-     (let ((aux-instr (vector-ref core (+ ptr num))))
-       (instr-set-B-num! aux-instr (- 1 (instr-B-num aux-instr)))
-       (+ num (instr-B-num aux-instr))))
-    ((post-indirect-A)
-     (let* ((aux-instr (vector-ref core (+ ptr num)))
-            (old-A-num (instr-A-num aux-instr)))
-       (instr-set-A-num! aux-instr (+ 1 (instr-A-num aux-instr)))
-       (+ num old-A-num)))
-    ((post-indirect-B)
-     (let* ((aux-instr (vector-ref core (+ ptr num)))
-            (old-B-num (instr-B-num aux-instr)))
-       (instr-set-B-num! aux-instr (+ 1 (instr-B-num aux-instr)))
-       (+ num old-B-num)))
-    (else
-     (error "Unrecognized mode" mode))))
+  (addr+ ptr
+         (case mode
+           ((immediate) 0)
+           ((direct) num)
+           ((indirect-A) (addr+ num ((core-get (addr+ ptr num)) 'A-num)))
+           ((indirect-B) (addr+ num ((core-get (addr+ ptr num)) 'B-num)))
+           ((pre-indirect-A)
+            (let ((aux-instr (core-get (addr+ ptr num))))
+              (instr-set-A-num! aux-instr (addr+ -1 (aux-instr 'A-num)))
+              (addr+ num (aux-instr 'A-num))))
+           ((pre-indirect-B)
+            (let ((aux-instr (core-get (addr+ ptr num))))
+              (instr-set-B-num! aux-instr (addr+ -1 (aux-instr 'B-num)))
+              (addr+ num (aux-instr 'B-num))))
+           ((post-indirect-A)
+            (let* ((aux-instr (core-get (addr+ ptr num)))
+                   (old-A-num (aux-instr 'A-num)))
+              (instr-set-A-num! aux-instr (addr+ 1 (aux-instr 'A-num)))
+              (addr+ num old-A-num)))
+           ((post-indirect-B)
+            (let* ((aux-instr (core-get (addr+ ptr num)))
+                   (old-B-num (aux-instr 'B-num)))
+              (instr-set-B-num! aux-instr (addr+ 1 (aux-instr 'B-num)))
+              (addr+ num old-B-num)))
+           (else
+            (error "Unrecognized mode" mode)))))