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

diff --git a/ez.el b/ez.el
index 9dcfdee..af348a9 100644
--- a/ez.el
+++ b/ez.el
@@ -474,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))))))))))))))
@@ -535,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)
@@ -546,7 +547,9 @@
     ((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)
@@ -578,6 +581,12 @@
     (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)
@@ -625,6 +634,12 @@
                       (= 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)
                     (ez-decode-signed-byte (car operands))
@@ -831,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