[src/trunk]: src/sys/arch/news68k Convert expression for (0xe0dc0000-INTIOBAS...

[jmc <jmc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7de0a425746c
branches:  trunk
changeset: 572042:7de0a425746c
user:      jmc <jmc%NetBSD.org@localhost>
date:      Wed Dec 15 04:56:13 2004 +0000

description:
Convert expression for (0xe0dc0000-INTIOBASE1700) directly within a cpp
macro as otherwise gas gets handed an X - -Y expression and w 2.15 it won't
treat that as a valid expression

diffstat:

 sys/arch/news68k/include/cpu.h       |  3 ++-
 sys/arch/news68k/news68k/genassym.cf |  3 ++-
 sys/arch/news68k/news68k/locore.s    |  4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diffs (52 lines):

diff -r e32900aa1cca -r 7de0a425746c sys/arch/news68k/include/cpu.h
--- a/sys/arch/news68k/include/cpu.h    Wed Dec 15 04:52:05 2004 +0000
+++ b/sys/arch/news68k/include/cpu.h    Wed Dec 15 04:56:13 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.19 2004/09/26 21:44:26 yamt Exp $    */
+/*     $NetBSD: cpu.h,v 1.20 2004/12/15 04:56:13 jmc Exp $     */
 
 /*
  * Copyright (c) 1982, 1990, 1993
@@ -265,6 +265,7 @@
 #define ROMBASE                (0xe0000000)
 
 #define INTIOBASE1700  (0xe0c00000)
+#define INTIOBASE1700_OFF      (0xe0dc0000-INTIOBASE1700)
 #define INTIOTOP1700   (0xe1d00000) /* XXX */
 #define EXTIOBASE1700  (0xf0f00000)
 #define EXTIOTOP1700   (0xf1000000) /* XXX */
diff -r e32900aa1cca -r 7de0a425746c sys/arch/news68k/news68k/genassym.cf
--- a/sys/arch/news68k/news68k/genassym.cf      Wed Dec 15 04:52:05 2004 +0000
+++ b/sys/arch/news68k/news68k/genassym.cf      Wed Dec 15 04:56:13 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: genassym.cf,v 1.15 2004/12/12 10:26:36 tsutsui Exp $
+#      $NetBSD: genassym.cf,v 1.16 2004/12/15 04:56:13 jmc Exp $
 
 #
 # Copyright (c) 1982, 1990, 1993
@@ -142,6 +142,7 @@
 
 # magic
 define INTIOBASE1700           INTIOBASE1700
+define INTIOBASE1700_OFF       INTIOBASE1700_OFF
 define INTIOTOP1700            INTIOTOP1700
 define EXTIOBASE1700           EXTIOBASE1700
 define EXTIOTOP1700            EXTIOTOP1700
diff -r e32900aa1cca -r 7de0a425746c sys/arch/news68k/news68k/locore.s
--- a/sys/arch/news68k/news68k/locore.s Wed Dec 15 04:52:05 2004 +0000
+++ b/sys/arch/news68k/news68k/locore.s Wed Dec 15 04:56:13 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.34 2004/03/04 19:53:45 nathanw Exp $      */
+/*     $NetBSD: locore.s,v 1.35 2004/12/15 04:56:13 jmc Exp $  */
 
 /*
  * Copyright (c) 1980, 1990, 1993
@@ -1156,7 +1156,7 @@
 
 ASENTRY_NOPROFILE(debug_led2)
        movl    _C_LABEL(intiobase),%d1
-       addl    #(0xe0dc0000-INTIOBASE1700),%d1
+       addl    #INTIOBASE1700_OFF,%d1
        movl    %d1,%a0
        movl    %d0,%a0@