Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch Slightly rearrange the SSIR inline assembly impleme...



details:   https://anonhg.NetBSD.org/src/rev/7fac14c81140
branches:  trunk
changeset: 473690:7fac14c81140
user:      kleink <kleink%NetBSD.org@localhost>
date:      Tue Jun 15 15:26:34 1999 +0000

description:
Slightly rearrange the SSIR inline assembly implementation in order to avoid
making assumptions on C symbol name prefixes.

diffstat:

 sys/arch/hp300/include/intr.h   |  6 +++---
 sys/arch/mac68k/include/intr.h  |  6 +++---
 sys/arch/next68k/include/intr.h |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diffs (63 lines):

diff -r 0e38dacc223d -r 7fac14c81140 sys/arch/hp300/include/intr.h
--- a/sys/arch/hp300/include/intr.h     Tue Jun 15 15:18:55 1999 +0000
+++ b/sys/arch/hp300/include/intr.h     Tue Jun 15 15:26:34 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.h,v 1.4 1998/05/18 17:37:38 kleink Exp $  */
+/*     $NetBSD: intr.h,v 1.5 1999/06/15 15:26:34 kleink Exp $  */
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -165,9 +165,9 @@
 #define        SIR_CLOCK       0x02
 
 #define        siron(mask)     \
-       __asm __volatile ( "orb %0,_ssir" : : "i" ((mask)))
+       __asm __volatile ( "orb %1,%0" : "=m" (ssir) : "i" ((mask)))
 #define        siroff(mask)    \
-       __asm __volatile ( "andb %0,_ssir" : : "ir" (~(mask)));
+       __asm __volatile ( "andb %1,%0" : "=m" (ssir) : "ir" (~(mask)));
 
 #define        setsoftnet()    siron(SIR_NET)
 #define        setsoftclock()  siron(SIR_CLOCK)
diff -r 0e38dacc223d -r 7fac14c81140 sys/arch/mac68k/include/intr.h
--- a/sys/arch/mac68k/include/intr.h    Tue Jun 15 15:18:55 1999 +0000
+++ b/sys/arch/mac68k/include/intr.h    Tue Jun 15 15:26:34 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.h,v 1.13 1999/02/28 04:52:07 scottr Exp $ */
+/*     $NetBSD: intr.h,v 1.14 1999/06/15 15:26:34 kleink Exp $ */
 
 /*
  * Copyright (C) 1997 Scott Reynolds
@@ -129,9 +129,9 @@
 #define SIR_ADB                0x10
 
 #define        siron(mask)     \
-       __asm __volatile ( "orb %0,_ssir" : : "i" (mask))
+       __asm __volatile ( "orb %1,%0" : "=m" (ssir) : "i" (mask))
 #define        siroff(mask)    \
-       __asm __volatile ( "andb %0,_ssir" : : "ir" (~(mask)));
+       __asm __volatile ( "andb %1,%0" : "=m" (ssir) : "ir" (~(mask)));
 
 #define        setsoftnet()    siron(SIR_NET)
 #define        setsoftclock()  siron(SIR_CLOCK)
diff -r 0e38dacc223d -r 7fac14c81140 sys/arch/next68k/include/intr.h
--- a/sys/arch/next68k/include/intr.h   Tue Jun 15 15:18:55 1999 +0000
+++ b/sys/arch/next68k/include/intr.h   Tue Jun 15 15:26:34 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.h,v 1.2 1998/11/10 22:45:44 dbj Exp $     */
+/*     $NetBSD: intr.h,v 1.3 1999/06/15 15:26:34 kleink Exp $  */
 
 /*
  * Copyright (C) 1997 Scott Reynolds
@@ -137,9 +137,9 @@
 #define SIR_ADB                0x10
 
 #define        siron(mask)     \
-       __asm __volatile ( "orb %0,_ssir" : : "i" (mask))
+       __asm __volatile ( "orb %1,%0" : "=m" (ssir) : "i" (mask))
 #define        siroff(mask)    \
-       __asm __volatile ( "andb %0,_ssir" : : "ir" (~(mask)));
+       __asm __volatile ( "andb %1,%0" : "=m" (ssir) : "ir" (~(mask)));
 
 #define        setsoftnet()    siron(SIR_NET)
 #define        setsoftclock()  siron(SIR_CLOCK)



Home | Main Index | Thread Index | Old Index