[kaffe] CVS kaffe (dalibor): Fix for ia64-linux compiler problems
Kaffe CVS
cvs-commits at kaffe.org
Thu Oct 2 12:08:02 PDT 2003
PatchSet 4084
Date: 2003/10/02 19:05:04
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Fix for ia64-linux compiler problems
Members:
ChangeLog:1.1679->1.1680
config/ia64/linux/md.c:1.2->1.3
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1679 kaffe/ChangeLog:1.1680
--- kaffe/ChangeLog:1.1679 Tue Sep 30 19:50:52 2003
+++ kaffe/ChangeLog Thu Oct 2 19:05:04 2003
@@ -1,3 +1,8 @@
+2003-10-02 Dalibor Topic <robilad at kaffe.org>
+
+ * config/ia64/linux/md.c:
+ Fixed multi-line string compiler breakage.
+
2003-09-30 Helmer Kraemer <hkraemer at freenet.de>
* libraries/clib/math/BigInteger.c
Index: kaffe/config/ia64/linux/md.c
diff -u kaffe/config/ia64/linux/md.c:1.2 kaffe/config/ia64/linux/md.c:1.3
--- kaffe/config/ia64/linux/md.c:1.2 Wed May 21 09:09:49 2003
+++ kaffe/config/ia64/linux/md.c Thu Oct 2 19:05:05 2003
@@ -90,224 +90,224 @@
*/
/* IA64_context_save(__jmp_buf env) */
- asm("
- .text
- .align 32
- .global IA64_context_save
- .proc IA64_context_save
-IA64_context_save:
- alloc r14 = ar.pfs,1,0,0,0
- mov r16 = ar.unat
- ;;
- mov r17 = ar.fpsr
- mov r2 = in0
- add r3 = 8,in0
- ;;
- st8.spill.nta [r2] = sp,16 // r12 (sp)
- ;;
- st8.spill.nta [r3] = gp,16 // r1 (gp)
- ;;
- st8.nta [r2] = r16,16 // save caller's unat
- st8.nta [r3] = r17,16 // save fpsr
- add r8 = 0xb0,in0
- ;;
- st8.spill.nta [r2] = r4,16 // r4
- ;;
- st8.spill.nta [r3] = r5,16 // r5
- add r9 = 0xc0,in0
- ;;
- stf.spill.nta [r8] = f2,32
- stf.spill.nta [r9] = f3,32
- mov r15 = rp
- ;;
- stf.spill.nta [r8] = f4,32
- stf.spill.nta [r9] = f5,32
- mov r17 = b1
- ;;
- stf.spill.nta [r8] = f16,32
- stf.spill.nta [r9] = f17,32
- mov r18 = b2
- ;;
- stf.spill.nta [r8] = f18,32
- stf.spill.nta [r9] = f19,32
- mov r19 = b3
- ;;
- stf.spill.nta [r8] = f20,32
- stf.spill.nta [r9] = f21,32
- mov r20 = b4
- ;;
- stf.spill.nta [r8] = f22,32
- stf.spill.nta [r9] = f23,32
- mov r21 = b5
- ;;
- stf.spill.nta [r8] = f24,32
- stf.spill.nta [r9] = f25,32
- mov r22 = ar.lc
- ;;
- stf.spill.nta [r8] = f26,32
- stf.spill.nta [r9] = f27,32
- mov r24 = pr
- ;;
- stf.spill.nta [r8] = f28,32
- stf.spill.nta [r9] = f29,32
- ;;
- stf.spill.nta [r8] = f30
- stf.spill.nta [r9] = f31
-
- st8.spill.nta [r2] = r6,16 // r6
- ;;
- st8.spill.nta [r3] = r7,16 // r7
- ;;
- mov r23 = ar.bsp
- mov r25 = ar.unat
-
- st8.nta [r2] = r15,16 // b0
- st8.nta [r3] = r17,16 // b1
- ;;
- st8.nta [r2] = r18,16 // b2
- st8.nta [r3] = r19,16 // b3
- mov r26 = ar.rsc
- ;;
- st8.nta [r2] = r20,16 // b4
- st8.nta [r3] = r21,16 // b5
- ;;
- st8.nta [r2] = r14,16 // ar.pfs
- st8.nta [r3] = r22,16 // ar.lc
- ;;
- st8.nta [r2] = r24,16 // pr
- st8.nta [r3] = r23,16 // ar.bsp
- ;;
- st8.nta [r2] = r25,16 // ar.unat
- st8.nta [r3] = in0,16 // &__jmp_buf (just in case)
- ;;
- st8.nta [r2] = r26 // ar.rsc
- ;;
- flushrs // flush dirty regs to backing store
- ;;
- and r27 = ~0x3,r26 // clear ar.rsc.mode
- ;;
- mov ar.rsc = r27 // put RSE in enforced lazy mode
- ;;
- mov r28 = ar.rnat
- ;;
- st8.nta [r3] = r28 // ar.rnat
- mov ar.rsc = r26 // restore ar.rsc
- ;;
- mov r8 = 0
- br.ret.sptk.few b0
- .endp IA64_context_save
- ");
+ asm(" \n"
+" .text \n"
+" .align 32 \n"
+" .global IA64_context_save \n"
+" .proc IA64_context_save \n"
+"IA64_context_save: \n"
+" alloc r14 = ar.pfs,1,0,0,0 \n"
+" mov r16 = ar.unat \n"
+" ;; \n"
+" mov r17 = ar.fpsr \n"
+" mov r2 = in0 \n"
+" add r3 = 8,in0 \n"
+" ;; \n"
+" st8.spill.nta [r2] = sp,16 // r12 (sp) \n"
+" ;; \n"
+" st8.spill.nta [r3] = gp,16 // r1 (gp) \n"
+" ;; \n"
+" st8.nta [r2] = r16,16 // save caller's unat \n"
+" st8.nta [r3] = r17,16 // save fpsr \n"
+" add r8 = 0xb0,in0 \n"
+" ;; \n"
+" st8.spill.nta [r2] = r4,16 // r4 \n"
+" ;; \n"
+" st8.spill.nta [r3] = r5,16 // r5 \n"
+" add r9 = 0xc0,in0 \n"
+" ;; \n"
+" stf.spill.nta [r8] = f2,32 \n"
+" stf.spill.nta [r9] = f3,32 \n"
+" mov r15 = rp \n"
+" ;; \n"
+" stf.spill.nta [r8] = f4,32 \n"
+" stf.spill.nta [r9] = f5,32 \n"
+" mov r17 = b1 \n"
+" ;; \n"
+" stf.spill.nta [r8] = f16,32 \n"
+" stf.spill.nta [r9] = f17,32 \n"
+" mov r18 = b2 \n"
+" ;; \n"
+" stf.spill.nta [r8] = f18,32 \n"
+" stf.spill.nta [r9] = f19,32 \n"
+" mov r19 = b3 \n"
+" ;; \n"
+" stf.spill.nta [r8] = f20,32 \n"
+" stf.spill.nta [r9] = f21,32 \n"
+" mov r20 = b4 \n"
+" ;; \n"
+" stf.spill.nta [r8] = f22,32 \n"
+" stf.spill.nta [r9] = f23,32 \n"
+" mov r21 = b5 \n"
+" ;; \n"
+" stf.spill.nta [r8] = f24,32 \n"
+" stf.spill.nta [r9] = f25,32 \n"
+" mov r22 = ar.lc \n"
+" ;; \n"
+" stf.spill.nta [r8] = f26,32 \n"
+" stf.spill.nta [r9] = f27,32 \n"
+" mov r24 = pr \n"
+" ;; \n"
+" stf.spill.nta [r8] = f28,32 \n"
+" stf.spill.nta [r9] = f29,32 \n"
+" ;; \n"
+" stf.spill.nta [r8] = f30 \n"
+" stf.spill.nta [r9] = f31 \n"
+" \n"
+" st8.spill.nta [r2] = r6,16 // r6 \n"
+" ;; \n"
+" st8.spill.nta [r3] = r7,16 // r7 \n"
+" ;; \n"
+" mov r23 = ar.bsp \n"
+" mov r25 = ar.unat \n"
+" \n"
+" st8.nta [r2] = r15,16 // b0 \n"
+" st8.nta [r3] = r17,16 // b1 \n"
+" ;; \n"
+" st8.nta [r2] = r18,16 // b2 \n"
+" st8.nta [r3] = r19,16 // b3 \n"
+" mov r26 = ar.rsc \n"
+" ;; \n"
+" st8.nta [r2] = r20,16 // b4 \n"
+" st8.nta [r3] = r21,16 // b5 \n"
+" ;; \n"
+" st8.nta [r2] = r14,16 // ar.pfs \n"
+" st8.nta [r3] = r22,16 // ar.lc \n"
+" ;; \n"
+" st8.nta [r2] = r24,16 // pr \n"
+" st8.nta [r3] = r23,16 // ar.bsp \n"
+" ;; \n"
+" st8.nta [r2] = r25,16 // ar.unat \n"
+" st8.nta [r3] = in0,16 // &__jmp_buf (just in case) \n"
+" ;; \n"
+" st8.nta [r2] = r26 // ar.rsc \n"
+" ;; \n"
+" flushrs // flush dirty regs to backing store \n"
+" ;; \n"
+" and r27 = ~0x3,r26 // clear ar.rsc.mode \n"
+" ;; \n"
+" mov ar.rsc = r27 // put RSE in enforced lazy mode \n"
+" ;; \n"
+" mov r28 = ar.rnat \n"
+" ;; \n"
+" st8.nta [r3] = r28 // ar.rnat \n"
+" mov ar.rsc = r26 // restore ar.rsc \n"
+" ;; \n"
+" mov r8 = 0 \n"
+" br.ret.sptk.few b0 \n"
+" .endp IA64_context_save \n"
+" \n");
/****************************************************************/
/* IA64_context_restore(__jmp_buf env, int val) */
- asm("
- .text
- .global IA64_context_restore
- .proc IA64_context_restore
-IA64_context_restore:
- alloc r8 = ar.pfs,2,0,0,0
- add r2 = 0x88,in0 // r2 <- &jmpbuf.ar_bsp
- mov r16 = ar.rsc
- ;;
- flushrs // flush dirty regs to backing store
- ;;
- and r17 = ~0x3,r16 // clear ar.rsc.mode
- ;;
- mov ar.rsc = r17 // put RSE in enforced lazy mode
- ;;
- invala // invalidate the ALAT
- ;;
- ld8 r23 = [r2],8 // r23 <- jmpbuf.ar_bsp
- ;;
- mov ar.bspstore = r23 // write BSPSTORE
- ld8 r25 = [r2],24 // r25 <- jmpbuf.ar_unat
- ;;
- ld8 r26 = [r2],-8 // r26 <- jmpbuf.ar_rnat
- ;;
- mov ar.rnat = r26 // write RNAT
- ld8 r27 = [r2] // r27 <- jmpbuf.ar_rsc
- ;;
- mov ar.rsc = r27 // write RSE control
- mov r2 = in0
- ;;
- mov ar.unat = r25 // write ar.unat
- add r3 = 8,in0
- ;;
- ld8.fill.nta sp = [r2],16 // r12 (sp)
- ld8.fill.nta gp = [r3],16 // r1 (gp)
- ;;
- ld8.nta r16 = [r2],16 // caller's unat
- ld8.nta r17 = [r3],16 // fpsr
- ;;
- ld8.fill.nta r4 = [r2],16 // r4
- ld8.fill.nta r5 = [r3],16 // r5
- ;;
- ld8.fill.nta r6 = [r2],16 // r6
- ld8.fill.nta r7 = [r3],16 // r7
- ;;
- mov ar.unat = r16 // restore caller's unat
- mov ar.fpsr = r17 // restore fpsr
- ;;
- ld8.nta r16 = [r2],16 // b0
- ld8.nta r17 = [r3],16 // b1
- ;;
- ld8.nta r18 = [r2],16 // b2
- ld8.nta r19 = [r3],16 // b3
- ;;
- ld8.nta r20 = [r2],16 // b4
- ld8.nta r21 = [r3],16 // b5
- ;;
- ld8.nta r11 = [r2],16 // ar.pfs
- ld8.nta r22 = [r3],72 // ar.lc
- ;;
- ld8.nta r24 = [r2],48 // pr
- mov b0 = r16
- ;;
- ldf.fill.nta f2 = [r2],32
- ldf.fill.nta f3 = [r3],32
- mov b1 = r17
- ;;
- ldf.fill.nta f4 = [r2],32
- ldf.fill.nta f5 = [r3],32
- mov b2 = r18
- ;;
- ldf.fill.nta f16 = [r2],32
- ldf.fill.nta f17 = [r3],32
- mov b3 = r19
- ;;
- ldf.fill.nta f18 = [r2],32
- ldf.fill.nta f19 = [r3],32
- mov b4 = r20
- ;;
- ldf.fill.nta f20 = [r2],32
- ldf.fill.nta f21 = [r3],32
- mov b5 = r21
- ;;
- ldf.fill.nta f22 = [r2],32
- ldf.fill.nta f23 = [r3],32
- mov ar.lc = r22
- ;;
- ldf.fill.nta f24 = [r2],32
- ldf.fill.nta f25 = [r3],32
- cmp.eq p6,p7 = 0,in1
- ;;
- ldf.fill.nta f26 = [r2],32
- ldf.fill.nta f27 = [r3],32
- mov ar.pfs = r11
- ;;
- ldf.fill.nta f28 = [r2],32
- ldf.fill.nta f29 = [r3],32
- ;;
- ldf.fill.nta f30 = [r2]
- ldf.fill.nta f31 = [r3]
-(p6) mov r8 = 1
-(p7) mov r8 = in1
-
- mov pr = r24,-1
- br.ret.sptk.few b0
- .endp IA64_context_restore
- ");
+ asm(" \n"
+" .text \n"
+" .global IA64_context_restore \n"
+" .proc IA64_context_restore \n"
+"IA64_context_restore: \n"
+" alloc r8 = ar.pfs,2,0,0,0 \n"
+" add r2 = 0x88,in0 // r2 <- &jmpbuf.ar_bsp \n"
+" mov r16 = ar.rsc \n"
+" ;; \n"
+" flushrs // flush dirty regs to backing store \n"
+" ;; \n"
+" and r17 = ~0x3,r16 // clear ar.rsc.mode \n"
+" ;; \n"
+" mov ar.rsc = r17 // put RSE in enforced lazy mode \n"
+" ;; \n"
+" invala // invalidate the ALAT \n"
+" ;; \n"
+" ld8 r23 = [r2],8 // r23 <- jmpbuf.ar_bsp \n"
+" ;; \n"
+" mov ar.bspstore = r23 // write BSPSTORE \n"
+" ld8 r25 = [r2],24 // r25 <- jmpbuf.ar_unat \n"
+" ;; \n"
+" ld8 r26 = [r2],-8 // r26 <- jmpbuf.ar_rnat \n"
+" ;; \n"
+" mov ar.rnat = r26 // write RNAT \n"
+" ld8 r27 = [r2] // r27 <- jmpbuf.ar_rsc \n"
+" ;; \n"
+" mov ar.rsc = r27 // write RSE control \n"
+" mov r2 = in0 \n"
+" ;; \n"
+" mov ar.unat = r25 // write ar.unat \n"
+" add r3 = 8,in0 \n"
+" ;; \n"
+" ld8.fill.nta sp = [r2],16 // r12 (sp) \n"
+" ld8.fill.nta gp = [r3],16 // r1 (gp) \n"
+" ;; \n"
+" ld8.nta r16 = [r2],16 // caller's unat \n"
+" ld8.nta r17 = [r3],16 // fpsr \n"
+" ;; \n"
+" ld8.fill.nta r4 = [r2],16 // r4 \n"
+" ld8.fill.nta r5 = [r3],16 // r5 \n"
+" ;; \n"
+" ld8.fill.nta r6 = [r2],16 // r6 \n"
+" ld8.fill.nta r7 = [r3],16 // r7 \n"
+" ;; \n"
+" mov ar.unat = r16 // restore caller's unat \n"
+" mov ar.fpsr = r17 // restore fpsr \n"
+" ;; \n"
+" ld8.nta r16 = [r2],16 // b0 \n"
+" ld8.nta r17 = [r3],16 // b1 \n"
+" ;; \n"
+" ld8.nta r18 = [r2],16 // b2 \n"
+" ld8.nta r19 = [r3],16 // b3 \n"
+" ;; \n"
+" ld8.nta r20 = [r2],16 // b4 \n"
+" ld8.nta r21 = [r3],16 // b5 \n"
+" ;; \n"
+" ld8.nta r11 = [r2],16 // ar.pfs \n"
+" ld8.nta r22 = [r3],72 // ar.lc \n"
+" ;; \n"
+" ld8.nta r24 = [r2],48 // pr \n"
+" mov b0 = r16 \n"
+" ;; \n"
+" ldf.fill.nta f2 = [r2],32 \n"
+" ldf.fill.nta f3 = [r3],32 \n"
+" mov b1 = r17 \n"
+" ;; \n"
+" ldf.fill.nta f4 = [r2],32 \n"
+" ldf.fill.nta f5 = [r3],32 \n"
+" mov b2 = r18 \n"
+" ;; \n"
+" ldf.fill.nta f16 = [r2],32 \n"
+" ldf.fill.nta f17 = [r3],32 \n"
+" mov b3 = r19 \n"
+" ;; \n"
+" ldf.fill.nta f18 = [r2],32 \n"
+" ldf.fill.nta f19 = [r3],32 \n"
+" mov b4 = r20 \n"
+" ;; \n"
+" ldf.fill.nta f20 = [r2],32 \n"
+" ldf.fill.nta f21 = [r3],32 \n"
+" mov b5 = r21 \n"
+" ;; \n"
+" ldf.fill.nta f22 = [r2],32 \n"
+" ldf.fill.nta f23 = [r3],32 \n"
+" mov ar.lc = r22 \n"
+" ;; \n"
+" ldf.fill.nta f24 = [r2],32 \n"
+" ldf.fill.nta f25 = [r3],32 \n"
+" cmp.eq p6,p7 = 0,in1 \n"
+" ;; \n"
+" ldf.fill.nta f26 = [r2],32 \n"
+" ldf.fill.nta f27 = [r3],32 \n"
+" mov ar.pfs = r11 \n"
+" ;; \n"
+" ldf.fill.nta f28 = [r2],32 \n"
+" ldf.fill.nta f29 = [r3],32 \n"
+" ;; \n"
+" ldf.fill.nta f30 = [r2] \n"
+" ldf.fill.nta f31 = [r3] \n"
+"(p6) mov r8 = 1 \n"
+"(p7) mov r8 = in1 \n"
+" \n"
+" mov pr = r24,-1 \n"
+" br.ret.sptk.few b0 \n"
+" .endp IA64_context_restore \n"
+" ");
/****************************************************************/
More information about the kaffe
mailing list