Fleshing out object functions.

[ez.git] / ez.el

diff --git a/ez.el b/ez.el
index 22a4c78..f1ef37e 100644 (file)
--- a/ez.el
+++ b/ez.el
@@ -30,8 +30,25 @@
 
 ;; Utility functions
 
 
 ;; Utility functions
 

+(defun ez-decode-signed-bits (n nbits)
+  (if (= 0 (lsh n (- 1 nbits)))
+      n
+    (- n (lsh 1 nbits))))
+

 (defun ez-decode-signed-byte (b)
 (defun ez-decode-signed-byte (b)

-  (lsh b ))
+  (ez-decode-signed-bits b 8))
+
+(defun ez-decode-signed-word (w)
+  (ez-decode-signed-bits w 16))
+
+(defun binformat (n &optional s)
+  (unless s
+    (setq s ""))
+  (let ((d (/ n 2))
+        (new-s (concat (number-to-string (mod n 2)) s)))
+    (if (= d 0)
+        new-s
+      (binformat d new-s))))

 
 ;; Memory
 
 
 ;; Memory
 


@@ -88,16 +105,6 @@
 
 ;; Object tree
 
 
 ;; Object tree
 

-(defun ez-make-obj (&optional name attribs props parent first-child next-sibling)
-    (list name attribs props parent first-child next-sibling))
-
-(defun ez-obj-name (obj) (elt obj 0))
-(defun ez-obj-attribs (obj) (elt obj 1))
-(defun ez-obj-props (obj) (elt obj 2))
-(defun ez-obj-parent (obj) (elt obj 3))
-(defun ez-obj-first-child (obj) (elt obj 4))
-(defun ez-obj-next-sibling (obj) (elt obj 5))
-

 (defvar ez-property-defaults nil)
 
 (defun ez-load-property-defaults ()
 (defvar ez-property-defaults nil)
 
 (defun ez-load-property-defaults ()


@@ -105,6 +112,31 @@
   (dotimes (i 31)
     (aset ez-property-defaults i (aref ez-memory (+ ez-objtab-addr (* 2 i))))))
 
   (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-parent (obj-id)
+  (let ((addr (ez-get-obj-addr obj-id)))
+    (ez-mem-ref-byte (+ addr 4))))
+
+(defun ez-get-obj-sibling (obj-id)
+  (let ((addr (ez-get-obj-addr obj-id)))
+    (ez-mem-ref-byte (+ addr 5))))
+
+(defun ez-get-obj-child (obj-id)
+  (let ((addr (ez-get-obj-addr obj-id)))
+    (ez-mem-ref-byte (+ addr 6))))
+
+(defun ez-get-obj-plist-addr (obj-id)
+  (let ((addr (ez-get-obj-addr obj-id)))
+    (ez-mem-ref-word (+ addr 7))))
+
+(defun ez-get-obj-name (obj-id)
+  (let ((plist-addr (ez-get-obj-plist-addr obj-id)))
+    (if (> (ez-mem-ref-byte plist-addr) 0)
+        (ez-get-zstring (+ 1 (ez-get-obj-plist-addr obj-id)))
+      nil)))
+

 (defun ez-get-obj (obj-id)
   (let ((addr (+ ez-objtab-addr
                  (* 2 31)
 (defun ez-get-obj (obj-id)
   (let ((addr (+ ez-objtab-addr
                  (* 2 31)


@@ -118,7 +150,7 @@
      (let ((plist-addr (ez-mem-ref-word (+ addr 7))))
        (if (> (ez-mem-ref-byte plist-addr) 0)
            (ez-get-zstring (+ 1 plist-addr))
      (let ((plist-addr (ez-mem-ref-word (+ addr 7))))
        (if (> (ez-mem-ref-byte plist-addr) 0)
            (ez-get-zstring (+ 1 plist-addr))

-         "")))))
+         nil)))))

 
 
 ;; Z-strings
 
 
 ;; Z-strings


@@ -166,9 +198,9 @@
        ((memq char '(1 2 3)) ;Abbreviation
         (setq abbrev-char char))
        ((= char 4)
        ((memq char '(1 2 3)) ;Abbreviation
         (setq abbrev-char char))
        ((= char 4)

-        (setq cur (mod (+ cur 1) 2)))
+        (setq cur (mod (+ cur 1) 3)))

        ((= char 5)
        ((= char 5)

-        (setq cur (mod (+ 2 (- cur 1)) 2)))
+        (setq cur (mod (+ 3 (- cur 1)) 3)))

        (t 
         (setq s (concat s (substring (elt ez-zstring-alphabets cur)
                                      char (+ char 1))))
        (t 
         (setq s (concat s (substring (elt ez-zstring-alphabets cur)
                                      char (+ char 1))))


@@ -314,7 +346,7 @@
               operand-types (cdr operands-and-types)))))
     (let ((table-row (assoc (list optype opcode) ez-op-table)))
       (unless table-row
               operand-types (cdr operands-and-types)))))
     (let ((table-row (assoc (list optype opcode) ez-op-table)))
       (unless table-row

-        (error "Unsupported op" optype opcode))
+        (error "Unsupported op" instr-pc optype opcode operands operand-types))

       (let ((mnemonic (elt table-row 1)))
         (message "PC:%x Optype:%s Opcode:%x Mnemonic:%s Operands:%s"
                  instr-pc optype opcode mnemonic operands))
       (let ((mnemonic (elt table-row 1)))
         (message "PC:%x Optype:%s Opcode:%x Mnemonic:%s Operands:%s"
                  instr-pc optype opcode mnemonic operands))


@@ -353,34 +385,132 @@
         (if (= type 1)
             'b
           'w))
         (if (= type 1)
             'b
           'w))

-      types)))))
+      types))))
+
+;; Branches
+
+(defun ez-do-branch (branch)
+  (let* ((branch-byte (ez-read-pc-byte-and-inc))
+         (invert (= 0 (logand branch-byte #b10000000)))
+         (single-byte (= 1 (logand branch-byte #b01000000)))
+         (offset
+          (if single-byte
+              (logand branch-byte #b00111111)
+            (let ((pos (= (logand branch-byte #b00100000) 0))
+                  (val (+ (* 256 (logand branch-byte #b00011111))
+                          (ez-read-pc-byte-and-inc))))
+              (if pos
+                  val
+                (- val 8192))))))
+    (cond
+     ((= offset 0)
+      (ez-op-rfalse))
+     ((= offset 1)
+      (ez-op-rtrue))
+     (t
+      (ez-set-pc (+ (ez-get-pc) offset -2))))))
+
+;; Operations

 
 (defvar ez-op-table
 
 (defvar ez-op-table

-  '(((2op #x14) add ez-op-add)
+  '(((0op #x00) rtrue ez-op-rtrue)
+    ((0op #x01) rfalse ez-op-rfalse)
+    ((1op #x00) jz ez-op-jz)
+    ((1op #x0B) ret ez-op-ret)
+    ((1op #x0C) jump ez-op-jump)
+    ((2op #x0D) store ez-op-store)
+    ((1op #x0E) load ez-op-load)
+    ((var #x01) storew ez-op-storew)
+    ((2op #x01) je ez-op-je)
+    ((2op #x08) or ez-op-or)
+    ((2op #x09) and ez-op-and)
+    ((2op #x14) add ez-op-add)

     ((2op #x15) sub ez-op-sub)
     ((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)))
 
     ((2op #x15) sub ez-op-sub)
     ((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)))
 

+(defun ez-op-ret (operands &optional operand-types)
+  (let ((retval (car operands)))
+    (ez-pop-call-stack-frame)
+    (ez-set-var (ez-read-pc-byte-and-inc) retval))
+  t)
+
+(defun ez-op-rtrue (&optional operands operand-types)
+  (ez-op-ret (list 1)))
+
+(defun ez-op-rfalse (&optional operands operand-types)
+  (ez-op-ret (list 0)))
+
+(defun ez-op-jz (operands operand-types)
+  (ez-do-branch (= (car operands) 0))
+  t)
+
+(defun ez-op-je (operands operand-types)
+  (ez-do-branch (memq (car operands) (cdr operands)))
+  t)
+
+(defun ez-op-jump (operands operand-types)
+  (let ((offset (if (eq (car operand-types) 'b)
+                    (ez-decode-signed-byte (car operands))
+                  (ez-decode-signed-word (car operands)))))
+    (ez-set-pc (+ (ez-get-pc) offset -2)))
+  t)
+
+(defun ez-op-store (operands operand-types)
+  (let ((var (car operands))
+        (a (cadr operands)))
+    (ez-set-var var a))
+  t)
+
+(defun ez-op-load (operands operand-types)
+  (let ((var (car operands)))
+    (ez-set-var (ez-read-pc-byte-and-inc) (ez-get-var var)))
+  t)
+
+(defun ez-op-storew (operands operand-types)
+  (let ((baddr (car operands))
+        (n (cadr operands))
+        (a (caddr operands)))
+    (ez-mem-set-word (+ baddr (* 2 n)) a))
+  t)
+
+(defun ez-op-and (operands operand-types)
+  (let ((a (car operands))
+        (b (cadr operands)))
+    (ez-set-var (ez-read-pc-byte-and-inc) (logand a b)))
+  t)
+
+(defun ez-op-or (operands operand-types)
+  (let ((a (car operands))
+        (b (cadr operands)))
+    (ez-set-var (ez-read-pc-byte-and-inc) (logior a b)))
+  t)
+

 (defun ez-op-add (operands operand-types)
   (let ((a (car operands))
         (b (cadr operands)))
 (defun ez-op-add (operands operand-types)
   (let ((a (car operands))
         (b (cadr operands)))

-    (ez-set-var (ez-read-pc-byte-and-inc) (mod (+ a b) #x10000))))
+    (ez-set-var (ez-read-pc-byte-and-inc) (mod (+ a b) #x10000)))
+  t)

 
 (defun ez-op-sub (operands operand-types)
   (let ((a (car operands))
         (b (cadr operands)))
 
 (defun ez-op-sub (operands operand-types)
   (let ((a (car operands))
         (b (cadr operands)))

-    (ez-set-var (ez-read-pc-byte-and-inc) (mod (+ (- a b) #x10000) #x10000))))
+    (ez-set-var (ez-read-pc-byte-and-inc) (mod (+ (- a b) #x10000) #x10000)))
+  t)

 
 (defun ez-op-mul (a b)
   (let ((a (car operands))
         (b (cadr operands)))
 
 (defun ez-op-mul (a b)
   (let ((a (car operands))
         (b (cadr operands)))

-    (ez-set-var (ez-read-pc-byte-and-inc) (mod (* a b) #x10000))))
+    (ez-set-var (ez-read-pc-byte-and-inc) (mod (* a b) #x10000)))
+  t)

 
 

-(defun ez-op-div (a b))
+(defun ez-op-div (a b)
+  (error "Not implemented"))

 
 

-(defun ez-op-mod (a b))
+(defun ez-op-mod (a b)
+  (error "Not implemented"))

 
 (defun ez-op-callf (operands operand-types)
   (let* ((raddr (car operands))
 
 (defun ez-op-callf (operands operand-types)
   (let* ((raddr (car operands))


@@ -411,16 +541,30 @@
 (ez-parse-header)
 (setq ez-call-stack (list (ez-make-call-stack-frame ez-start-pc)))
 (ez-execute-instr)
 (ez-parse-header)
 (setq ez-call-stack (list (ez-make-call-stack-frame ez-start-pc)))
 (ez-execute-instr)

+
+(while (ez-execute-instr))
+
+(binformat #x97)
+"10010111"
+(ez-get-obj 208)
+(binformat #x57)
+"01010111"
+
+
+

 ez-call-stack
 ez-call-stack

+((28281 nil [33807 0 180 47872 0 0 0 0 0 0 0 0 ...] nil) (22022 nil [33807 65535 0 0 0 0 0 0 0 0 0 0 ...] nil) (20715 nil [0 0 0 0 0 0 0 0 0 0 0 0 ...] nil))
+
+((22049 nil [33807 0 180 47872 0 0 0 0 0 0 0 0 ...] nil) (22022 nil [33807 65535 0 0 0 0 0 0 0 0 0 0 ...] nil) (20715 nil [0 0 0 0 0 0 0 0 0 0 0 0 ...] nil))
+
+
+
+
+
+
+
+

 
 

-(defun binformat (n &optional s)
-  (unless s
-    (setq s ""))
-  (let ((d (/ n 2))
-        (new-s (concat (number-to-string (mod n 2)) s)))
-    (if (= d 0)
-        new-s
-      (binformat d new-s))))