asm -> __asm, inline -> __inline

diff --git a/sys/arch/mac68k/mac68k/fpu.c b/sys/arch/mac68k/mac68k/fpu.c
index 075d37f..1ea27f9 100644 (file)
--- a/sys/arch/mac68k/mac68k/fpu.c
+++ b/sys/arch/mac68k/mac68k/fpu.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: fpu.c,v 1.5 1996/10/14 01:15:52 briggs Exp $  */
+/*     $OpenBSD: fpu.c,v 1.6 1997/01/19 03:58:05 briggs Exp $  */
 /*     $NetBSD: fpu.c,v 1.16 1996/06/11 02:56:22 scottr Exp $  */
 
 /*
@@ -125,7 +125,7 @@ fpu_probe()
         * state, so we can determine which we have by
         * examining the size of the FP state frame
         */
-       asm("fnop");
+       __asm("fnop");
 
        nofault = (int *) 0;
 
@@ -141,7 +141,7 @@ fpu_probe()
         * have if this will.  We save the state in order to get the
         * size of the frame.
         */
-       asm("movl %0, a0; fsave a0@" : : "a" (fpframe) : "a0" );
+       __asm("movl %0, a0; fsave a0@" : : "a" (fpframe) : "a0" );
 
        b = *((u_char *) fpframe + 1);
 

diff --git a/sys/arch/mac68k/mac68k/machdep.c b/sys/arch/mac68k/mac68k/machdep.c
index d42d0f0..2aa7423 100644 (file)
--- a/sys/arch/mac68k/mac68k/machdep.c
+++ b/sys/arch/mac68k/mac68k/machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: machdep.c,v 1.25 1997/01/16 20:43:36 kstailey Exp $   */
+/*     $OpenBSD: machdep.c,v 1.26 1997/01/19 03:58:06 briggs Exp $     */
 /*     $NetBSD: machdep.c,v 1.122 1996/10/15 06:40:39 scottr Exp $     */
 
 /*
@@ -2589,10 +2589,10 @@ gray_bar()
        3) restore regs
 */
 
-       asm("movl a0, sp@-");
-       asm("movl a1, sp@-");
-       asm("movl d0, sp@-");
-       asm("movl d1, sp@-");
+       __asm("movl a0, sp@-");
+       __asm("movl a1, sp@-");
+       __asm("movl d0, sp@-");
+       __asm("movl d1, sp@-");
 
 /* check to see if gray bars are turned off */
        if (mac68k_machine.do_graybars) {
@@ -2603,10 +2603,10 @@ gray_bar()
                for (i = 0; i < 2 * videorowbytes / 4; i++)
                        ((u_long *) videoaddr)[gray_nextaddr++] = 0x00000000;
        }
-       asm("movl sp@+, d1");
-       asm("movl sp@+, d0");
-       asm("movl sp@+, a1");
-       asm("movl sp@+, a0");
+       __asm("movl sp@+, d1");
+       __asm("movl sp@+, d0");
+       __asm("movl sp@+, a1");
+       __asm("movl sp@+, a0");
 }
 #endif
 
@@ -2872,15 +2872,15 @@ printstar(void)
         * Be careful as we assume that no registers are clobbered
         * when we call this from assembly.
         */
-       asm("movl a0, sp@-");
-       asm("movl a1, sp@-");
-       asm("movl d0, sp@-");
-       asm("movl d1, sp@-");
+       __asm("movl a0, sp@-");
+       __asm("movl a1, sp@-");
+       __asm("movl d0, sp@-");
+       __asm("movl d1, sp@-");
 
        /* printf("*"); */
 
-       asm("movl sp@+, d1");
-       asm("movl sp@+, d0");
-       asm("movl sp@+, a1");
-       asm("movl sp@+, a0");
+       __asm("movl sp@+, d1");
+       __asm("movl sp@+, d0");
+       __asm("movl sp@+, a1");
+       __asm("movl sp@+, a0");
 }

diff --git a/sys/arch/mac68k/mac68k/macrom.c b/sys/arch/mac68k/mac68k/macrom.c
index bf6506d..fbed6a2 100644 (file)
--- a/sys/arch/mac68k/mac68k/macrom.c
+++ b/sys/arch/mac68k/mac68k/macrom.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: macrom.c,v 1.6 1996/10/30 05:26:29 briggs Exp $       */
+/*     $OpenBSD: macrom.c,v 1.7 1997/01/19 03:58:08 briggs Exp $       */
 /*     $NetBSD: macrom.c,v 1.26 1996/08/05 23:20:46 briggs Exp $       */
 
 /*-
@@ -133,7 +133,7 @@ mrg_Delay()
 
        u_int32_t ticks;
 
-       asm("   movl    a0, %0"         /* get arguments */
+       __asm(" movl    a0, %0"         /* get arguments */
                :
                : "g" (ticks)
                : "a0" );
@@ -179,7 +179,7 @@ mrg_VBLQueue()
 printf("mrg: mrg_VBLQueue: calling VBL task at 0x%x with VBLTask block at %p\n",
                           *((u_int32_t *)(vbltask + vblAddr)), vbltask);
 #endif       
-                   asm("   movml       #0xfffe, sp@-
+                   __asm("   movml     #0xfffe, sp@-
                            movl        %0, a0
                            movl        %1, a1
                            jbsr        a1@
@@ -214,9 +214,9 @@ printf("mrg: mrg_VBLQueue: calling VBL task at 0x%x with VBLTask block at %p\n",
 void
 mrg_init_stub_1()
 {
-       asm("movml #0xffff, sp@-");
+       __asm("movml #0xffff, sp@-");
        printf("mrg: hit mrg_init_stub_1\n");
-       asm("movml sp@+, #0xffff");
+       __asm("movml sp@+, #0xffff");
 }
 
 void
@@ -358,7 +358,7 @@ mrg_adbintr()       /* Call ROM ADB Interrupt */
 
                /* Gotta load a1 with VIA address. */
                /* ADB int expects it from Mac intr routine. */
-               asm("
+               __asm("
                        movml   #0xffff, sp@-
                        movl    %0, a0
                        movl    _VIA, a1
@@ -387,7 +387,7 @@ mrg_pmintr()        /* Call ROM PM Interrupt */
 
                /* Gotta load a1 with VIA address. */
                /* ADB int expects it from Mac intr routine. */
-               asm("
+               __asm("
                        movml   #0xffff, sp@-
                        movl    %0, a0
                        movl    _VIA, a1
@@ -427,7 +427,7 @@ mrg_NewPtr()
        u_int32_t trapword;
        caddr_t ptr;
 
-       asm("   movl    d1, %0
+       __asm(" movl    d1, %0
                movl    d0, %1"
                : "=g" (trapword), "=g" (numbytes) : : "d0", "d1");
 
@@ -456,7 +456,7 @@ mrg_NewPtr()
                bzero(ptr, numbytes); /* NewPtr, Clear ! */
        }
 
-       asm("   movl    %0, a0" :  : "g" (ptr) : "a0");
+       __asm(" movl    %0, a0" :  : "g" (ptr) : "a0");
        return(result);
 }
 
@@ -466,7 +466,7 @@ mrg_DisposPtr()
        int result = noErr;
        caddr_t ptr;
 
-       asm("   movl    a0, %0" : "=g" (ptr) : : "a0");
+       __asm(" movl    a0, %0" : "=g" (ptr) : : "a0");
 
 #if defined(MRG_SHOWTRAPS)
        printf("mrg: DisposPtr(%x)\n", ptr);
@@ -486,7 +486,7 @@ mrg_GetPtrSize()
 {
        caddr_t ptr;
 
-       asm("   movl    a0, %0" : "=g" (ptr) : : "a0");
+       __asm(" movl    a0, %0" : "=g" (ptr) : : "a0");
 
 #if defined(MRG_SHOWTRAPS)
        printf("mrg: GetPtrSize(%x)\n", ptr);
@@ -504,7 +504,7 @@ mrg_SetPtrSize()
        caddr_t ptr;
        int newbytes;
 
-       asm("   movl    a1, %0
+       __asm(" movl    a1, %0
                movl    d0, %1"
                : "=g" (ptr), "=g" (newbytes) : : "d0", "a1");
 
@@ -533,7 +533,7 @@ mrg_SetTrapAddress()
         caddr_t ptr;
         int trap_num;
 
-        asm("   movl a0, %0
+        __asm("   movl a0, %0
                 movl d0, %1"
                 : "=g" (ptr), "=g" (trap_num) : : "d0", "a0");
 
@@ -665,7 +665,7 @@ mrg_aline_super(struct frame *frame)
 /*     store a0 in d0bucket */
 /* This will change a1,d1,d0,a0 and possibly a6 */
 
-       asm("
+       __asm("
                movl    %2, a1
                movw    %3, d1
                movl    %4, d0
@@ -774,13 +774,13 @@ mrg_init()
 #if defined(MRG_TEST)
        if (ROMResourceMap) {
         printf("mrg: testing CountResources\n");
-        asm("   clrl    sp@-
+        __asm("   clrl    sp@-
                 clrl    sp@-
                 .word   0xa99c
                 movw    sp@+, %0"
                 : "=g" (rcnt));
         printf("mrg: found %d resources in ROM\n", rcnt);
-        asm("   clrl    sp@-
+        __asm("   clrl    sp@-
                 movl    #0x44525652, sp@-
                 .word   0xa99c
                 movw    sp@+, %0"
@@ -793,7 +793,7 @@ mrg_init()
 #if defined(MRG_TEST)
        if (ROMResourceMap) {
         printf("mrg: testing GetIndResource\n");
-        asm("   clrl    sp@-
+        __asm("   clrl    sp@-
                 movl    #0x44525652, sp@-
                 movw    #0x01, sp@-
                 .word   0xa99d
@@ -804,7 +804,7 @@ mrg_init()
             (long)Get_Ind_Resource(0x44525652, 1),
            (long)*Get_Ind_Resource(0x44525652, 1),
                (long) *((u_int32_t *) *Get_Ind_Resource(0x44525652, 1)));
-        asm("   clrl    sp@-
+        __asm("   clrl    sp@-
                 movl    #0x44525652, sp@-
                 movw    #0x02, sp@-
                 .word   0xa99d
@@ -988,7 +988,7 @@ setup_egret(void)
 
        /* This initializes ADBState (mrg_ADBStore2) and
           enables interrupts */
-               asm("   movml   a0-a2, sp@-
+               __asm(" movml   a0-a2, sp@-
                        movl    %1, a0          /* ADBState, mrg_adbstore2 */
                        movl    %0, a1
                        jbsr    a1@
@@ -1235,7 +1235,7 @@ ADBAlternateInit(void)
        if (0 == mrg_ADBAlternateInit){
                ADBReInit();
        } else {
-               asm("
+               __asm("
                        movml   a0-a6/d0-d7, sp@-
                        movl    %0, a1
                        movl    %1, a3

diff --git a/sys/arch/mac68k/mac68k/macrom.h b/sys/arch/mac68k/mac68k/macrom.h
index 942b9b7..350b332 100644 (file)
--- a/sys/arch/mac68k/mac68k/macrom.h
+++ b/sys/arch/mac68k/mac68k/macrom.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: macrom.h,v 1.3 1996/05/26 18:36:25 briggs Exp $       */
+/*     $OpenBSD: macrom.h,v 1.4 1997/01/19 03:58:08 briggs Exp $       */
 /*     $NetBSD: macrom.h,v 1.9 1996/05/25 14:45:35 briggs Exp $        */
 
 /*-
@@ -258,6 +258,6 @@ int mach_cputype __P((void));
 
 /* trace all instructions, not just flow changes. */
 #define tron() \
-       asm("movw sr, d0 ; orw #0x8000, d0 ; movw d0, sr" : : : "d0")
+       __asm("movw sr, d0 ; orw #0x8000, d0 ; movw d0, sr" : : : "d0")
 #define troff() \
-       asm("movw sr, d0 ; andw #0x3fff, d0 ; movw d0, sr" : : : "d0")
+       __asm("movw sr, d0 ; andw #0x3fff, d0 ; movw d0, sr" : : : "d0")

diff --git a/sys/arch/mac68k/mac68k/trap.c b/sys/arch/mac68k/mac68k/trap.c
index 7585e22..ae8c337 100644 (file)
--- a/sys/arch/mac68k/mac68k/trap.c
+++ b/sys/arch/mac68k/mac68k/trap.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: trap.c,v 1.5 1996/10/23 04:49:49 briggs Exp $ */
+/*     $OpenBSD: trap.c,v 1.6 1997/01/19 03:58:09 briggs Exp $ */
 /*     $NetBSD: trap.c,v 1.41 1996/10/17 06:42:44 scottr Exp $ */
 
 /*
@@ -133,7 +133,7 @@ int mmupid = -1;
 void   trap __P((int, unsigned, register unsigned, struct frame));
 void   syscall __P((register_t, struct frame));
 
-static inline void userret __P((register struct proc *,
+static __inline void userret __P((register struct proc *,
                                register struct frame *,
                                u_quad_t, u_int, int));
 
@@ -148,7 +148,7 @@ static int  dumpssw __P((register u_short));
  * Trap and syscall both need the following work done before returning
  * to user mode.
  */
-static inline void
+static __inline void
 userret(p, fp, oticks, faultaddr, fromtrap)
        register struct proc *p;
        register struct frame *fp;