[kaffe] CVS kaffe (dalibor): More multi-line string fixes
Kaffe CVS
cvs-commits at kaffe.org
Sat Oct 4 15:58:04 PDT 2003
PatchSet 4092
Date: 2003/10/04 22:55:22
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
More multi-line string fixes
Members:
ChangeLog:1.1686->1.1687
config/i386/common.h:1.15->1.16
config/i386/jit.h:1.18->1.19
config/i386/trampolines.c:1.7->1.8
config/i386/bsdi/md.c:1.2->1.3
config/i386/dgux/jit-md.h:1.2->1.3
config/i386/qnx/md.h:1.4->1.5
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1686 kaffe/ChangeLog:1.1687
--- kaffe/ChangeLog:1.1686 Sat Oct 4 21:10:19 2003
+++ kaffe/ChangeLog Sat Oct 4 22:55:22 2003
@@ -1,3 +1,13 @@
+2003-10-05 Dalibor Topic <robilad at kaffe.org>
+
+ * config/i386/bsdi/md.c
+ config/i386/common.h,
+ config/i386/dgux/jit-md.h,
+ config/i386/jit.h,
+ config/i386/qnx/md.h,
+ config/i386/trampolines.c:
+ Changed multi-line strings to single line strings.
+
2003-10-04 Dalibor Topic <robilad at kaffe.org>
* configure.in:
Index: kaffe/config/i386/common.h
diff -u kaffe/config/i386/common.h:1.15 kaffe/config/i386/common.h:1.16
--- kaffe/config/i386/common.h:1.15 Sun Nov 21 21:44:13 1999
+++ kaffe/config/i386/common.h Sat Oct 4 22:55:23 2003
@@ -99,10 +99,10 @@
#define COMPARE_AND_EXCHANGE(A,O,N) \
({ \
char ret; \
- asm volatile(" \
- lock \n\
- cmpxchgl %2,%1 \n\
- sete %0" \
+ asm volatile(" \n" \
+ " lock \n"\
+ " cmpxchgl %2,%1 \n"\
+ " sete %0" \
: "=q" (ret), KAFFE_PLUS_M_ASM_CONSTRAINT (*(A)) \
: "r" (N), "a" (O) : "cc" ); \
(ret); \
Index: kaffe/config/i386/jit.h
diff -u kaffe/config/i386/jit.h:1.18 kaffe/config/i386/jit.h:1.19
--- kaffe/config/i386/jit.h:1.18 Mon May 7 10:04:39 2001
+++ kaffe/config/i386/jit.h Sat Oct 4 22:55:23 2003
@@ -40,10 +40,10 @@
/* Call the relevant exception handler (rewinding the stack as
necessary). */
#define CALL_KAFFE_EXCEPTION(F, H, O) \
- asm(" movl %2,%%eax \n\
- movl %0,%%ebp \n\
- jmp *%1 \n\
- " : : "g" (F), "r" (H), "g" (O) : "eax")
+ asm(" movl %2,%%eax \n" \
+ " movl %0,%%ebp \n" \
+ " jmp *%1 \n" \
+ : : "g" (F), "r" (H), "g" (O) : "eax")
/**/
Index: kaffe/config/i386/trampolines.c
diff -u kaffe/config/i386/trampolines.c:1.7 kaffe/config/i386/trampolines.c:1.8
--- kaffe/config/i386/trampolines.c:1.7 Mon Jan 6 17:14:18 2003
+++ kaffe/config/i386/trampolines.c Sat Oct 4 22:55:23 2003
@@ -51,18 +51,18 @@
* on the way cross-shared library calls are made.
*/
asm(
- START_ASM_FUNC() C_FUNC_NAME(__kaffe_i386_gcj_fixup) "\n"
-C_FUNC_NAME(__kaffe_i386_gcj_fixup) ": \
- mov (%esp), %eax # get return address \
- add -4(%eax), %eax # add jump relative offset from previous instr. \
- # this points at at jmp *$off(%ebx) instr. \
- mov 2(%eax), %eax # extract 'off' \
- add %ebx, %eax # compute $off(%ebx) \
- pushl %eax # pass as first argument \
- call " C_FUNC_NAME(gcj_fixup_trampoline) " # returns target \
- addl $4, %esp # remove argument \
- jmp *%eax # jump to target \
-"
+ START_ASM_FUNC() C_FUNC_NAME(__kaffe_i386_gcj_fixup) " \n"
+C_FUNC_NAME(__kaffe_i386_gcj_fixup) ": \n"
+" mov (%esp), %eax # get return address \n"
+" add -4(%eax), %eax # add jump relative offset from previous instr. \n"
+" # this points at at jmp *$off(%ebx) instr. \n"
+" mov 2(%eax), %eax # extract 'off' \n"
+" add %ebx, %eax # compute $off(%ebx) \n"
+" pushl %eax # pass as first argument \n"
+" call " C_FUNC_NAME(gcj_fixup_trampoline) " # returns target \n"
+" addl $4, %esp # remove argument \n"
+" jmp *%eax # jump to target \n"
+" \n"
END_ASM_FUNC()
);
Index: kaffe/config/i386/bsdi/md.c
diff -u kaffe/config/i386/bsdi/md.c:1.2 kaffe/config/i386/bsdi/md.c:1.3
--- kaffe/config/i386/bsdi/md.c:1.2 Fri May 21 16:58:35 1999
+++ kaffe/config/i386/bsdi/md.c Sat Oct 4 22:55:24 2003
@@ -25,70 +25,70 @@
*
* @author ted stockwell, early morning software
*/
- asm("
- .text
- .globl _i386_longjmp
- _i386_longjmp:
- movl 0x4(%esp), %eax
-
- /* restore edi */
- movl 0x4(%eax), %edi
-
- /* save rc in the edi slot */
- movl 0x8(%esp), %edx
- movl %edx, 0x4(%eax)
-
- movl (%eax), %ebp
- movl 0x8(%eax), %esp
- movl 0xc(%eax), %esi
- movl 0x10(%eax), %ebx
-
- /*add $4, %esp*/
-
- /* put return addr on stack */
- movl 0x14(%eax), %edx
- movl %edx, (%esp)
-
- /* restore edx and get rc in eax */
- movl 0x18(%eax), %edx
- pushl %edx
- movl 0x4(%eax), %edx
- movl %edx, %eax
- popl %edx
-
-
- /*jmpl 0x14(%edx)*/
-
- /* should now return as if we're returning from setjmp */
- retl
- ");
-
- asm("
- .text
- .globl _i386_setjmp
- _i386_setjmp:
- movl 0x4(%esp), %eax
-
- /* save environment */
- movl %ebp, (%eax)
- movl %edi, 0x4(%eax)
- movl %esp, 0x8(%eax)
- movl %esi, 0xc(%eax)
- movl %ebx, 0x10(%eax)
- movl %edx, 0x18(%eax)
-
- /* get the return addr into the buffer while preserving the
- value of the edx register.
- */
- pushl %edx
- movl 0x4(%esp), %edx
- movl %edx, 0x14(%eax)
- popl %edx
-
- /* return 0 */
- subl %eax, %eax
- retl
- ");
+ asm(" \n"
+" .text \n"
+" .globl _i386_longjmp \n"
+" _i386_longjmp: \n"
+" movl 0x4(%esp), %eax \n"
+" \n"
+" /* restore edi */ \n"
+" movl 0x4(%eax), %edi \n"
+" \n"
+" /* save rc in the edi slot */ \n"
+" movl 0x8(%esp), %edx \n"
+" movl %edx, 0x4(%eax) \n"
+" \n"
+" movl (%eax), %ebp \n"
+" movl 0x8(%eax), %esp \n"
+" movl 0xc(%eax), %esi \n"
+" movl 0x10(%eax), %ebx \n"
+" \n"
+" /*add $4, %esp*/ \n"
+" \n"
+" /* put return addr on stack */ \n"
+" movl 0x14(%eax), %edx \n"
+" movl %edx, (%esp) \n"
+" \n"
+" /* restore edx and get rc in eax */ \n"
+" movl 0x18(%eax), %edx \n"
+" pushl %edx \n"
+" movl 0x4(%eax), %edx \n"
+" movl %edx, %eax \n"
+" popl %edx \n"
+" \n"
+" \n"
+" /*jmpl 0x14(%edx)*/ \n"
+" \n"
+" /* should now return as if we're returning from setjmp */ \n"
+" retl \n"
+" \n");
+
+ asm(" \n"
+" .text \n"
+" .globl _i386_setjmp \n"
+" _i386_setjmp: \n"
+" movl 0x4(%esp), %eax \n"
+" \n"
+" /* save environment */ \n"
+" movl %ebp, (%eax) \n"
+" movl %edi, 0x4(%eax) \n"
+" movl %esp, 0x8(%eax) \n"
+" movl %esi, 0xc(%eax) \n"
+" movl %ebx, 0x10(%eax) \n"
+" movl %edx, 0x18(%eax) \n"
+" \n"
+" /* get the return addr into the buffer while preserving the \n"
+" value of the edx register. \n"
+" */ \n"
+" pushl %edx \n"
+" movl 0x4(%esp), %edx \n"
+" movl %edx, 0x14(%eax) \n"
+" popl %edx \n"
+" \n"
+" /* return 0 */ \n"
+" subl %eax, %eax \n"
+" retl \n"
+" \n");
Index: kaffe/config/i386/dgux/jit-md.h
diff -u kaffe/config/i386/dgux/jit-md.h:1.2 kaffe/config/i386/dgux/jit-md.h:1.3
--- kaffe/config/i386/dgux/jit-md.h:1.2 Wed Aug 27 07:04:20 2003
+++ kaffe/config/i386/dgux/jit-md.h Sat Oct 4 22:55:24 2003
@@ -23,22 +23,22 @@
#undef CALL_KAFFE_FUNCTION_VARARGS
#define CALL_KAFFE_FUNCTION_VARARGS(meth, obj, nargs, argptr, retval) \
- asm volatile (" \n\
- movl %3,%%eax \n\
-.L1_%5: cmpl $0,%%eax \n\
- je .L2_%5 \n\
- decl %%eax \n\
- pushl (%4,%%eax,4) \n\
- jmp .L1_%5 \n\
-.L2_%5: \n\
- pushl %2 \n\
- call *%1 \n\
- movl %%eax,%0 \n\
- " : "=r" (retval) : \
+ asm volatile (" \n" \
+" movl %3,%%eax \n" \
+".L1_%5: cmpl $0,%%eax \n" \
+" je .L2_%5 \n" \
+" decl %%eax \n" \
+" pushl (%4,%%eax,4) \n" \
+" jmp .L1_%5 \n" \
+".L2_%5: \n" \
+" pushl %2 \n" \
+" call *%1 \n" \
+" movl %%eax,%0 \n" \
+" " : "=r" (retval) : \
"r" (meth->ncode), "r" (obj), "r" (nargs), "r" (argptr), \
"X" (__LINE__) \
: "eax", "cc" ); \
- asm volatile (" \n\
+ asm volatile (" \n "\
addl %0,%%esp" : : "r" (4*(nargs+1)) : "cc")
/* Function prototype for signal handlers */
Index: kaffe/config/i386/qnx/md.h
diff -u kaffe/config/i386/qnx/md.h:1.4 kaffe/config/i386/qnx/md.h:1.5
--- kaffe/config/i386/qnx/md.h:1.4 Wed Aug 27 07:04:22 2003
+++ kaffe/config/i386/qnx/md.h Sat Oct 4 22:55:24 2003
@@ -79,32 +79,32 @@
*/
#undef sysdepCallMethod
#define sysdepCallMethod(CALL) \
- asm volatile (" \n\
-1: \n\
- cmpl $0,%0 \n\
- je 3f \n\
- decl %0 \n\
- cmpb $0,(%2,%0) \n\
- je 1b \n\
- cmpb $1,(%2,%0) \n\
- je 2f \n\
- pushl 4(%1,%0,8) \n\
-2: \n\
- pushl (%1,%0,8) \n\
- jmpl 1b \n\
-3: \n\
- call *%3 \n\
- movl %5,%%ebx \n\
- movb %4,%%cl \n\
- movl %%eax,(%%ebx) \n\
- cmpb $0x44,%%cl \n\
- je 4f \n\
- cmpb $0x4a,%%cl \n\
- jne 5f \n\
-4: \n\
- movl %%edx,4(%%ebx) \n\
-5: \n\
- " : \
+ asm volatile (" \n" \
+"1: \n" \
+" cmpl $0,%0 \n" \
+" je 3f \n" \
+" decl %0 \n" \
+" cmpb $0,(%2,%0) \n" \
+" je 1b \n" \
+" cmpb $1,(%2,%0) \n" \
+" je 2f \n" \
+" pushl 4(%1,%0,8) \n" \
+"2: \n" \
+" pushl (%1,%0,8) \n" \
+" jmpl 1b \n" \
+"3: \n" \
+" call *%3 \n" \
+" movl %5,%%ebx \n" \
+" movb %4,%%cl \n" \
+" movl %%eax,(%%ebx) \n" \
+" cmpb $0x44,%%cl \n" \
+" je 4f \n" \
+" cmpb $0x4a,%%cl \n" \
+" jne 5f \n" \
+"4: \n" \
+" movl %%edx,4(%%ebx) \n" \
+"5: \n" \
+" " : \
: "r" ((CALL)->nrargs), \
"r" ((CALL)->args), \
"r" ((CALL)->callsize), \
@@ -112,8 +112,8 @@
"m" ((CALL)->rettype), \
"m" ((CALL)->ret) \
: "eax", "ebx", "ecx", "edx", "edi", "esi", "cc", "memory"); \
- asm volatile (" \n\
- subl %0,%%esp \n\
+ asm volatile (" \n" \
+" subl %0,%%esp \n" \
" : : "r" ((CALL)->argsize * sizeof(jint)) : "cc")
#endif
More information about the kaffe
mailing list