X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=ez.git;a=blobdiff_plain;f=ez.el;h=8ebed7ba13fd95c74a4da5299856d9f2d88b97b2;hp=181a37a444a5f70a8c410bc11a431652c92c2dbd;hb=32d17abc28fc2ea0a15d701027f64a8d108c0358;hpb=8455cb56b2ea86886949473c5e77175b9d713554

diff --git a/ez.el b/ez.el
index 181a37a..8ebed7b 100644
--- a/ez.el
+++ b/ez.el
@@ -64,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)
@@ -238,7 +238,7 @@
         (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)
@@ -252,8 +252,8 @@
           (setq not-done nil))))
     (cons word-count chars)))
 
-(defun ez-get-zstring (base-addr)
-  (let* ((word-count-and-chars (ez-get-zstring-chars base-addr))
+(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)
@@ -266,7 +266,7 @@
         (let ((abbrev-addr
                (* 2 (ez-mem-ref-word (+ ez-abbrevtab-addr
                                         (* 2 (+ (* (- abbrev-char 1) 32) char)))))))
-          (setq s (concat s (cdr (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))
@@ -280,6 +280,9 @@
         (setq cur lock))))
     (cons word-count s)))
 
+(defun ez-get-zstring (base-addr)
+  (cdr (ez-get-zstring-and-length base-addr)))
+
 
 ;; Call stack
 
@@ -504,6 +507,8 @@
     ((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)
@@ -520,7 +525,8 @@
     ((var #x03) put_prop ez-op-put-prop)
     ((0op #x02) print ez-op-print)
     ((0op #x0B) new_line ez-op-new-line)
-    ((var #x06) print_num ez-op-print-num)))
+    ((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)))
@@ -610,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)))
@@ -692,7 +711,7 @@
     t))
 
 (defun ez-op-print (operands operand-types)
-  (let* ((word-count-and-string (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)
@@ -708,6 +727,11 @@
     (ez-print (number-to-string s)))
   t)
 
+(defun ez-op-print-char (operands operand-types)
+  (let ((c (car operands)))
+    (ez-print (string c)))
+  t)
+
 
 ;; Execution loop