From: Kenichi Handa <handa@m17n.org>
Date: Wed, 2 Feb 2000 07:06:26 +0000 (+0000)
Subject: (ccl_driver) <CCL_WriteExprRegister>: Set jump_address
X-Git-Tag: emacs-pretest-21.0.90~5136
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=25660570bea4aa8fb85084e91c870e3467e87038;p=emacs.git

(ccl_driver) <CCL_WriteExprRegister>: Set jump_address
instead of incrementing ic directly.
<CCL_WriteExprConst> Likewise.
<ccl_set_expr>: Set ic to jump_address.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index dbf0522b392..edb9d3c590e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2000-02-02  Kenichi Handa  <handa@etl.go.jp>
 
+	* ccl.c (ccl_driver) <CCL_WriteExprRegister>: Set jump_address
+	instead of incrementing ic directly.
+	<CCL_WriteExprConst> Likewise.
+	<ccl_set_expr>: Set ic to jump_address.
+
 	* fileio.c (e_write): Fix the handling of
 	CODING_FINISH_INSUFFICIENT_SRC.
 
diff --git a/src/ccl.c b/src/ccl.c
index 93cb0873b96..003bd8de30c 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -909,7 +909,7 @@ ccl_driver (ccl, source, destination, src_bytes, dst_bytes, consumed)
 	  i = reg[RRR];
 	  j = XINT (ccl_prog[ic]);
 	  op = field1 >> 6;
-	  ic++;
+	  jump_address = ic + 1;
 	  goto ccl_set_expr;
 
 	case CCL_WriteRegister:	/* CCCCCCCCCCCCCCCCCCCrrrXXXXX */
@@ -929,6 +929,7 @@ ccl_driver (ccl, source, destination, src_bytes, dst_bytes, consumed)
 	  i = reg[RRR];
 	  j = reg[Rrr];
 	  op = field1 >> 6;
+	  jump_address = ic;
 	  goto ccl_set_expr;
 
 	case CCL_Call:		/* 1:CCCCCCCCCCCCCCCCCCCCFFFXXXXX */
@@ -1105,6 +1106,7 @@ ccl_driver (ccl, source, destination, src_bytes, dst_bytes, consumed)
 	    {
 	      i = reg[rrr];
 	      CCL_WRITE_CHAR (i);
+	      ic = jump_address;
 	    }
 	  else if (!reg[rrr])
 	    ic = jump_address;