PatchSet 4093 Date: 2003/10/04 23:34:56 Author: dalibor Branch: HEAD Tag: (none) Log: More multi-line string fixes
Members:
ChangeLog:1.1687->1.1688
config/m68k/common.h:1.9->1.10
config/m68k/trampolines.c:1.6->1.7
config/m68k/amigaos/md.c:1.3->1.4
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1687 kaffe/ChangeLog:1.1688
--- kaffe/ChangeLog:1.1687 Sat Oct 4 22:55:22 2003
+++ kaffe/ChangeLog Sat Oct 4 23:34:56 2003
@@ -1,5 +1,12 @@
2003-10-05 Dalibor Topic <[EMAIL PROTECTED]>
+ * config/m68k/common.h,
+ config/m68k/trampolines.c,
+ config/m68k/amigaos/md.c:
+ Changed multi-line strings to single line strings.
+
+2003-10-05 Dalibor Topic <[EMAIL PROTECTED]>
+
* config/i386/bsdi/md.c
config/i386/common.h,
config/i386/dgux/jit-md.h,
Index: kaffe/config/m68k/common.h
diff -u kaffe/config/m68k/common.h:1.9 kaffe/config/m68k/common.h:1.10
--- kaffe/config/m68k/common.h:1.9 Wed Apr 9 22:54:25 2003
+++ kaffe/config/m68k/common.h Sat Oct 4 23:34:57 2003
@@ -38,48 +38,48 @@
*/
#if defined(__linux__) // try forcing linux sysdepCallMethod()
#ifdef USE_ASM /* Old and obsolete... */
-#define sysdepCallMethod(CALL) \
- asm volatile (" \n\
- 1: \n\
- cmp.l #0,%0 \n\
- beq 3f \n\
- subq.l #1,%0 \n\
- cmp.b #0,(%2,%0.l) \n\
- beq 1b \n\
- cmp.b #1,(%2,%0.l) \n\
- beq 2f \n\
- move.l 4(%1,%0.l*8),-(%/sp) \n\
- 2: \n\
- move.l (%1,%0.l*8),-(%/sp) \n\
- jmp 1b \n\
- 3: \n\
- jsr (%3) \n\
- cmp.b #0x46,%4 \n\
- bne 4f \n\
- fmove.s %/fp0,(%5) \n\
- jmp 6f \n\
- 4: \n\
- cmp.b #0x44,%4 \n\
- bne 5f \n\
- fmove.d %/fp0,(%5) \n\
- jmp 6f \n\
- 5: \n\
- move.l %/d0,(%5) \n\
- cmp.b #0x4a,%4 \n\
- bne 6f \n\
- move.l %/d1,4(%5) \n\
- 6: \
- " : \
- : "r" ((CALL)->nrargs), \
- "a" ((CALL)->args), \
- "a" ((CALL)->callsize), \
- "a" ((CALL)->function), \
- "m" ((CALL)->rettype), \
- "a" ((CALL)->ret) \
- : "d0", "d1", "fp0", "cc", "memory"); \
- asm volatile (" \n\
- add.w %0,%/sp \n\
- " : : "r" ((CALL)->argsize * sizeof(jint)) : "cc")
+#define sysdepCallMethod(CALL) \
+ asm volatile (" \n" \
+" 1: \n" \
+" cmp.l #0,%0 \n" \
+" beq 3f \n" \
+" subq.l #1,%0 \n" \
+" cmp.b #0,(%2,%0.l) \n" \
+" beq 1b \n" \
+" cmp.b #1,(%2,%0.l) \n" \
+" beq 2f \n" \
+" move.l 4(%1,%0.l*8),-(%/sp) \n" \
+" 2: \n" \
+" move.l (%1,%0.l*8),-(%/sp) \n" \
+" jmp 1b \n" \
+" 3: \n" \
+" jsr (%3) \n" \
+" cmp.b #0x46,%4 \n" \
+" bne 4f \n" \
+" fmove.s %/fp0,(%5) \n" \
+" jmp 6f \n" \
+" 4: \n" \
+" cmp.b #0x44,%4 \n" \
+" bne 5f \n" \
+" fmove.d %/fp0,(%5) \n" \
+" jmp 6f \n" \
+" 5: \n" \
+" move.l %/d0,(%5) \n" \
+" cmp.b #0x4a,%4 \n" \
+" bne 6f \n" \
+" move.l %/d1,4(%5) \n" \
+" 6: \n" \
+" " : \
+ : "r" ((CALL)->nrargs), \
+ "a" ((CALL)->args), \
+ "a" ((CALL)->callsize), \
+ "a" ((CALL)->function), \
+ "m" ((CALL)->rettype), \
+ "a" ((CALL)->ret) \
+ : "d0", "d1", "fp0", "cc", "memory"); \
+ asm volatile (" \n" \
+" add.w %0,%/sp \n" \
+" " : : "r" ((CALL)->argsize * sizeof(jint)) : "cc")
#else /* undef USE_ASM */
// Linux version
#define sysdepCallMethod(CALL) do { \
@@ -125,7 +125,7 @@
#else /* not defined(__linux__) */
#define sysdepCallMethod(CALL) do \
-{
\
+{ \
int extraargs[(CALL)->nrargs]; \
register int d0 asm ("d0"); \
register int d1 asm ("d1"); \
@@ -135,7 +135,7 @@
int *args = extraargs; \
int argidx; \
for(argidx = 0; argidx < (CALL)->nrargs; ++argidx) \
- {
\
+ { \
if ((CALL)->callsize[argidx]) \
*args++ = (CALL)->args[argidx].i; \
else \
@@ -145,12 +145,12 @@
: "=r" (d0), "=r" (d1) \
: "a" ((CALL)->function) \
: "cc", "memory"); \
- if ((CALL)->retsize >= 1 ) \
- {
\
+ if ((CALL)->retsize >= 1 ) \
+ { \
res = (int *)(CALL)->ret; \
res[0] = d0; \
if((CALL)->retsize > 1) /* >= 2 */ \
- res[1] = d1; \
+ res[1] = d1; \
} \
} while (0)
@@ -170,16 +170,16 @@
unsigned int tmp, ret = 0; \
\
asm volatile( \
- " clr %1 \n" \
+ " clr %1 \n" \
"1: movel %2, %0\n" \
" cmpl %4, %0\n" \
" bne 2f\n" \
" casl %0, %5, %2\n" \
" bne 1b\n" \
- " movq #1, %1\n" \
+ " movq #1, %1\n" \
"2:\n" \
: "=&r" (tmp), "=&d" (ret), "=m" (*(A)) \
- : "m" (*(A)), "d" (O), "d" (N) \
+ : "m" (*(A)), "d" (O), "d" (N) \
: "memory"); \
\
ret; \
Index: kaffe/config/m68k/trampolines.c
diff -u kaffe/config/m68k/trampolines.c:1.6 kaffe/config/m68k/trampolines.c:1.7
--- kaffe/config/m68k/trampolines.c:1.6 Sat Dec 18 22:51:10 1999
+++ kaffe/config/m68k/trampolines.c Sat Oct 4 23:34:57 2003
@@ -40,11 +40,11 @@
asm (
START_ASM_FUNC() C_FUNC_NAME(m68k_do_fixup_trampoline) "\n"
-C_FUNC_NAME(m68k_do_fixup_trampoline) ":
- jbsr " C_FUNC_NAME(soft_fixup_trampoline) "
- addqw #4,%sp
- movel %d0,%a0
- jmp %a0@"
+C_FUNC_NAME(m68k_do_fixup_trampoline) ": \n"
+" jbsr " C_FUNC_NAME(soft_fixup_trampoline) " \n"
+" addqw #4,%sp \n"
+" movel %d0,%a0 \n"
+" jmp %a0@"
END_ASM_FUNC()
);
@@ -52,11 +52,11 @@
asm (
START_ASM_FUNC() C_FUNC_NAME(m68k_do_fixup_trampoline) "\n"
-C_FUNC_NAME(m68k_do_fixup_trampoline) ":
- jbsr " C_FUNC_NAME(soft_fixup_trampoline) "
- addqw #4,sp
- movel d0,a0
- jmp a0@"
+C_FUNC_NAME(m68k_do_fixup_trampoline) ": \n"
+" jbsr " C_FUNC_NAME(soft_fixup_trampoline) " \n"
+" addqw #4,sp \n"
+" movel d0,a0 \n"
+" jmp a0@"
END_ASM_FUNC()
);
Index: kaffe/config/m68k/amigaos/md.c
diff -u kaffe/config/m68k/amigaos/md.c:1.3 kaffe/config/m68k/amigaos/md.c:1.4
--- kaffe/config/m68k/amigaos/md.c:1.3 Wed Apr 9 22:54:25 2003
+++ kaffe/config/m68k/amigaos/md.c Sat Oct 4 23:34:58 2003
@@ -34,9 +34,9 @@
AmigaThisTask = FindTask (NULL);
// Initialise FPU to round properly
- asm volatile ( \
- "fmove.l fpcr,-(sp) \n" \
- "and.l #0xffffff00,sp@ \n" \
- "fmove.l (sp)+,fpcr \n" \
+ asm volatile ( \
+ "fmove.l fpcr,-(sp) \n" \
+ "and.l #0xffffff00,sp@ \n" \
+ "fmove.l (sp)+,fpcr \n" \
);
}
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
