X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mel-b-ccl.el;h=e9e7f16df55446d15b0c31e51370a3afe90834d8;hb=4bf8fd8f57d3cb4184c0285e9d948af790d2dfc2;hp=b01650c112e70b9ec421b31547bcd5c0679288f6;hpb=f7230fcb61e32630f6bcf87e6eb8b35c564dd06c;p=elisp%2Fflim.git

diff --git a/mel-b-ccl.el b/mel-b-ccl.el
index b01650c..e9e7f16 100644
--- a/mel-b-ccl.el
+++ b/mel-b-ccl.el
@@ -143,96 +143,145 @@ abcdefghijklmnopqrstuvwxyz\
 
 )
 
-(define-ccl-program mel-ccl-decode-b
-  `(1
-    (loop
-     (read r0 r1 r2 r3)
-     (r4 = r0 ,mel-ccl-decode-b-0-table)
-     (r5 = r1 ,mel-ccl-decode-b-1-table)
-     (r4 |= r5)
-     (r5 = r2 ,mel-ccl-decode-b-2-table)
-     (r4 |= r5)
-     (r5 = r3 ,mel-ccl-decode-b-3-table)
-     (r4 |= r5)
-     (if (r4 & ,(lognot (1- (lsh 1 24))))
-	 ((loop
-	   (if (r4 & ,(lsh 1 24))
-	       ((r0 = r1) (r1 = r2) (r2 = r3) (read r3)
-		(r4 >>= 1) (r4 &= ,(logior (lsh 7 24)))
-		(r5 = r3 ,mel-ccl-decode-b-3-table)
-		(r4 |= r5)
-		(repeat))
-	     (break)))
-	  (loop
-	   (if (r4 & ,(lsh 1 25))
-	       ((r1 = r2) (r2 = r3) (read r3)
-		(r4 >>= 1) (r4 &= ,(logior (lsh 7 24)))
-		(r5 = r3 ,mel-ccl-decode-b-3-table)
-		(r4 |= r5)
-		(repeat))
-	     (break)))
-	  (loop
-	   (if (r2 != ?=)
-	       (if (r4 & ,(lsh 1 26))
-		   ((r2 = r3) (read r3)
-		    (r4 >>= 1) (r4 &= ,(logior (lsh 7 24)))
-		    (r5 = r3 ,mel-ccl-decode-b-3-table)
-		    (r4 |= r5)
-		    (repeat))
-		 ((r6 = 0)
-		  (break)))
-	     ((r6 = 1)
-	      (break))))
-	  (loop
-	   (if (r3 != ?=)
-	       (if (r4 & ,(lsh 1 27))
-		   ((read r3)
-		    (r4 = r3 ,mel-ccl-decode-b-3-table)
-		    (repeat))
-		 (break))
-	     ((r6 |= 2)
-	      (break))))
-	  (r4 = r0 ,mel-ccl-decode-b-0-table)
-	  (r5 = r1 ,mel-ccl-decode-b-1-table)
-	  (r4 |= r5)
-	  (branch
-	   r6
-	   ;; BBBB
-	   ((r5 = r2 ,mel-ccl-decode-b-2-table)
+(check-broken-facility ccl-cascading-read)
+
+(if-broken ccl-cascading-read
+    (define-ccl-program mel-ccl-decode-b
+      `(1
+	(loop
+	 (loop
+	  (read-branch
+	   r1
+	   ,@(mapcar
+	      (lambda (v)
+		(cond
+		 ((or (eq v nil) (eq v t)) '(repeat))
+		 (t `((r0 = ,(lsh v 2)) (break)))))
+	      mel-ccl-256-to-64-table)))
+	 (loop
+	  (read-branch
+	   r1
+	   ,@(mapcar
+	      (lambda (v)
+		(cond
+		 ((or (eq v nil) (eq v t)) '(repeat))
+		 ((= (lsh v -4) 0) `((write r0) (r0 = ,(lsh (logand v 15) 4)) (break)))
+		 (t `((r0 |= ,(lsh v -4)) (write r0) (r0 = ,(lsh (logand v 15) 4)) (break)))))
+	      mel-ccl-256-to-64-table)))
+	 (loop
+	  (read-branch
+	   r1
+	   ,@(mapcar
+	      (lambda (v)
+		(cond
+		 ((eq v nil) '(repeat))
+		 ((eq v t) '(end))
+		 ((= (lsh v -2) 0) `((write r0) (r0 = ,(lsh (logand v 3) 6)) (break)))
+		 (t `((r0 |= ,(lsh v -2)) (write r0) (r0 = ,(lsh (logand v 3) 6)) (break)))))
+	      mel-ccl-256-to-64-table)))
+	 (loop
+	  (read-branch
+	   r1
+	   ,@(mapcar
+	      (lambda (v)
+		(cond
+		 ((eq v nil) '(repeat))
+		 ((eq v t) '(end))
+		 (t `((r0 |= ,v) (write r0) (break)))))
+	      mel-ccl-256-to-64-table)))
+	 (repeat))))
+  (define-ccl-program mel-ccl-decode-b
+    `(1
+      (loop
+       (read r0 r1 r2 r3)
+       (r4 = r0 ,mel-ccl-decode-b-0-table)
+       (r5 = r1 ,mel-ccl-decode-b-1-table)
+       (r4 |= r5)
+       (r5 = r2 ,mel-ccl-decode-b-2-table)
+       (r4 |= r5)
+       (r5 = r3 ,mel-ccl-decode-b-3-table)
+       (r4 |= r5)
+       (if (r4 & ,(lognot (1- (lsh 1 24))))
+	   ((loop
+	     (if (r4 & ,(lsh 1 24))
+		 ((r0 = r1) (r1 = r2) (r2 = r3) (read r3)
+		  (r4 >>= 1) (r4 &= ,(logior (lsh 7 24)))
+		  (r5 = r3 ,mel-ccl-decode-b-3-table)
+		  (r4 |= r5)
+		  (repeat))
+	       (break)))
+	    (loop
+	     (if (r4 & ,(lsh 1 25))
+		 ((r1 = r2) (r2 = r3) (read r3)
+		  (r4 >>= 1) (r4 &= ,(logior (lsh 7 24)))
+		  (r5 = r3 ,mel-ccl-decode-b-3-table)
+		  (r4 |= r5)
+		  (repeat))
+	       (break)))
+	    (loop
+	     (if (r2 != ?=)
+		 (if (r4 & ,(lsh 1 26))
+		     ((r2 = r3) (read r3)
+		      (r4 >>= 1) (r4 &= ,(logior (lsh 7 24)))
+		      (r5 = r3 ,mel-ccl-decode-b-3-table)
+		      (r4 |= r5)
+		      (repeat))
+		   ((r6 = 0)
+		    (break)))
+	       ((r6 = 1)
+		(break))))
+	    (loop
+	     (if (r3 != ?=)
+		 (if (r4 & ,(lsh 1 27))
+		     ((read r3)
+		      (r4 = r3 ,mel-ccl-decode-b-3-table)
+		      (repeat))
+		   (break))
+	       ((r6 |= 2)
+		(break))))
+	    (r4 = r0 ,mel-ccl-decode-b-0-table)
+	    (r5 = r1 ,mel-ccl-decode-b-1-table)
 	    (r4 |= r5)
-	    (r5 = r3 ,mel-ccl-decode-b-3-table)
-	    (r4 |= r5)
-	    (r4 >8= 0)
-	    (write r7)
-	    (r4 >8= 0)
-	    (write r7)
-	    (write-repeat r4))
-	   ;; error: BB=B 
-	   ((write (r4 & 255))
-	    (end))
-	   ;; BBB=
-	   ((r5 = r2 ,mel-ccl-decode-b-2-table)
-	    (r4 |= r5)
-	    (r4 >8= 0)
-	    (write r7)
-	    (write (r4 & 255))
-	    (end)			; Excessive (end) is workaround for XEmacs 21.0.
+	    (branch
+	     r6
+	     ;; BBBB
+	     ((r5 = r2 ,mel-ccl-decode-b-2-table)
+	      (r4 |= r5)
+	      (r5 = r3 ,mel-ccl-decode-b-3-table)
+	      (r4 |= r5)
+	      (r4 >8= 0)
+	      (write r7)
+	      (r4 >8= 0)
+	      (write r7)
+	      (write-repeat r4))
+	     ;; error: BB=B 
+	     ((write (r4 & 255))
+	      (end))
+	     ;; BBB=
+	     ((r5 = r2 ,mel-ccl-decode-b-2-table)
+	      (r4 |= r5)
+	      (r4 >8= 0)
+	      (write r7)
+	      (write (r4 & 255))
+	      (end)			; Excessive (end) is workaround for XEmacs 21.0.
 					; Without this, "AAA=" is converted to "^@^@^@".
-	    (end))
-	   ;; BB==
-	   ((write (r4 & 255))
-	    (end))))
-       ((r4 >8= 0)
-	(write r7)
-	(r4 >8= 0)
-	(write r7)
-	(write-repeat r4))))))
+	      (end))
+	     ;; BB==
+	     ((write (r4 & 255))
+	      (end))))
+	 ((r4 >8= 0)
+	  (write r7)
+	  (r4 >8= 0)
+	  (write r7)
+	  (write-repeat r4))))))
+  )
 
 (eval-when-compile
 
 ;; Generated CCL program works not properly on 20.2 because CCL_EOF_BLOCK
 ;; is not executed.
-(defun mel-ccl-encode-base64-generic (&optional quantums-per-line output-crlf terminate-with-newline)
+(defun mel-ccl-encode-base64-generic
+  (&optional quantums-per-line output-crlf terminate-with-newline)
   `(2
     ((r3 = 0)
      (loop