[kaffe] CVS kaffe (dalibor): More multi-line string fixes

Kaffe CVS cvs-commits at kaffe.org
Sat Oct 4 16:58:02 PDT 2003


PatchSet 4094 
Date: 2003/10/04 23:55:53
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
More multi-line string fixes

Members: 
	ChangeLog:1.1688->1.1689 
	config/mips/jit.h:1.8->1.9 
	config/mips/trampolines.c:1.2->1.3 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1688 kaffe/ChangeLog:1.1689
--- kaffe/ChangeLog:1.1688	Sat Oct  4 23:34:56 2003
+++ kaffe/ChangeLog	Sat Oct  4 23:55:53 2003
@@ -1,5 +1,11 @@
 2003-10-05  Dalibor Topic <robilad at kaffe.org>
 
+	* config/mips/jit.h,
+	config/mips/trampolines.c:
+	Changed multi-line strings to single line strings.
+
+2003-10-05  Dalibor Topic <robilad at kaffe.org>
+
 	* config/m68k/common.h,
 	config/m68k/trampolines.c,
 	config/m68k/amigaos/md.c:
Index: kaffe/config/mips/jit.h
diff -u kaffe/config/mips/jit.h:1.8 kaffe/config/mips/jit.h:1.9
--- kaffe/config/mips/jit.h:1.8	Sun Jun 17 16:39:54 2001
+++ kaffe/config/mips/jit.h	Sat Oct  4 23:55:54 2003
@@ -46,12 +46,12 @@
 /* Call the relevant exception handler (rewinding the stack as
    necessary). */
 #define CALL_KAFFE_EXCEPTION(F, H, O)					\
-	asm volatile("							\n\
-		move $2,%2						\n\
-		move $fp,%0						\n\
-		jr %1							\n\
-		nop							\n\
-	" : : "r" ((F)), "r" ((H)), "r" (O) : "$2")
+	asm volatile("	\n"						\
+"		move $2,%2 \n"						\
+"		move $fp,%0 \n"						\
+"		jr %1 \n"						\
+"		nop \n"							\
+"	" : : "r" ((F)), "r" ((H)), "r" (O) : "$2")
 
 /**/
 /* Method dispatch.  */
Index: kaffe/config/mips/trampolines.c
diff -u kaffe/config/mips/trampolines.c:1.2 kaffe/config/mips/trampolines.c:1.3
--- kaffe/config/mips/trampolines.c:1.2	Sat Oct  9 02:03:14 1999
+++ kaffe/config/mips/trampolines.c	Sat Oct  4 23:55:54 2003
@@ -31,50 +31,50 @@
 #define C_FUNC_NAME(FUNC) #FUNC
 #endif
 
-asm("
-	.text							\n
-	.align	4						\n
-	sw	$31, 0($sp)					\n
-l1:	.word	" C_FUNC_NAME(soft_fixup_trampoline) "		\n
-	.globl 	mips_do_fixup_trampoline			\n
-	.ent	mips_do_fixup_trampoline			\n
-mips_do_fixup_trampoline:					\n
-	addi	$sp, $sp, -48					\n
-	# needed by the backtracer 				\n
-	sw	$31, 0($sp)					\n
-	sw	$2, 0($sp)					\n
-	sw	$4, 8($sp)					\n
-	sw	$5, 12($sp)					\n
-	sw	$6, 16($sp)					\n
-	sw	$7, 20($sp)					\n
-	swc1	$f13, 24($sp)					\n
-	swc1	$f12, 28($sp)					\n
-	swc1	$f15, 32($sp)					\n
-	swc1	$f14, 36($sp)					\n
-	sw	$30, 40($sp)					\n
-        sw      $gp, 4($sp)                                     \n
-        # $fp = $sp                                             \n
-	move	$30, $sp					\n
-	lw	$4, 0($31)					\n
-	lw	$5, 4($31)					\n
-	lw	$25, -4($25)					\n
-	jalr	$25						\n
-	nop							\n
-	lw	$30, 40($sp)					\n
-	lwc1	$f14, 36($sp)					\n
-	lwc1	$f15, 32($sp)					\n
-	lwc1	$f12, 28($sp)					\n
-	lwc1	$f13, 24($sp)					\n
-	lw	$7, 20($sp)					\n
-	lw	$6, 16($sp)					\n
-	lw	$5, 12($sp)					\n
-	lw	$4, 8($sp)					\n
-	lw	$gp, 4($sp)					\n
-	lw	$31, 0($sp)					\n
-	addi	$sp, $sp, 48					\n
-	move	$25, $2						\n
-	jr	$2						\n
-	.end	mips_do_fixup_trampoline"
+asm(" \n"
+"	.text \n"						\
+"	.align	4 \n"						\
+"	sw	$31, 0($sp) \n"					\
+"l1:	.word	" C_FUNC_NAME(soft_fixup_trampoline) " \n"	\
+"	.globl 	mips_do_fixup_trampoline \n"			\
+"	.ent	mips_do_fixup_trampoline \n"			\
+"mips_do_fixup_trampoline: \n"					\
+"	addi	$sp, $sp, -48 \n"				\
+"	# needed by the backtracer \n"				\
+"	sw	$31, 0($sp) \n"					\
+"	sw	$2, 0($sp) \n"					\
+"	sw	$4, 8($sp) \n"					\
+"	sw	$5, 12($sp) \n"					\
+"	sw	$6, 16($sp) \n"					\
+"	sw	$7, 20($sp) \n"					\
+"	swc1	$f13, 24($sp) \n"				\
+"	swc1	$f12, 28($sp) \n"				\
+"	swc1	$f15, 32($sp) \n"				\
+"	swc1	$f14, 36($sp) \n"				\
+"	sw	$30, 40($sp) \n"				\
+"       sw      $gp, 4($sp) \n"					\
+"        # $fp = $sp \n"					\
+"	move	$30, $sp \n"					\
+"	lw	$4, 0($31) \n"					\
+"	lw	$5, 4($31) \n"					\
+"	lw	$25, -4($25) \n"				\
+"	jalr	$25 \n"						\
+"	nop \n"							\
+"	lw	$30, 40($sp) \n"				\
+"	lwc1	$f14, 36($sp) \n"				\
+"	lwc1	$f15, 32($sp) \n"				\
+"	lwc1	$f12, 28($sp) \n"				\
+"	lwc1	$f13, 24($sp) \n"				\
+"	lw	$7, 20($sp) \n"					\
+"	lw	$6, 16($sp) \n"					\
+"	lw	$5, 12($sp) \n"					\
+"	lw	$4, 8($sp) \n"					\
+"	lw	$gp, 4($sp) \n"					\
+"	lw	$31, 0($sp) \n"					\
+"	addi	$sp, $sp, 48 \n"				\
+"	move	$25, $2	\n"					\
+"	jr	$2 \n"						\
+"	.end	mips_do_fixup_trampoline"
 );
 
 #endif




More information about the kaffe mailing list