PatchSet 4097
Date: 2003/10/05 00:21:49
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
More multi-line string fixes
Members:
ChangeLog:1.1691->1.1692
config/sparc/jit.h:1.6->1.7
config/sparc/trampolines.c:1.2->1.3
config/sparc/linux/md.c:1.2->1.3
ChangeLog:1.1692->1.1693
config/superh/trampolines.c:1.1->1.2
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1691 kaffe/ChangeLog:1.1692
--- kaffe/ChangeLog:1.1691 Sun Oct 5 00:14:25 2003
+++ kaffe/ChangeLog Sun Oct 5 00:21:49 2003
@@ -1,5 +1,12 @@
2003-10-05 Dalibor Topic <[EMAIL PROTECTED]>
+ * config/sparc/jit.h,
+ config/sparc/trampolines.c,
+ config/sparc/linux/md.c:
+ Changed multi-line strings to single line strings.
+
+2003-10-05 Dalibor Topic <[EMAIL PROTECTED]>
+
* config/s390/common.h:
Changed multi-line strings to single line strings.
Index: kaffe/config/sparc/jit.h
diff -u kaffe/config/sparc/jit.h:1.6 kaffe/config/sparc/jit.h:1.7
--- kaffe/config/sparc/jit.h:1.6 Fri Feb 23 09:56:49 2001
+++ kaffe/config/sparc/jit.h Sun Oct 5 00:21:51 2003
@@ -60,12 +60,12 @@
#define CALL_KAFFE_EXCEPTION(F, H, O) \
do { \
register int o1 asm("o1"), o2 asm("o2"), o3 asm("o3"); \
- asm volatile(" \n\
- ta 3 \n\
- sub %%sp,64,%%sp \n\
- mov %2,%%fp \n\
- jmpl %1,%%g0 \n\
- restore %0,0,%%o0 \n\
+ asm volatile( \
+" ta 3 \n" \
+" sub %%sp,64,%%sp \n" \
+" mov %2,%%fp \n" \
+" jmpl %1,%%g0 \n" \
+" restore %0,0,%%o0 \n" \
" : : "r" (o1=(int)(O)), "r" (o2=(int)(H)), "r" (o3=(int)(F))); \
asm volatile("" : : "r"(o1), "r"(o2), "r"(o3)); \
} while (0)
Index: kaffe/config/sparc/trampolines.c
diff -u kaffe/config/sparc/trampolines.c:1.2 kaffe/config/sparc/trampolines.c:1.3
--- kaffe/config/sparc/trampolines.c:1.2 Thu Nov 4 20:48:40 1999
+++ kaffe/config/sparc/trampolines.c Sun Oct 5 00:21:51 2003
@@ -33,14 +33,14 @@
asm(
START_ASM_FUNC() C_FUNC_NAME(sparc_do_fixup_trampoline) "\n"
-C_FUNC_NAME(sparc_do_fixup_trampoline) ": \n
- save %sp,-64,%sp \n
- ld [%i7+8],%o0 \n
- ld [%i7+12],%o1 \n
- call " C_FUNC_NAME(soft_fixup_trampoline) " \n
- mov %g1,%i7 \n
- jmp %o0 \n
- restore"
+C_FUNC_NAME(sparc_do_fixup_trampoline) ": \n"
+" save %sp,-64,%sp \n"
+" ld [%i7+8],%o0 \n"
+" ld [%i7+12],%o1 \n"
+" call " C_FUNC_NAME(soft_fixup_trampoline) " \n"
+" mov %g1,%i7 \n"
+" jmp %o0 \n"
+" restore"
END_ASM_FUNC()
);
Index: kaffe/config/sparc/linux/md.c
diff -u kaffe/config/sparc/linux/md.c:1.2 kaffe/config/sparc/linux/md.c:1.3
--- kaffe/config/sparc/linux/md.c:1.2 Thu Oct 1 20:55:08 1998
+++ kaffe/config/sparc/linux/md.c Sun Oct 5 00:21:52 2003
@@ -25,16 +25,16 @@
#define GET_SP(E) (((void**)(E))[SP_OFFSET])
extern int __speciallongjmp(void*);
-asm("
-__speciallongjmp:
- mov %o0,%g1
- ta 3
- ld [%g1],%sp
- ld [%g1+4],%fp
- ld [%g1+8],%g1
- jmp %g1+8
- mov 1,%o0
-");
+asm(" \n"
+"__speciallongjmp: \n"
+" mov %o0,%g1 \n"
+" ta 3 \n"
+" ld [%g1],%sp \n"
+" ld [%g1+4],%fp \n"
+" ld [%g1+8],%g1 \n"
+" jmp %g1+8 \n"
+" mov 1,%o0 \n"
+);
void
sparcLinuxContextSwitch(jthread* from, jthread* to)
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1692 kaffe/ChangeLog:1.1693
--- kaffe/ChangeLog:1.1692 Sun Oct 5 00:21:49 2003
+++ kaffe/ChangeLog Sun Oct 5 00:25:55 2003
@@ -1,5 +1,10 @@
2003-10-05 Dalibor Topic <[EMAIL PROTECTED]>
+ * config/superh/trampolines.c:
+ Changed multi-line strings to single line strings.
+
+2003-10-05 Dalibor Topic <[EMAIL PROTECTED]>
+
* config/sparc/jit.h,
config/sparc/trampolines.c,
config/sparc/linux/md.c:
Index: kaffe/config/superh/trampolines.c
diff -u kaffe/config/superh/trampolines.c:1.1 kaffe/config/superh/trampolines.c:1.2
--- kaffe/config/superh/trampolines.c:1.1 Fri Jul 5 22:22:24 2002
+++ kaffe/config/superh/trampolines.c Sun Oct 5 00:25:56 2003
@@ -32,28 +32,28 @@
#endif
asm(
- START_ASM_FUNC() C_FUNC_NAME(superh_do_fixup_trampoline) " \n"
-C_FUNC_NAME(superh_do_fixup_trampoline) ": \n
- mov.l r4,@-r15
- mov.l r5,@-r15
- mov.l r6,@-r15
- mov.l r7,@-r15
- mov.l r1,@-r15
- sts pr,r4
- mov.l .L99999,r0
- jsr @r0
- nop
- lds.l @r15+,pr
- mov.l @r15+,r7
- mov.l @r15+,r6
- mov.l @r15+,r5
- mov.l @r15+,r4
- jmp @r0
- nop
- .align 2
-.L99999:
- .long " C_FUNC_NAME(soft_fixup_trampoline) "
-"
+ START_ASM_FUNC() C_FUNC_NAME(superh_do_fixup_trampoline) " \n"
+C_FUNC_NAME(superh_do_fixup_trampoline) ": \n"
+" mov.l r4,@-r15 \n"
+" mov.l r5,@-r15 \n"
+" mov.l r6,@-r15 \n"
+" mov.l r7,@-r15 \n"
+" mov.l r1,@-r15 \n"
+" sts pr,r4 \n"
+" mov.l .L99999,r0 \n"
+" jsr @r0 \n"
+" nop \n"
+" lds.l @r15+,pr \n"
+" mov.l @r15+,r7 \n"
+" mov.l @r15+,r6 \n"
+" mov.l @r15+,r5 \n"
+" mov.l @r15+,r4 \n"
+" jmp @r0 \n"
+" nop \n"
+" .align 2 \n"
+".L99999: \n"
+" .long " C_FUNC_NAME(soft_fixup_trampoline) " \n"
+" \n"
END_ASM_FUNC()
);
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
