[Emacs-diffs] Changes to emacs/lisp/international/ccl.el

[Juanma Barranquero]

Index: emacs/lisp/international/ccl.el
diff -c emacs/lisp/international/ccl.el:1.30 
emacs/lisp/international/ccl.el:1.31
*** emacs/lisp/international/ccl.el:1.30        Wed Jul 17 06:32:38 2002
--- emacs/lisp/international/ccl.el     Fri Oct 18 04:49:58 2002
***************
*** 237,243 ****
  
  ;; If REG is a CCL register symbol (e.g. r0, r1...), the register
  ;; number is embedded.  If OP is one of unconditional jumps, DATA is
! ;; changed to an relative jump address.
  
  (defun ccl-embed-code (op reg data &optional reg2)
    (if (and (> data 0) (get op 'jump-flag))
--- 237,243 ----
  
  ;; If REG is a CCL register symbol (e.g. r0, r1...), the register
  ;; number is embedded.  If OP is one of unconditional jumps, DATA is
! ;; changed to a relative jump address.
  
  (defun ccl-embed-code (op reg data &optional reg2)
    (if (and (> data 0) (get op 'jump-flag))
***************
*** 509,515 ****
              (ccl-embed-data op)
              (ccl-embed-data arg))
          (ccl-check-register arg cmd)
!         (ccl-embed-code (if read-flag 'read-jump-cond-expr-register 
                            'jump-cond-expr-register)
                          rrr 0)
          (ccl-embed-data op)
--- 509,515 ----
              (ccl-embed-data op)
              (ccl-embed-data arg))
          (ccl-check-register arg cmd)
!         (ccl-embed-code (if read-flag 'read-jump-cond-expr-register
                            'jump-cond-expr-register)
                          rrr 0)
          (ccl-embed-data op)
***************
*** 707,713 ****
           (error "CCL: Invalid argument %s: %s" arg cmd)))
      (ccl-embed-code 'read-jump rrr ccl-loop-head))
    t)
!                           
  ;; Compile READ statement.
  (defun ccl-compile-read (cmd)
    (if (< (length cmd) 2)
--- 707,713 ----
           (error "CCL: Invalid argument %s: %s" arg cmd)))
      (ccl-embed-code 'read-jump rrr ccl-loop-head))
    t)
! 
  ;; Compile READ statement.
  (defun ccl-compile-read (cmd)
    (if (< (length cmd) 2)
***************
*** 899,905 ****
                        add 1))
                (setq arg (cdr arg)
                      len (+ len add)))
!             (if mp 
                  (cons (- len) result)
                result))))
      (setq arg (append (list (nth 0 cmd) (nth 1 cmd) (nth 2 cmd))
--- 899,905 ----
                        add 1))
                (setq arg (cdr arg)
                      len (+ len add)))
!             (if mp
                  (cons (- len) result)
                result))))
      (setq arg (append (list (nth 0 cmd) (nth 1 cmd) (nth 2 cmd))
***************
*** 990,996 ****
         (rrr (ash (logand code 255) -5))
         (cc (ash code -8)))
      (insert (format "%5d:[%s] " (1- ccl-current-ic) cmd))
!     (funcall (get cmd 'ccl-dump-function) rrr cc))) 
  
  (defun ccl-dump-set-register (rrr cc)
    (insert (format "r%d = r%d\n" rrr cc)))
--- 990,996 ----
         (rrr (ash (logand code 255) -5))
         (cc (ash code -8)))
      (insert (format "%5d:[%s] " (1- ccl-current-ic) cmd))
!     (funcall (get cmd 'ccl-dump-function) rrr cc)))
  
  (defun ccl-dump-set-register (rrr cc)
    (insert (format "r%d = r%d\n" rrr cc)))
***************
*** 1273,1279 ****
      (insert (format "map-single r%d r%d map(%S)\n" RRR rrr id))))
  
  
! ;; CCL emulation staffs 
  
  ;; Not yet implemented.
  
--- 1273,1279 ----
      (insert (format "map-single r%d r%d map(%S)\n" RRR rrr id))))
  
  
! ;; CCL emulation staffs
  
  ;; Not yet implemented.
  
***************
*** 1472,1478 ****
        ;; (REG <8= ARG) is the same as:
        ;;      ((REG <<= 8)
        ;;       (REG |= ARG))
!       | <8= 
  
        ;; (REG >8= ARG) is the same as:
        ;;      ((r7 = (REG & 255))
--- 1472,1478 ----
        ;; (REG <8= ARG) is the same as:
        ;;      ((REG <<= 8)
        ;;       (REG |= ARG))
!       | <8=
  
        ;; (REG >8= ARG) is the same as:
        ;;      ((r7 = (REG & 255))