X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=ez.git;a=blobdiff_plain;f=ez.el;h=8ebed7ba13fd95c74a4da5299856d9f2d88b97b2;hp=2fa15b717a50758a9257d5aeef3892c6e9cfbcad;hb=32d17abc28fc2ea0a15d701027f64a8d108c0358;hpb=0bd73fc1b7524bf64d416f5d311e9775a8afb913

diff --git a/ez.el b/ez.el
index 2fa15b7..8ebed7b 100644
--- a/ez.el
+++ b/ez.el
@@ -41,6 +41,11 @@
 (defun ez-decode-signed-word (w)
   (ez-decode-signed-bits w 16))
 
+(defun ez-decode-signed-operand (operand operand-type)
+  (if (eq operand-type 'b)
+      (ez-decode-signed-byte operand)
+    (ez-decode-signed-word operand)))
+
 (defun binformat (n &optional s)
   (unless s
     (setq s ""))
@@ -59,7 +64,7 @@
 
 (defvar ez-start-pc nil)
 (defvar ez-himem-base nil)
-(defvar ez-dict-addr nil)
+(defvar ez-dict-base nil)
 (defvar ez-objtab-addr nil)
 (defvar ez-abbrevtab-addr nil)
 (defvar ez-globalvartab-addr nil)
@@ -99,6 +104,8 @@
 ;; Global variables
 
 (defun ez-get-global-var (gvar)
+  (if (> gvar 239)
+      (error "Invalid global variable %d" gvar))
   (ez-mem-ref-word (+ (* 2 gvar) ez-globalvartab-addr)))
 
 (defun ez-set-global-var (gvar val)
@@ -231,31 +238,35 @@
         (logand (lsh word -5) #b11111)
         (logand word #b11111)))
 
-(defun ez-get-zstring-chars (base-addr)
+(defun ez-get-zstring-chars-and-length (base-addr)
   (let ((addr base-addr)
         (chars nil)
-        (not-done t))
+        (not-done t)
+        (word-count 0))
     (while not-done
       (let ((components (ez-parse-zstring-word (ez-mem-ref-word addr))))
         (setq chars (append chars (cdr components)))
         (setq addr (+ addr 2))
+        (setq word-count (+ word-count 1))
         (when (= (car components) 1)
           (setq not-done nil))))
-    chars))
-
-(defun ez-get-zstring (base-addr)
-  (let ((chars (ez-get-zstring-chars base-addr))
-        (cur 0)
-        (lock 0)
-        (abbrev-char nil)
-        (s ""))
+    (cons word-count chars)))
+
+(defun ez-get-zstring-and-length (base-addr)
+  (let* ((word-count-and-chars (ez-get-zstring-chars-and-length base-addr))
+         (word-count (car word-count-and-chars))
+         (chars (cdr word-count-and-chars))
+         (cur 0)
+         (lock 0)
+         (abbrev-char nil)
+         (s ""))
     (dolist (char chars)
       (cond
        (abbrev-char
         (let ((abbrev-addr
                (* 2 (ez-mem-ref-word (+ ez-abbrevtab-addr
                                         (* 2 (+ (* (- abbrev-char 1) 32) char)))))))
-          (setq s (concat s (ez-get-zstring abbrev-addr))))
+          (setq s (concat s (cdr (ez-get-zstring-and-length abbrev-addr)))))
         (setq abbrev-char nil))
        ((memq char '(1 2 3)) ;Abbreviation
         (setq abbrev-char char))
@@ -267,7 +278,10 @@
         (setq s (concat s (substring (elt ez-zstring-alphabets cur)
                                      char (+ char 1))))
         (setq cur lock))))
-    s))
+    (cons word-count s)))
+
+(defun ez-get-zstring (base-addr)
+  (cdr (ez-get-zstring-and-length base-addr)))
 
 
 ;; Call stack
@@ -352,9 +366,7 @@
 (defun ez-execute-instr ()
   (let ((instr-pc (ez-get-pc))
         (opbyte (ez-read-pc-byte-and-inc))
-        (optype)
-        (opcode nil)
-        (operands))
+        (optype) (opcode) (operands))
     (cond
      ((<= #x0 opbyte #x1f)
       (setq optype '2op
@@ -401,7 +413,11 @@
             operands '()
             operand-types '()))
      ((<= #xC0 opbyte #xDF)
-      (error "Unsupported op %x" opbyte))
+      (setq optype '2op
+            opcode (- opbyte #xc0))
+      (let ((operands-and-types (ez-read-var-operands-and-inc)))
+        (setq operands (car operands-and-types)
+              operand-types (cdr operands-and-types))))
      ((<= #xE0 opbyte #xFF)
       (setq optype 'var
             opcode (- opbyte #xe0))
@@ -481,12 +497,18 @@
   '(((0op #x00) rtrue ez-op-rtrue)
     ((0op #x01) rfalse ez-op-rfalse)
     ((1op #x00) jz ez-op-jz)
+    ((1op #x05) inc ez-op-inc)
+    ((1op #x06) dec ez-op-dec)
     ((1op #x0B) ret ez-op-ret)
     ((1op #x0C) jump ez-op-jump)
+    ((2op #x05) inc_jg ez-op-inc-jg)
+    ((2op #x04) dec_jg ez-op-dec-jg)
     ((2op #x0D) store ez-op-store)
     ((1op #x0E) load ez-op-load)
     ((var #x01) storew ez-op-storew)
     ((2op #x0F) loadw ez-op-loadw)
+    ((var #x02) storeb ez-op-storeb)
+    ((2op #x10) loadb ez-op-loadb)
     ((2op #x01) je ez-op-je)
     ((2op #x08) or ez-op-or)
     ((2op #x09) and ez-op-and)
@@ -501,7 +523,10 @@
     ((1op #x03) get_parent ez-op-get-parent)
     ((2op #x0A) test_attr ez-op-test-attr)
     ((var #x03) put_prop ez-op-put-prop)
-    ((0op #x02) print ez-op-print)))
+    ((0op #x02) print ez-op-print)
+    ((0op #x0B) new_line ez-op-new-line)
+    ((var #x06) print_num ez-op-print-num)
+    ((var #x05) print_char ez-op-print-char)))
 
 (defun ez-op-ret (operands &optional operand-types)
   (let ((retval (car operands)))
@@ -525,6 +550,31 @@
   (ez-do-branch (memq (car operands) (cdr operands)))
   t)
 
+(defun ez-op-jg (operands operand-types)
+  (let ((s1 (ez-decode-signed-operand (car operands) (car operand-types)))
+        (s2 (ez-decode-signed-operand (cadr operands) (cadr operand-types))))
+    (ez-do-branch (> s1 s2)))
+  t)
+
+(defun ez-op-jl (operands operand-types)
+  (let ((s1 (ez-decode-signed-operand (car operands) (car operand-types)))
+        (s2 (ez-decode-signed-operand (cadr operands) (cadr operand-types))))
+    (ez-do-branch (< s1 s2)))
+  t)
+
+(defun ez-op-inc-jg (operands operand-types)
+  (let ((var (car operands)))
+    (ez-op-inc (list var))
+    (ez-op-jg (cons (ez-get-var var) (cdr operands)) (cons 'w (cdr operand-types))))
+  t)
+
+(defun ez-op-dec-jl (operands operand-types)
+  (let ((var (car operands)))
+    (ez-op-dec (list var))
+    (ez-op-jl (cons (ez-get-var var) (cdr operands)) (cons 'w (cdr operand-types))))
+  t)
+
+
 (defun ez-op-jump (operands operand-types)
   (let ((offset (if (eq (car operand-types) 'b)
                     (ez-decode-signed-byte (car operands))
@@ -532,6 +582,16 @@
     (ez-set-pc (+ (ez-get-pc) offset -2)))
   t)
 
+(defun ez-op-inc (operands &optional operand-types)
+  (let ((var (car operands)))
+    (ez-set-var var (mod (+ 1 (ez-get-var var)) #x10000)))
+  t)
+
+(defun ez-op-dec (operands &optional operand-types)
+  (let ((var (car operands)))
+    (ez-set-var var (mod (+ (ez-get-var var) 1) #x10000)))
+  t)
+
 (defun ez-op-store (operands operand-types)
   (let ((var (car operands))
         (a (cadr operands)))
@@ -556,6 +616,19 @@
     (ez-set-var (ez-read-pc-byte-and-inc) (ez-mem-ref-word (+ baddr (* 2 n)))))
   t)
 
+(defun ez-op-storeb (operands operand-types)
+  (let ((baddr (car operands))
+        (n (cadr operands))
+        (a (caddr operands)))
+    (ez-mem-set-byte (+ baddr n) a))
+  t)
+
+(defun ez-op-loadb (operands operand-types)
+  (let ((baddr (car operands))
+        (n (cadr operands)))
+    (ez-set-var (ez-read-pc-byte-and-inc) (ez-mem-ref-byte (+ baddr n))))
+  t)
+
 (defun ez-op-and (operands operand-types)
   (let ((a (car operands))
         (b (cadr operands)))
@@ -638,7 +711,25 @@
     t))
 
 (defun ez-op-print (operands operand-types)
-  (ez-print (ez-get-zstring (ez-get-pc)))
+  (let* ((word-count-and-string (ez-get-zstring-and-length (ez-get-pc)))
+         (word-count (car word-count-and-string))
+         (string (cdr word-count-and-string)))
+    (ez-print string)
+    (ez-increment-pc (* 2 word-count)))
+  t)
+
+(defun ez-op-new-line (operands operand-types)
+  (ez-print "\n")
+  t)
+
+(defun ez-op-print-num (operands operand-types)
+  (let ((s (ez-decode-signed-operand (car operands) (car operand-types))))
+    (ez-print (number-to-string s)))
+  t)
+
+(defun ez-op-print-char (operands operand-types)
+  (let ((c (car operands)))
+    (ez-print (string c)))
   t)