From 99ad0c63ae85e6ea598476c8b67ee31ff92165ae Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 17 Apr 2002 17:29:02 +0000 Subject: [PATCH] 2002-04-17 Joel Sherrill * sparc/cygmon-salib.c, sparc/erc32-stub.c: Don't use multi-line strings. --- libgloss/ChangeLog | 5 +++ libgloss/sparc/cygmon-salib.c | 68 +++++++++++++++++------------------ libgloss/sparc/erc32-stub.c | 54 ++++++++++++++-------------- 3 files changed, 66 insertions(+), 61 deletions(-) diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog index 57b3f3272..e580b75e2 100644 --- a/libgloss/ChangeLog +++ b/libgloss/ChangeLog @@ -1,3 +1,8 @@ +2002-04-17 Joel Sherrill + + * sparc/cygmon-salib.c, sparc/erc32-stub.c: Don't use multi-line + strings. + 2002-04-16 Jeff Johnston * m68k/configure.in: Change to use LIB_AC_PROG_CC instead diff --git a/libgloss/sparc/cygmon-salib.c b/libgloss/sparc/cygmon-salib.c index 4f65c0f33..395e16f87 100644 --- a/libgloss/sparc/cygmon-salib.c +++ b/libgloss/sparc/cygmon-salib.c @@ -7,9 +7,9 @@ void putTtyChar(int c) { /* 2 is fork under solaris; bad juju */ - asm(" mov %i0,%o0 - or %g0,2,%g1 - ta 8 + asm(" mov %i0,%o0 \n\ + or %g0,2,%g1 \n\ + ta 8 \n\ nop"); } @@ -20,8 +20,8 @@ write(int fd,char *ptr,int amt) { return -1; } - asm(" or %g0, 4, %g1 - ta 8 + asm(" or %g0, 4, %g1 \n\ + ta 8 \n\ nop"); return amt; } @@ -33,8 +33,8 @@ read(int fd,char *ptr,int amt) { return -1; } - asm(" or %g0, 3, %g1 - ta 8 + asm(" or %g0, 3, %g1 \n\ + ta 8 \n\ nop"); return amt; } @@ -43,19 +43,19 @@ void _exit(int code) { while(1) { - asm(" or %g0,1,%g1 - ta 8 - nop - ta 1 - nop"); + asm(" or %g0,1,%g1 \n\ + ta 8 \n\ + nop \n\ + ta 1 \n\ + nop"); } } int setitimer(int which, const struct itimerval *value, struct itimerval *ovalue) { - asm(" or %g0, 158, %g1 - ta 8 + asm(" or %g0, 158, %g1 \n\ + ta 8 \n\ nop"); } @@ -138,8 +138,8 @@ isatty(int fd) int kill (int pid, int signal) { - asm ("or %g0, 37, %g1 - ta 8 + asm ("or %g0, 37, %g1 \n\ + ta 8 \n\ nop"); } @@ -152,50 +152,50 @@ getpid () int getitimer (int which, struct itimerval *value) { - asm ("or %g0, 157, %g1 - ta 8 + asm ("or %g0, 157, %g1 \n\ + ta 8 \n\ nop"); } void __install_signal_handler (void *func) { - asm ("mov %o0, %o1 - mov %g0, %o0 - or %g0, 48, %g1 - ta 8 + asm ("mov %o0, %o1 \n\ + mov %g0, %o0 \n\ + or %g0, 48, %g1 \n\ + ta 8 \n\ nop"); } int gettimeofday (struct timeval *tp, struct timezone *tzp) { - asm ("or %g0, 156, %g1 - ta 8 + asm ("or %g0, 156, %g1 \n\ + ta 8 \n\ nop"); } int stime (long *seconds) { - asm ("or %g0, 25, %g1 - ta 8 + asm ("or %g0, 25, %g1 \n\ + ta 8 \n\ nop"); } int add_mapping (long vma, long pma, long size) { - asm ("or %g0, 115, %g1 - ta 8 + asm ("or %g0, 115, %g1 \n\ + ta 8 \n\ nop"); } int remove_mapping (long vma, long vma_end) { - asm ("or %g0, 117, %g1 - ta 8 + asm ("or %g0, 117, %g1 \n\ + ta 8 \n\ nop"); } @@ -211,10 +211,10 @@ __getProgramArgs (int *argv) int *res; /* 184 is tsolsys under solaris; bad juju */ - asm ("mov %1, %%o0 - or %%g0, 184, %%g1 - ta 8 - nop + asm ("mov %1, %%o0 \n\ + or %%g0, 184, %%g1 \n\ + ta 8 \n\ + nop \n\ mov %%o0, %0" : "=r" (res) : "r" (argv): "g1"); return res; } diff --git a/libgloss/sparc/erc32-stub.c b/libgloss/sparc/erc32-stub.c index 71a65b259..98866e3da 100644 --- a/libgloss/sparc/erc32-stub.c +++ b/libgloss/sparc/erc32-stub.c @@ -136,22 +136,22 @@ handle_exception (registers) DEBUG (1, "Entering handle_exception()"); /* asm("mov %g0, %wim ; nop; nop; nop"); */ - asm(" save %sp, -64, %sp - save %sp, -64, %sp - save %sp, -64, %sp - save %sp, -64, %sp - save %sp, -64, %sp - save %sp, -64, %sp - save %sp, -64, %sp - save %sp, -64, %sp - restore - restore - restore - restore - restore - restore - restore - restore + asm(" save %sp, -64, %sp \n\ + save %sp, -64, %sp \n\ + save %sp, -64, %sp \n\ + save %sp, -64, %sp \n\ + save %sp, -64, %sp \n\ + save %sp, -64, %sp \n\ + save %sp, -64, %sp \n\ + save %sp, -64, %sp \n\ + restore \n\ + restore \n\ + restore \n\ + restore \n\ + restore \n\ + restore \n\ + restore \n\ + restore \n\ "); if (registers[PC] == (unsigned long)breakinst) { @@ -180,10 +180,10 @@ breakpoint() if (!initialized) return; - asm(" .globl " STRINGSYM(breakinst) " - " STRINGSYM(breakinst) ": ta 128+1 - nop - nop + asm(" .globl " STRINGSYM(breakinst) " \n\ + " STRINGSYM(breakinst) ": ta 128+1 \n\ + nop \n\ + nop \n\ "); } @@ -197,9 +197,9 @@ int tt; print ("Got a bad trap #"); outbyte (tt); outbyte ('\n'); - asm("ta 0 - nop - nop + asm("ta 0 \n\ + nop \n\ + nop \n\ "); } @@ -213,9 +213,9 @@ int tt; print ("Got a soft trap #"); outbyte (tt); outbyte ('\n'); - asm("ta 0 - nop - nop + asm("ta 0 \n\ + nop \n\ + nop \n\ "); } @@ -239,7 +239,7 @@ flush_i_cache () void target_reset() { - asm ("call 0 + asm ("call 0 \n\ nop "); }