Fix test and comment in CCL change

* lisp/international/ccl.el (ccl-fixnum): Update comment.
* test/lisp/international/ccl-tests.el (prog-midi-dump): Add
trailing space to expected result.

diff --git a/lisp/international/ccl.el b/lisp/international/ccl.el
index d1b82ceb9ce50986d00c332a36a4c1b3dde7a7c0..58083f05d92c11c4bfd76a6edfc34ac906b87ef0 100644 (file)
--- a/lisp/international/ccl.el
+++ b/lisp/international/ccl.el
@@ -184,8 +184,10 @@
 (defvar ccl-current-ic 0
   "The current index for `ccl-program-vector'.")
 
-;; This is needed because CCL assumes the pre-bigint (wrapping)
-;; semantics of integer overflow.
+;; The CCL compiled codewords are 28bits, but the CCL implementation
+;; assumes that the codewords are sign-extended, so that data constants in
+;; the upper part of the codeword are signed. This function truncates a
+;; codeword to 28bits, and then sign extends the result to a fixnum.
 (defun ccl-fixnum (code)
   "Convert a CCL code word to a fixnum value."
   (- (logxor (logand code #x0fffffff) #x08000000) #x08000000))

diff --git a/test/lisp/international/ccl-tests.el b/test/lisp/international/ccl-tests.el
index d0c254ce91bae67d7548e8e18caf5b12e7e59c6d..ba6d2040e8cdfe295e2d097b74808f9c26a74061 100644 (file)
--- a/test/lisp/international/ccl-tests.el
+++ b/test/lisp/international/ccl-tests.el
@@ -162,7 +162,7 @@ At EOF:
 Main-body:
     2:[read-jump-cond-expr-const] read r0, if !(r0 < 128), jump to 22(+20)
     5:[branch] jump to array[r3] of length 4
-       11 12 15 18 22
+       11 12 15 18 22 
    11:[jump] jump to 2(-9)
    12:[set-register] r1 = r0
    13:[set-register] r0 = r4