[PATCH] Multiline strings and gcc
Marco Parrone
marc0@autistici.org
Tue Jul 23 23:37:02 2002
--=-=-=
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi, here a bug report for gnupg version 1.0.7.
I think that the problem are the multiline strings (in the asm defines).
I've solved the problem with the attached patch, that replaces the
newlines in the strings with "\n".
If you want to merge the patch I can re-check it and if you want
I can replaces the horizontal tabs with "\t" too.
I'm not subscripted to this ML, so CC me if you want replies.
$ cd gnupg-1.0.7
$ ./configure
$ make 2> err
[...]
$ cat err
In file included from mpi-bit.c:26:
longlong.h:118:12: missing terminating " character
longlong.h:125:10: missing terminating " character
longlong.h:127:12: missing terminating " character
longlong.h:134:10: missing terminating " character
longlong.h:189:12: missing terminating " character
longlong.h:196:10: missing terminating " character
longlong.h:198:12: missing terminating " character
longlong.h:205:10: missing terminating " character
longlong.h:208:12: missing terminating " character
longlong.h:225:22: missing terminating " character
longlong.h:228:12: missing terminating " character
longlong.h:234:17: missing terminating " character
longlong.h:277:12: missing terminating " character
longlong.h:284:9: missing terminating " character
longlong.h:286:12: missing terminating " character
longlong.h:293:9: missing terminating " character
longlong.h:320:12: missing terminating " character
longlong.h:327:10: missing terminating " character
longlong.h:329:12: missing terminating " character
longlong.h:336:10: missing terminating " character
longlong.h:368:8: missing terminating " character
longlong.h:383:44: missing terminating " character
longlong.h:438:12: missing terminating " character
In file included from mpi-bit.c:26:
longlong.h:439: error: parse error before '%' token
longlong.h:445:9: missing terminating " character
longlong.h:447:12: missing terminating " character
longlong.h:454:9: missing terminating " character
longlong.h:571:12: missing terminating " character
longlong.h:578:9: missing terminating " character
longlong.h:580:12: missing terminating " character
longlong.h:587:9: missing terminating " character
longlong.h:619:18: missing terminating " character
longlong.h:643:33: missing terminating " character
longlong.h:656:12: missing terminating " character
longlong.h:663:10: missing terminating " character
longlong.h:665:12: missing terminating " character
longlong.h:672:10: missing terminating " character
longlong.h:722:12: missing terminating " character
longlong.h:728:9: missing terminating " character
longlong.h:747:12: missing terminating " character
longlong.h:753:9: missing terminating " character
longlong.h:929:12: missing terminating " character
longlong.h:936:9: missing terminating " character
longlong.h:938:12: missing terminating " character
longlong.h:945:9: missing terminating " character
longlong.h:951:12: missing terminating " character
longlong.h:955:9: missing terminating " character
longlong.h:965:12: missing terminating " character
longlong.h:972:9: missing terminating " character
longlong.h:974:12: missing terminating " character
longlong.h:981:9: missing terminating " character
longlong.h:986:8: missing terminating " character
longlong.h:1010:12: missing terminating " character
longlong.h:1039:8: missing terminating " character
longlong.h:1046:20: missing terminating " character
longlong.h:1055:12: missing terminating " character
longlong.h:1062:10: missing terminating " character
longlong.h:1065:12: missing terminating " character
longlong.h:1072:10: missing terminating " character
longlong.h:1112:12: missing terminating " character
longlong.h:1156:11: missing terminating " character
longlong.h:1170:12: missing terminating " character
longlong.h:1172:38: missing terminating ' character
longlong.h:1173:38: missing terminating ' character
longlong.h:1174:38: missing terminating ' character
longlong.h:1214:18: missing terminating " character
longlong.h:1236:12: missing terminating " character
longlong.h:1243:9: missing terminating " character
longlong.h:1245:12: missing terminating " character
longlong.h:1252:9: missing terminating " character
make[2]: *** [mpi-bit.o] Error 1
make[1]: *** [all-recursive] Error 1
make: *** [all] Error 2
$ gcc --version
gcc (GCC) 3.2 20020625 (experimental)
Copyright (C) 2002 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
Bye
- --
Marco Parrone - marc0@autistici.org
46B9 4793 2066 1927 13DB 82A0 1698 FFE8 3E6A 957A
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (GNU/Linux)
Comment: Processed by Mailcrypt 3.5.7 <http://mailcrypt.sourceforge.net/>
iD8DBQE9PU1KFpj/6D5qlXoRAl0pAJ4ijzeoS7yB4JmUn3cgaHiknicc/QCeJJTe
1+fhw1DnkTlYCEmgHJyEsPY=
=Zw/v
-----END PGP SIGNATURE-----
--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment; filename=nomultilinestrings.diff
Content-Description: The patch.
--- gnupg-1.0.7/mpi/longlong.h 2001-08-20 10:51:54.000000000 +0200
+++ gnupg-1.0.7marc0/mpi/longlong.h 2002-07-23 13:59:25.000000000 +0200
@@ -115,8 +115,7 @@
***************************************/
#if (defined (__a29k__) || defined (_AM29K)) && W_TYPE_SIZE == 32
#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
- __asm__ ("add %1,%4,%5
- addc %0,%2,%3" \
+ __asm__ ("add %1,%4,%5\n addc %0,%2,%3" \
: "=r" ((USItype)(sh)), \
"=&r" ((USItype)(sl)) \
: "%r" ((USItype)(ah)), \
@@ -124,8 +123,7 @@
"%r" ((USItype)(al)), \
"rI" ((USItype)(bl)))
#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
- __asm__ ("sub %1,%4,%5
- subc %0,%2,%3" \
+ __asm__ ("sub %1,%4,%5\n subc %0,%2,%3" \
: "=r" ((USItype)(sh)), \
"=&r" ((USItype)(sl)) \
: "r" ((USItype)(ah)), \
@@ -186,8 +184,7 @@
***************************************/
#if defined (__arm__) && W_TYPE_SIZE == 32
#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
- __asm__ ("adds %1, %4, %5
- adc %0, %2, %3" \
+ __asm__ ("adds %1, %4, %5\n adc %0, %2, %3" \
: "=r" ((USItype)(sh)), \
"=&r" ((USItype)(sl)) \
: "%r" ((USItype)(ah)), \
@@ -195,8 +192,7 @@
"%r" ((USItype)(al)), \
"rI" ((USItype)(bl)))
#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
- __asm__ ("subs %1, %4, %5
- sbc %0, %2, %3" \
+ __asm__ ("subs %1, %4, %5\n sbc %0, %2, %3" \
: "=r" ((USItype)(sh)), \
"=&r" ((USItype)(sl)) \
: "r" ((USItype)(ah)), \
@@ -205,19 +201,7 @@
"rI" ((USItype)(bl)))
#if defined __ARM_ARCH_2__ || defined __ARM_ARCH_3__
#define umul_ppmm(xh, xl, a, b) \
- __asm__ ("%@ Inlined umul_ppmm
- mov %|r0, %2, lsr #16 @ AAAA
- mov %|r2, %3, lsr #16 @ BBBB
- bic %|r1, %2, %|r0, lsl #16 @ aaaa
- bic %0, %3, %|r2, lsl #16 @ bbbb
- mul %1, %|r1, %|r2 @ aaaa * BBBB
- mul %|r2, %|r0, %|r2 @ AAAA * BBBB
- mul %|r1, %0, %|r1 @ aaaa * bbbb
- mul %0, %|r0, %0 @ AAAA * bbbb
- adds %|r0, %1, %0 @ central sum
- addcs %|r2, %|r2, #65536
- adds %1, %|r1, %|r0, lsl #16
- adc %0, %|r2, %|r0, lsr #16" \
+ __asm__ ("%@ Inlined umul_ppmm\n mov %|r0, %2, lsr #16 @ AAAA\n mov %|r2, %3, lsr #16 @ BBBB\n bic %|r1, %2, %|r0, lsl #16 @ aaaa\n bic %0, %3, %|r2, lsl #16 @ bbbb\n mul %1, %|r1, %|r2 @ aaaa * BBBB\n mul %|r2, %|r0, %|r2 @ AAAA * BBBB\n mul %|r1, %0, %|r1 @ aaaa * bbbb\n mul %0, %|r0, %0 @ AAAA * bbbb\n adds %|r0, %1, %0 @ central sum\n addcs %|r2, %|r2, #65536\n adds %1, %|r1, %|r0, lsl #16\n adc %0, %|r2, %|r0, lsr #16" \
: "=&r" ((USItype)(xh)), \
"=r" ((USItype)(xl)) \
: "r" ((USItype)(a)), \
@@ -225,8 +209,7 @@
: "r0", "r1", "r2")
#else
#define umul_ppmm(xh, xl, a, b) \
- __asm__ ("%@ Inlined umul_ppmm
- umull %r1, %r0, %r2, %r3" \
+ __asm__ ("%@ Inlined umul_ppmm\n umull %r1, %r0, %r2, %r3" \
: "=&r" ((USItype)(xh)), \
"=r" ((USItype)(xl)) \
: "r" ((USItype)(a)), \
@@ -274,8 +257,7 @@
***************************************/
#if defined (__gmicro__) && W_TYPE_SIZE == 32
#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
- __asm__ ("add.w %5,%1
- addx %3,%0" \
+ __asm__ ("add.w %5,%1\n addx %3,%0" \
: "=g" ((USItype)(sh)), \
"=&g" ((USItype)(sl)) \
: "%0" ((USItype)(ah)), \
@@ -283,8 +265,7 @@
"%1" ((USItype)(al)), \
"g" ((USItype)(bl)))
#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
- __asm__ ("sub.w %5,%1
- subx %3,%0" \
+ __asm__ ("sub.w %5,%1\n subx %3,%0" \
: "=g" ((USItype)(sh)), \
"=&g" ((USItype)(sl)) \
: "0" ((USItype)(ah)), \
@@ -317,8 +298,7 @@
***************************************/
#if defined (__hppa) && W_TYPE_SIZE == 32
#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
- __asm__ ("add %4,%5,%1
- addc %2,%3,%0" \
+ __asm__ ("add %4,%5,%1\n addc %2,%3,%0" \
: "=r" ((USItype)(sh)), \
"=&r" ((USItype)(sl)) \
: "%rM" ((USItype)(ah)), \
@@ -326,8 +306,7 @@
"%rM" ((USItype)(al)), \
"rM" ((USItype)(bl)))
#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
- __asm__ ("sub %4,%5,%1
- subb %2,%3,%0" \
+ __asm__ ("sub %4,%5,%1\n subb %2,%3,%0" \
: "=r" ((USItype)(sh)), \
"=&r" ((USItype)(sl)) \
: "rM" ((USItype)(ah)), \
@@ -365,22 +344,7 @@
do { \
USItype __tmp; \
__asm__ ( \
- "ldi 1,%0
- extru,= %1,15,16,%%r0 ; Bits 31..16 zero?
- extru,tr %1,15,16,%1 ; No. Shift down, skip add.
- ldo 16(%0),%0 ; Yes. Perform add.
- extru,= %1,23,8,%%r0 ; Bits 15..8 zero?
- extru,tr %1,23,8,%1 ; No. Shift down, skip add.
- ldo 8(%0),%0 ; Yes. Perform add.
- extru,= %1,27,4,%%r0 ; Bits 7..4 zero?
- extru,tr %1,27,4,%1 ; No. Shift down, skip add.
- ldo 4(%0),%0 ; Yes. Perform add.
- extru,= %1,29,2,%%r0 ; Bits 3..2 zero?
- extru,tr %1,29,2,%1 ; No. Shift down, skip add.
- ldo 2(%0),%0 ; Yes. Perform add.
- extru %1,30,1,%1 ; Extract bit 1.
- sub %0,%1,%0 ; Subtract it.
- " : "=r" (count), "=r" (__tmp) : "1" (x)); \
+ "ldi 1,%0\n extru,= %1,15,16,%%r0 ; Bits 31..16 zero?\n extru,tr %1,15,16,%1 ; No. Shift down, skip add.\n ldo 16(%0),%0 ; Yes. Perform add.\n extru,= %1,23,8,%%r0 ; Bits 15..8 zero?\n extru,tr %1,23,8,%1 ; No. Shift down, skip add.\n ldo 8(%0),%0 ; Yes. Perform add.\n extru,= %1,27,4,%%r0 ; Bits 7..4 zero?\n extru,tr %1,27,4,%1 ; No. Shift down, skip add.\n ldo 4(%0),%0 ; Yes. Perform add.\n extru,= %1,29,2,%%r0 ; Bits 3..2 zero?\n extru,tr %1,29,2,%1 ; No. Shift down, skip add.\n ldo 2(%0),%0 ; Yes. Perform add.\n extru %1,30,1,%1 ; Extract bit 1.\n sub %0,%1,%0 ; Subtract it.\n " : "=r" (count), "=r" (__tmp) : "1" (x)); \
} while (0)
#endif /* hppa */
@@ -435,8 +399,7 @@
***************************************/
#if (defined (__i386__) || defined (__i486__)) && W_TYPE_SIZE == 32
#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
- __asm__ ("addl %5,%1
- adcl %3,%0" \
+ __asm__ ("addl %5,%1\n adcl %3,%0" \
: "=r" ((USItype)(sh)), \
"=&r" ((USItype)(sl)) \
: "%0" ((USItype)(ah)), \
@@ -444,8 +407,7 @@
"%1" ((USItype)(al)), \
"g" ((USItype)(bl)))
#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
- __asm__ ("subl %5,%1
- sbbl %3,%0" \
+ __asm__ ("subl %5,%1\n sbbl %3,%0" \
: "=r" ((USItype)(sh)), \
"=&r" ((USItype)(sl)) \
: "0" ((USItype)(ah)), \
@@ -568,8 +530,7 @@
***************************************/
#if (defined (__mc68000__) || defined (__mc68020__) || defined (__NeXT__) || defined(mc68020)) && W_TYPE_SIZE == 32
#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
- __asm__ ("add%.l %5,%1
- addx%.l %3,%0" \
+ __asm__ ("add%.l %5,%1\n addx%.l %3,%0" \
: "=d" ((USItype)(sh)), \
"=&d" ((USItype)(sl)) \
: "%0" ((USItype)(ah)), \
@@ -577,8 +538,7 @@
"%1" ((USItype)(al)), \
"g" ((USItype)(bl)))
#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
- __asm__ ("sub%.l %5,%1
- subx%.l %3,%0" \
+ __asm__ ("sub%.l %5,%1\n subx%.l %3,%0" \
: "=d" ((USItype)(sh)), \
"=&d" ((USItype)(sl)) \
: "0" ((USItype)(ah)), \
@@ -616,28 +576,7 @@
#else /* not mc68020 */
#define umul_ppmm(xh, xl, a, b) \
do { USItype __umul_tmp1, __umul_tmp2; \
- __asm__ ("| Inlined umul_ppmm
- move%.l %5,%3
- move%.l %2,%0
- move%.w %3,%1
- swap %3
- swap %0
- mulu %2,%1
- mulu %3,%0
- mulu %2,%3
- swap %2
- mulu %5,%2
- add%.l %3,%2
- jcc 1f
- add%.l %#0x10000,%0
-1: move%.l %2,%3
- clr%.w %2
- swap %2
- swap %3
- clr%.w %3
- add%.l %3,%1
- addx%.l %2,%0
- | End inlined umul_ppmm" \
+ __asm__ ("| Inlined umul_ppmm\n move%.l %5,%3\n move%.l %2,%0\n move%.w %3,%1\n swap %3\n swap %0\n mulu %2,%1\n mulu %3,%0\n mulu %2,%3\n swap %2\n mulu %5,%2\n add%.l %3,%2\n jcc 1f\n add%.l %#0x10000,%0\n1: move%.l %2,%3\n clr%.w %2\n swap %2\n swap %3\n clr%.w %3\n add%.l %3,%1\n addx%.l %2,%0\n | End inlined umul_ppmm" \
: "=&d" ((USItype)(xh)), "=&d" ((USItype)(xl)), \
"=d" (__umul_tmp1), "=&d" (__umul_tmp2) \
: "%2" ((USItype)(a)), "d" ((USItype)(b))); \
@@ -653,8 +592,7 @@
***************************************/
#if defined (__m88000__) && W_TYPE_SIZE == 32
#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
- __asm__ ("addu.co %1,%r4,%r5
- addu.ci %0,%r2,%r3" \
+ __asm__ ("addu.co %1,%r4,%r5\n addu.ci %0,%r2,%r3" \
: "=r" ((USItype)(sh)), \
"=&r" ((USItype)(sl)) \
: "%rJ" ((USItype)(ah)), \
@@ -662,8 +600,7 @@
"%rJ" ((USItype)(al)), \
"rJ" ((USItype)(bl)))
#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
- __asm__ ("subu.co %1,%r4,%r5
- subu.ci %0,%r2,%r3" \
+ __asm__ ("subu.co %1,%r4,%r5\n subu.ci %0,%r2,%r3" \
: "=r" ((USItype)(sh)), \
"=&r" ((USItype)(sl)) \
: "rJ" ((USItype)(ah)), \
@@ -719,9 +656,7 @@
"d" ((USItype)(v)))
#else
#define umul_ppmm(w1, w0, u, v) \
- __asm__ ("multu %2,%3
- mflo %0
- mfhi %1" \
+ __asm__ ("multu %2,%3\n mflo %0\n mfhi %1" \
: "=d" ((USItype)(w0)), \
"=d" ((USItype)(w1)) \
: "d" ((USItype)(u)), \
@@ -744,9 +679,7 @@
"d" ((UDItype)(v)))
#else
#define umul_ppmm(w1, w0, u, v) \
- __asm__ ("dmultu %2,%3
- mflo %0
- mfhi %1" \
+ __asm__ ("dmultu %2,%3\n mflo %0\n mfhi %1" \
: "=d" ((UDItype)(w0)), \
"=d" ((UDItype)(w1)) \
: "d" ((UDItype)(u)), \
@@ -926,8 +859,7 @@
***************************************/
#if defined (__pyr__) && W_TYPE_SIZE == 32
#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
- __asm__ ("addw %5,%1
- addwc %3,%0" \
+ __asm__ ("addw %5,%1\n addwc %3,%0" \
: "=r" ((USItype)(sh)), \
"=&r" ((USItype)(sl)) \
: "%0" ((USItype)(ah)), \
@@ -935,8 +867,7 @@
"%1" ((USItype)(al)), \
"g" ((USItype)(bl)))
#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
- __asm__ ("subw %5,%1
- subwb %3,%0" \
+ __asm__ ("subw %5,%1\n subwb %3,%0" \
: "=r" ((USItype)(sh)), \
"=&r" ((USItype)(sl)) \
: "0" ((USItype)(ah)), \
@@ -948,8 +879,7 @@
({union {UDItype __ll; \
struct {USItype __h, __l;} __i; \
} __xx; \
- __asm__ ("movw %1,%R0
- uemul %2,%0" \
+ __asm__ ("movw %1,%R0\n\tuemul %2,%0" \
: "=&r" (__xx.__ll) \
: "g" ((USItype) (u)), \
"g" ((USItype)(v))); \
@@ -962,8 +892,7 @@
***************************************/
#if defined (__ibm032__) /* RT/ROMP */ && W_TYPE_SIZE == 32
#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
- __asm__ ("a %1,%5
- ae %0,%3" \
+ __asm__ ("a %1,%5\n ae %0,%3" \
: "=r" ((USItype)(sh)), \
"=&r" ((USItype)(sl)) \
: "%0" ((USItype)(ah)), \
@@ -971,8 +900,7 @@
"%1" ((USItype)(al)), \
"r" ((USItype)(bl)))
#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
- __asm__ ("s %1,%5
- se %0,%3" \
+ __asm__ ("s %1,%5\n se %0,%3" \
: "=r" ((USItype)(sh)), \
"=&r" ((USItype)(sl)) \
: "0" ((USItype)(ah)), \
@@ -983,26 +911,7 @@
do { \
USItype __m0 = (m0), __m1 = (m1); \
__asm__ ( \
- "s r2,r2
- mts r10,%2
- m r2,%3
- m r2,%3
- m r2,%3
- m r2,%3
- m r2,%3
- m r2,%3
- m r2,%3
- m r2,%3
- m r2,%3
- m r2,%3
- m r2,%3
- m r2,%3
- m r2,%3
- m r2,%3
- m r2,%3
- m r2,%3
- cas %0,r2,r0
- mfs r10,%1" \
+ "s r2,r2\n mts r10,%2\n m r2,%3\n m r2,%3\n m r2,%3\n m r2,%3\n m r2,%3\n m r2,%3\n m r2,%3\n m r2,%3\n m r2,%3\n m r2,%3\n m r2,%3\n m r2,%3\n m r2,%3\n m r2,%3\n m r2,%3\n m r2,%3\n cas %0,r2,r0\n mfs r10,%1" \
: "=r" ((USItype)(ph)), \
"=r" ((USItype)(pl)) \
: "%r" (__m0), \
@@ -1036,9 +945,7 @@
#if defined (__sh2__) && W_TYPE_SIZE == 32
#define umul_ppmm(w1, w0, u, v) \
__asm__ ( \
- "dmulu.l %2,%3
- sts macl,%1
- sts mach,%0" \
+ "dmulu.l %2,%3\n sts macl,%1\n sts mach,%0" \
: "=r" ((USItype)(w1)), \
"=r" ((USItype)(w0)) \
: "r" ((USItype)(u)), \
@@ -1052,8 +959,7 @@
***************************************/
#if defined (__sparc__) && W_TYPE_SIZE == 32
#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
- __asm__ ("addcc %r4,%5,%1
- addx %r2,%3,%0" \
+ __asm__ ("addcc %r4,%5,%1\n addx %r2,%3,%0" \
: "=r" ((USItype)(sh)), \
"=&r" ((USItype)(sl)) \
: "%rJ" ((USItype)(ah)), \
@@ -1062,8 +968,7 @@
"rI" ((USItype)(bl)) \
__CLOBBER_CC)
#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
- __asm__ ("subcc %r4,%5,%1
- subx %r2,%3,%0" \
+ __asm__ ("subcc %r4,%5,%1\n subx %r2,%3,%0" \
: "=r" ((USItype)(sh)), \
"=&r" ((USItype)(sl)) \
: "rJ" ((USItype)(ah)), \
@@ -1109,45 +1014,7 @@
"r" ((USItype)(v)))
#define UMUL_TIME 5
#define udiv_qrnnd(q, r, n1, n0, d) \
- __asm__ ("! Inlined udiv_qrnnd
- wr %%g0,%2,%%y ! Not a delayed write for sparclite
- tst %%g0
- divscc %3,%4,%%g1
- divscc %%g1,%4,%%g1
- divscc %%g1,%4,%%g1
- divscc %%g1,%4,%%g1
- divscc %%g1,%4,%%g1
- divscc %%g1,%4,%%g1
- divscc %%g1,%4,%%g1
- divscc %%g1,%4,%%g1
- divscc %%g1,%4,%%g1
- divscc %%g1,%4,%%g1
- divscc %%g1,%4,%%g1
- divscc %%g1,%4,%%g1
- divscc %%g1,%4,%%g1
- divscc %%g1,%4,%%g1
- divscc %%g1,%4,%%g1
- divscc %%g1,%4,%%g1
- divscc %%g1,%4,%%g1
- divscc %%g1,%4,%%g1
- divscc %%g1,%4,%%g1
- divscc %%g1,%4,%%g1
- divscc %%g1,%4,%%g1
- divscc %%g1,%4,%%g1
- divscc %%g1,%4,%%g1
- divscc %%g1,%4,%%g1
- divscc %%g1,%4,%%g1
- divscc %%g1,%4,%%g1
- divscc %%g1,%4,%%g1
- divscc %%g1,%4,%%g1
- divscc %%g1,%4,%%g1
- divscc %%g1,%4,%%g1
- divscc %%g1,%4,%%g1
- divscc %%g1,%4,%0
- rd %%y,%1
- bl,a 1f
- add %1,%4,%1
-1: ! End of inline udiv_qrnnd" \
+ __asm__ ("! Inlined udiv_qrnnd\n wr %%g0,%2,%%y ! Not a delayed write for sparclite\n tst %%g0\n divscc %3,%4,%%g1\n divscc %%g1,%4,%%g1\n divscc %%g1,%4,%%g1\n divscc %%g1,%4,%%g1\n divscc %%g1,%4,%%g1\n divscc %%g1,%4,%%g1\n divscc %%g1,%4,%%g1\n divscc %%g1,%4,%%g1\n divscc %%g1,%4,%%g1\n divscc %%g1,%4,%%g1\n divscc %%g1,%4,%%g1\n divscc %%g1,%4,%%g1\n divscc %%g1,%4,%%g1\n divscc %%g1,%4,%%g1\n divscc %%g1,%4,%%g1\n divscc %%g1,%4,%%g1\n divscc %%g1,%4,%%g1\n divscc %%g1,%4,%%g1\n divscc %%g1,%4,%%g1\n divscc %%g1,%4,%%g1\n divscc %%g1,%4,%%g1\n divscc %%g1,%4,%%g1\n divscc %%g1,%4,%%g1\n divscc %%g1,%4,%%g1\n divscc %%g1,%4,%%g1\n divscc %%g1,%4,%%g1\n divscc %%g1,%4,%%g1\n divscc %%g1,%4,%%g1\n divscc %%g1,%4,%%g1\n divscc %%g1,%4,%%g1\n divscc %%g1,%4,%%g1\n divscc %%g1,%4,%0\n rd %%y,%1\n bl,a 1f\n add %1,%4,%1\n1: ! End of inline udiv_qrnnd" \
: "=r" ((USItype)(q)), \
"=r" ((USItype)(r)) \
: "r" ((USItype)(n1)), \
@@ -1167,46 +1034,7 @@
/* Default to sparc v7 versions of umul_ppmm and udiv_qrnnd. */
#ifndef umul_ppmm
#define umul_ppmm(w1, w0, u, v) \
- __asm__ ("! Inlined umul_ppmm
- wr %%g0,%2,%%y ! SPARC has 0-3 delay insn after a wr
- sra %3,31,%%g2 ! Don't move this insn
- and %2,%%g2,%%g2 ! Don't move this insn
- andcc %%g0,0,%%g1 ! Don't move this insn
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,%3,%%g1
- mulscc %%g1,0,%%g1
- add %%g1,%%g2,%0
- rd %%y,%1" \
+ __asm__ ("! Inlined umul_ppmm\n wr %%g0,%2,%%y ! SPARC has 0-3 delay insn after a wr\n sra %3,31,%%g2 ! Don't move this insn\n and %2,%%g2,%%g2 ! Don't move this insn\n andcc %%g0,0,%%g1 ! Don't move this insn\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,%3,%%g1\n mulscc %%g1,0,%%g1\n add %%g1,%%g2,%0\n rd %%y,%1" \
: "=r" ((USItype)(w1)), \
"=r" ((USItype)(w0)) \
: "%rI" ((USItype)(u)), \
@@ -1233,8 +1061,7 @@
***************************************/
#if defined (__vax__) && W_TYPE_SIZE == 32
#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
- __asm__ ("addl2 %5,%1
- adwc %3,%0" \
+ __asm__ ("addl2 %5,%1\n adwc %3,%0" \
: "=g" ((USItype)(sh)), \
"=&g" ((USItype)(sl)) \
: "%0" ((USItype)(ah)), \
@@ -1242,8 +1069,7 @@
"%1" ((USItype)(al)), \
"g" ((USItype)(bl)))
#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
- __asm__ ("subl2 %5,%1
- sbwc %3,%0" \
+ __asm__ ("subl2 %5,%1\n sbwc %3,%0" \
: "=g" ((USItype)(sh)), \
"=&g" ((USItype)(sl)) \
: "0" ((USItype)(ah)), \
--=-=-=
Content-Disposition: attachment; filename=nomultilinestrings.diff.asc
Content-Description: A detach-sign for the patch.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (GNU/Linux)
iD8DBQA9PU01Fpj/6D5qlXoRAhvZAJ4oFDj7ChIZXcdJ22K5ahEA7W5StgCgvInu
8lbDBD9aq+4WX5BFNQMFGYI=
=p9MR
-----END PGP SIGNATURE-----
--=-=-=--