diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-05-18 09:04:57 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-05-18 09:04:57 +0800 |
| commit | 074c0268fd32d6527e124cff386bb6b15cf90017 (patch) | |
| tree | 62111c3c70d46a738f15514e988a707409ca45f4 /src/ccl.c | |
| parent | db48eff8cf4a88393c0209f663ca194ee37fa747 (diff) | |
| parent | 5ef169ed701fa4f850fdca5563cdd468207d5d4f (diff) | |
| download | emacs-feature/android.tar.gz | |
Merge remote-tracking branch 'origin/master' into feature/androidfeature/android
Diffstat (limited to 'src/ccl.c')
| -rw-r--r-- | src/ccl.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/ccl.c b/src/ccl.c index ce9abd59493..67f2a275841 100644 --- a/src/ccl.c +++ b/src/ccl.c @@ -1156,9 +1156,9 @@ ccl_driver (struct ccl_program *ccl, int *source, int *destination, int src_size ccl_expr_self: switch (op) { - case CCL_PLUS: INT_ADD_WRAPV (reg[rrr], i, ®[rrr]); break; - case CCL_MINUS: INT_SUBTRACT_WRAPV (reg[rrr], i, ®[rrr]); break; - case CCL_MUL: INT_MULTIPLY_WRAPV (reg[rrr], i, ®[rrr]); break; + case CCL_PLUS: ckd_add (®[rrr], reg[rrr], i); break; + case CCL_MINUS: ckd_sub (®[rrr], reg[rrr], i); break; + case CCL_MUL: ckd_mul (®[rrr], reg[rrr], i); break; case CCL_DIV: if (!i) CCL_INVALID_CMD; @@ -1194,7 +1194,7 @@ ccl_driver (struct ccl_program *ccl, int *source, int *destination, int src_size if (i == -1) { reg[7] = 0; - INT_SUBTRACT_WRAPV (0, reg[rrr], ®[rrr]); + ckd_sub (®[rrr], 0, reg[rrr]); } else { @@ -1251,9 +1251,9 @@ ccl_driver (struct ccl_program *ccl, int *source, int *destination, int src_size ccl_set_expr: switch (op) { - case CCL_PLUS: INT_ADD_WRAPV (i, j, ®[rrr]); break; - case CCL_MINUS: INT_SUBTRACT_WRAPV (i, j, ®[rrr]); break; - case CCL_MUL: INT_MULTIPLY_WRAPV (i, j, ®[rrr]); break; + case CCL_PLUS: ckd_add (®[rrr], i, j); break; + case CCL_MINUS: ckd_sub (®[rrr], i, j); break; + case CCL_MUL: ckd_mul (®[rrr], i, j); break; case CCL_DIV: if (!j) CCL_INVALID_CMD; @@ -1288,7 +1288,7 @@ ccl_driver (struct ccl_program *ccl, int *source, int *destination, int src_size CCL_INVALID_CMD; if (j == -1) { - INT_SUBTRACT_WRAPV (0, reg[rrr], ®[rrr]); + ckd_sub (®[rrr], 0, reg[rrr]); reg[7] = 0; } else @@ -2169,8 +2169,8 @@ usage: (ccl-execute-on-string CCL-PROGRAM STATUS STRING &optional CONTINUE UNIBY buf_magnification = ccl.buf_magnification ? ccl.buf_magnification : 1; outbufsize = str_bytes; - if (INT_MULTIPLY_WRAPV (buf_magnification, outbufsize, &outbufsize) - || INT_ADD_WRAPV (256, outbufsize, &outbufsize)) + if (ckd_mul (&outbufsize, outbufsize, buf_magnification) + || ckd_add (&outbufsize, outbufsize, 256)) memory_full (SIZE_MAX); outp = outbuf = xmalloc (outbufsize); |