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

diff --git a/ez.el b/ez.el
index 8ebed7b..af348a9 100644
--- a/ez.el
+++ b/ez.el
@@ -55,6 +55,14 @@
         new-s
       (binformat d new-s))))
 
+(defun ez-list-to-string-hex (l)
+  (concat "("
+          (when l
+            (concat
+             (format "%x" (car l))
+             (apply 'concat (mapcar (lambda (n) (format " %x" n)) (cdr l)))))
+          ")"))
+
 ;; Memory
 
 (defvar ez-memory nil
@@ -106,10 +114,14 @@
 (defun ez-get-global-var (gvar)
   (if (> gvar 239)
       (error "Invalid global variable %d" gvar))
-  (ez-mem-ref-word (+ (* 2 gvar) ez-globalvartab-addr)))
+  (let ((val
+         (ez-mem-ref-word (+ (* 2 gvar) ez-globalvartab-addr))))
+    (message "\tRetrieved %x from global variable %x" val gvar)
+    val))
 
 (defun ez-set-global-var (gvar val)
-  (ez-mem-set-word (+ (* 2 gvar) ez-globalvartab-addr) val))
+  (ez-mem-set-word (+ (* 2 gvar) ez-globalvartab-addr) val)
+  (message "\tSet global variabl %x to %x" gvar val))
 
 ;; Object tree
 
@@ -120,46 +132,43 @@
   (dotimes (i 31)
     (aset ez-property-defaults i (aref ez-memory (+ ez-objtab-addr (* 2 i))))))
 
-(defun ez-get-obj-addr (obj-id)
-  (+ ez-objtab-addr (* 2 31) (* 9 (- obj-id 1))))
+(defun ez-get-obj-addr (obj)
+  (+ ez-objtab-addr (* 2 31) (* 9 (- obj 1))))
 
-(defun ez-get-obj-parent (obj-id)
-  (let ((addr (ez-get-obj-addr obj-id)))
+(defun ez-get-obj-parent (obj)
+  (let ((addr (ez-get-obj-addr obj)))
     (ez-mem-ref-byte (+ addr 4))))
 
-(defun ez-get-obj-sibling (obj-id)
-  (let ((addr (ez-get-obj-addr obj-id)))
+(defun ez-set-obj-parent (obj new-parent)
+  (let ((addr (ez-get-obj-addr obj)))
+    (ez-mem-set-byte (+ addr 4) new-parent)))
+
+(defun ez-get-obj-sibling (obj)
+  (let ((addr (ez-get-obj-addr obj)))
     (ez-mem-ref-byte (+ addr 5))))
 
-(defun ez-get-obj-child (obj-id)
-  (let ((addr (ez-get-obj-addr obj-id)))
+(defun ez-set-obj-sibling (obj new-sibling)
+  (let ((addr (ez-get-obj-addr obj)))
+    (ez-mem-set-byte (+ addr 5) new-sibling)))
+
+(defun ez-get-obj-child (obj)
+  (let ((addr (ez-get-obj-addr obj)))
     (ez-mem-ref-byte (+ addr 6))))
 
-(defun ez-get-obj-plist-addr (obj-id)
-  (let ((addr (ez-get-obj-addr obj-id)))
+(defun ez-set-obj-child (obj new-child)
+  (let ((addr (ez-get-obj-addr obj)))
+    (ez-mem-set-byte (+ addr 6) new-child)))
+
+(defun ez-get-obj-plist-addr (obj)
+  (let ((addr (ez-get-obj-addr obj)))
     (ez-mem-ref-word (+ addr 7))))
 
-(defun ez-get-obj-name (obj-id)
-  (let ((plist-addr (ez-get-obj-plist-addr obj-id)))
+(defun ez-get-obj-name (obj)
+  (let ((plist-addr (ez-get-obj-plist-addr obj)))
     (if (> (ez-mem-ref-byte plist-addr) 0)
-        (ez-get-zstring (+ 1 (ez-get-obj-plist-addr obj-id)))
+        (ez-get-zstring (+ 1 (ez-get-obj-plist-addr obj)))
       nil)))
 
-(defun ez-get-obj (obj-id)
-  (let ((addr (+ ez-objtab-addr
-                 (* 2 31)
-                 (* 9 (- obj-id 1)))))
-    (list
-     obj-id
-     (ez-mem-ref-byte (+ addr 4))
-     (ez-mem-ref-byte (+ addr 5))
-     (ez-mem-ref-byte (+ addr 6))
-     (ez-mem-ref-word (+ addr 7))
-     (let ((plist-addr (ez-mem-ref-word (+ addr 7))))
-       (if (> (ez-mem-ref-byte plist-addr) 0)
-           (ez-get-zstring (+ 1 plist-addr))
-         nil)))))
-
 (defun ez-get-prop-default (prop)
   (ez-mem-ref-word (+ ez-objtab-addr (* 2 (+ 1 prop)))))
 
@@ -222,6 +231,26 @@
             (and (not current-set) (> val 0)))
         (ez-mem-set-byte byte-addr (logxor byte bit-mask)))))
 
+
+(defun ez-remove-obj (obj)
+  (let ((parent (ez-get-obj-parent obj))
+        (sibling (ez-get-obj-sibling obj)))
+    (unless (= parent 0)
+      (let ((child (ez-get-obj-child parent)))
+        (if (= child obj)
+            (ez-set-obj-child parent sibling)
+          (while (not (= obj (ez-get-obj-sibling child)))
+            (setq child (ez-get-obj-sibling child)))
+          (ez-set-obj-sibling child (ez-get-obj-sibling obj))))
+      (ez-set-obj-parent obj 0))
+    (ez-set-obj-sibling obj 0)))
+
+(defun ez-insert-obj (obj new-parent)
+  (ez-remove-obj obj)
+  (unless (= new-parent 0)
+    (ez-set-obj-sibling obj (ez-get-obj-child new-parent))
+    (ez-set-obj-child new-parent obj)))
+
 ;; Z-strings
 
 (defvar ez-zstring-alphabets
@@ -305,20 +334,25 @@
 
 (defun ez-routine-stack-push (val)
   (let ((frame (car ez-call-stack)))
+    (message "\tPushed %x to stack" val)
     (setf (elt frame 1) (cons val (elt frame 1)))))
 
 (defun ez-routine-stack-pop ()
   (let* ((frame (car ez-call-stack))
          (rs-head (car (elt frame 1))))
     (setf (elt frame 1) (cdr (elt frame 1)))
+    (message "\tPopped %x from stack" rs-head)
     rs-head))
 
 (defun ez-get-local-var (lvar)
-  (let ((frame (car ez-call-stack)))
-    (aref (elt frame 2) (- lvar 1))))
+  (let* ((frame (car ez-call-stack))
+         (val (aref (elt frame 2) (- lvar 1))))
+    (message "\tRetrieved value %x from local variable %x" val lvar)
+    val))
 
 (defun ez-set-local-var (lvar val)
   (let ((frame (car ez-call-stack)))
+    (message "\tSet local variable %x to %x" lvar val)
     (aset (elt frame 2) (- lvar 1) val)))
 
 (defun ez-get-pc ()
@@ -427,10 +461,11 @@
     (let ((table-row (assoc (list optype opcode) ez-op-table)))
       (unless table-row
         (error "Unsupported op PC:%x Optype:%s Opcode:%x Operands:%s Operand-types:%s"
-               instr-pc optype opcode operands operand-types))
+               instr-pc optype opcode (ez-list-to-string-hex operands) operand-types))
       (let ((mnemonic (elt table-row 1)))
         (message "PC:%x Optype:%s Opcode:%x Mnemonic:%s Operands:%s Operand-types:%s"
-                 instr-pc optype opcode mnemonic operands operand-types))
+                 instr-pc optype opcode mnemonic
+                 (ez-list-to-string-hex operands) operand-types))
       (funcall (elt table-row 2) operands operand-types))))
 
 (defun ez-read-var-operands-and-inc ()
@@ -439,15 +474,15 @@
                   (if (= type1 #b11)
                       nil
                     (cons type1
-                          (let ((type2 (lsh (logand #b110000 type-byte) -4)))
+                          (let ((type2 (mod (lsh type-byte -4) 4)))
                             (if (= type2 #b11)
                                 nil
                               (cons type2
-                                    (let ((type3 (lsh (logand #b1100 type-byte) -2)))
+                                    (let ((type3 (mod (lsh type-byte -2) 4)))
                                       (if (= type3 #b11)
                                           nil
                                         (cons type3
-                                              (let ((type4 (logand #b11)))
+                                              (let ((type4 (mod type-byte 4)))
                                                 (if (= type4 #b11)
                                                     nil
                                                   (list type4))))))))))))))
@@ -500,6 +535,7 @@
     ((1op #x05) inc ez-op-inc)
     ((1op #x06) dec ez-op-dec)
     ((1op #x0B) ret ez-op-ret)
+    ((0op #x08) ret_pulled ez-op-ret-pulled)
     ((1op #x0C) jump ez-op-jump)
     ((2op #x05) inc_jg ez-op-inc-jg)
     ((2op #x04) dec_jg ez-op-dec-jg)
@@ -510,6 +546,10 @@
     ((var #x02) storeb ez-op-storeb)
     ((2op #x10) loadb ez-op-loadb)
     ((2op #x01) je ez-op-je)
+    ((2op #x02) jl ez-op-jl)
+    ((2op #x03) jg ez-op-jg)
+    ((2op #x06) jin ez-op-jin)
+    ((2op #x07) test ez-op-test)
     ((2op #x08) or ez-op-or)
     ((2op #x09) and ez-op-and)
     ((2op #x14) add ez-op-add)
@@ -517,23 +557,36 @@
     ((2op #x16) mul ez-op-mul)
     ((2op #x17) div ez-op-div)
     ((2op #x18) mod ez-op-mod)
-    ((var #x00) call_fv ez-op-callf)
+    ((var #x00) call_fv ez-op-callfv)
     ((1op #x01) get_sibling ez-op-get-sibling)
     ((1op #x02) get_child ez-op-get-child)
     ((1op #x03) get_parent ez-op-get-parent)
     ((2op #x0A) test_attr ez-op-test-attr)
+    ((2op #x0B) set_attr ez-op-set-attr)
+    ((2op #x0C) clear_attr ez-op-clear-attr)
+    ((1op #x09) remove_obj ez-op-remove-obj)
+    ((2op #x0E) insert_obj ez-op-insert-obj)
     ((var #x03) put_prop ez-op-put-prop)
+    ((2op #x11) get_prop ez-op-get-prop)
     ((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)))
+    ((var #x05) print_char ez-op-print-char)
+    ((1op #x0A) print_obj ez-op-print-obj)))
 
 (defun ez-op-ret (operands &optional operand-types)
   (let ((retval (car operands)))
+    (message "\tReturning value %x" retval)
     (ez-pop-call-stack-frame)
     (ez-set-var (ez-read-pc-byte-and-inc) retval))
   t)
 
+(defun ez-op-ret-pulled (operands operand-types)
+  (let ((retval (ez-routine-stack-pop)))
+    (message "\tReturning value %x" retval)
+    (ez-op-ret (list retval)))
+  t)
+
 (defun ez-op-rtrue (&optional operands operand-types)
   (ez-op-ret (list 1))
   t)
@@ -574,6 +627,18 @@
     (ez-op-jl (cons (ez-get-var var) (cdr operands)) (cons 'w (cdr operand-types))))
   t)
 
+(defun ez-op-jin (operands operand-types)
+  (let ((obj (car operands))
+        (n (cadr operands)))
+    (ez-do-branch (or (= n 0)
+                      (= n (ez-get-obj-parent obj)))))
+  t)
+
+(defun ez-op-test (operands operand-types)
+  (let ((a (car operands))
+        (b (cadr operands)))
+    (ez-do-branch (= (logand a b) b)))
+  t)
 
 (defun ez-op-jump (operands operand-types)
   (let ((offset (if (eq (car operand-types) 'b)
@@ -665,18 +730,20 @@
 (defun ez-op-mod (a b)
   (error "Not implemented"))
 
-(defun ez-op-callf (operands operand-types)
+(defun ez-op-callfv (operands operand-types)
   (let* ((raddr (car operands))
          (call-operands (cdr operands))
          (r (* 2 raddr))
          (L (ez-mem-ref-byte r))
          (n (length call-operands))
          (new-pc (+ r 1 (* L 2))))
-    (ez-add-call-stack-frame new-pc)
-    (dotimes (i L)
-      (if (< i n)
-          (ez-set-local-var (+ i 1) (elt call-operands i))
-        (ez-set-local-var (+ i 1) (ez-mem-ref-word (+ r 1 (* 2 i)))))))
+    (if (= raddr 0)
+        (ez-set-var (ez-read-pc-byte-and-inc) 0) ; Simply return 0
+      (ez-add-call-stack-frame new-pc)
+      (dotimes (i L)
+        (if (< i n)
+            (ez-set-local-var (+ i 1) (elt call-operands i))
+          (ez-set-local-var (+ i 1) (ez-mem-ref-word (+ r 1 (* 2 i))))))))
   t)
 
 (defun ez-op-test-attr (operands operand-types)
@@ -685,30 +752,59 @@
     (ez-do-branch (= 1 (ez-get-obj-attr obj attr)))
     t))
 
+(defun ez-op-set-attr (operands operand-types)
+  (let ((obj (car operands))
+        (attr (cadr operands)))
+    (ez-set-obj-attr obj attr 1))
+  t)
+
+(defun ez-op-clear-attr (operands operand-types)
+  (let ((obj (car operands))
+        (attr (cadr operands)))
+    (ez-set-obj-attr obj attr 0))
+  t)
+
 (defun ez-op-get-sibling (operands operand-types)
   (let ((sib (ez-get-obj-sibling (car operands))))
     (ez-set-var (ez-read-pc-byte-and-inc) sib)
-    (ez-do-branch (> sib 0))
-    t))
+    (ez-do-branch (> sib 0)))
+  t)
 
 (defun ez-op-get-child (operands operand-types)
   (let ((child (ez-get-obj-child (car operands))))
     (ez-set-var (ez-read-pc-byte-and-inc) child)
-    (ez-do-branch (> child 0))
-    t))
+    (ez-do-branch (> child 0)))
+  t)
 
 (defun ez-op-get-parent (operands operand-types)
   (let ((parent (ez-get-obj-parent (car operands))))
-    (ez-set-var (ez-read-pc-byte-and-inc) parent)
-    (ez-do-branch (> parent 0))
-    t))
+    (ez-set-var (ez-read-pc-byte-and-inc) parent))
+  t)
+
+(defun ez-op-remove-obj (operands operand-types)
+  (let ((obj (car operands)))
+    (ez-remove-obj obj))
+  t)
+
+(defun ez-op-insert-obj (operands operand-types)
+  (let ((obj1 (car operands))
+        (obj2 (cadr operands)))
+    (ez-insert-obj obj1 obj2))
+  t)
 
 (defun ez-op-put-prop (operands operand-types)
   (let* ((obj (car operands))
          (prop (cadr operands))
          (a (caddr operands)))
-    (ez-set-obj-prop obj prop a)
-    t))
+    (ez-set-obj-prop obj prop a))
+  t)
+
+(defun ez-op-get-prop (operands operand-types)
+  (let* ((obj (car operands))
+         (prop (cadr operands)))
+    (ez-set-var (ez-read-pc-byte-and-inc)
+                (ez-get-obj-prop obj prop)))
+  t)
 
 (defun ez-op-print (operands operand-types)
   (let* ((word-count-and-string (ez-get-zstring-and-length (ez-get-pc)))
@@ -732,6 +828,10 @@
     (ez-print (string c)))
   t)
 
+(defun ez-op-print-obj (operands operand-types)
+  (let ((obj (car operands)))
+    (ez-print (ez-get-obj-name obj)))
+  t)
 
 ;; Execution loop
 
@@ -746,52 +846,24 @@
 ;;; Buffer and I/O
 ;;
 
-(defun ez-render-prompt ()
-  (with-current-buffer "*ez*"
-    (let ((update-point (= ez-input-marker (point)))
-          (update-window-points (mapcar (lambda (w)
-                                          (list (= (window-point w) ez-input-marker)
-                                                w))
-                                        (get-buffer-window-list nil nil t))))
-      (save-excursion
-        (set-marker-insertion-type ez-prompt-marker nil)
-        (set-marker-insertion-type ez-input-marker t)
-        (let ((inhibit-read-only t))
-          (delete-region ez-prompt-marker ez-input-marker)
-          (goto-char ez-prompt-marker)
-          (insert
-           ">"
-           (propertize " " ; Need this to be separate to mark it as rear-nonsticky
-                       'read-only t
-                       'rear-nonsticky t)))
-        (set-marker-insertion-type ez-input-marker nil))
-      (goto-char ez-input-marker))))
-
-(defvar ez-prompt-marker nil
-  "Marker for prompt position in buffer.")
-
 (defvar ez-input-marker nil
-  "Marker for prompt position in buffer.")
+  "Marker for input position in buffer.")
 
 (defun ez-setup-buffer ()
   (with-current-buffer (get-buffer-create "*ez*")
     (let ((inhibit-read-only t))
       (delete-region (point-min) (point-max)))
     (setq-local scroll-conservatively 1)
-    (if (markerp ez-prompt-marker)
-        (set-marker ez-prompt-marker (point-max))
-      (setq ez-prompt-marker (point-max-marker)))
     (if (markerp ez-input-marker)
         (set-marker ez-input-marker (point-max))
       (setq ez-input-marker (point-max-marker)))
-    (goto-char (point-max))
-    (ez-render-prompt)))
+    (goto-char (point-max))))
 
 
 (defun ez-print (string)
   (with-current-buffer "*ez*"
     (save-excursion
-      (goto-char ez-prompt-marker)
+      (goto-char ez-input-marker)
       (insert-before-markers string))))
 
 ;; Mode