[src/trunk]: src/sys/arch/sh3/sh3 BRCR and BAMRA have different format in sh3...

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

details:   https://anonhg.NetBSD.org/src/rev/6a4a3427a57f
branches:  trunk
changeset: 761409:6a4a3427a57f
user:      uwe <uwe%NetBSD.org@localhost>
date:      Wed Jan 26 18:43:30 2011 +0000

description:
BRCR and BAMRA have different format in sh3 and sh4, so there's no
point in using SH_() wrapper to refer to them in code that is already
model-specific.

diffstat:

 sys/arch/sh3/sh3/db_interface.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (44 lines):

diff -r 98e46729bcf2 -r 6a4a3427a57f sys/arch/sh3/sh3/db_interface.c
--- a/sys/arch/sh3/sh3/db_interface.c   Wed Jan 26 18:39:25 2011 +0000
+++ b/sys/arch/sh3/sh3/db_interface.c   Wed Jan 26 18:43:30 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_interface.c,v 1.59 2009/11/21 17:40:28 rmind Exp $  */
+/*     $NetBSD: db_interface.c,v 1.60 2011/01/26 18:43:30 uwe Exp $    */
 
 /*-
  * Copyright (C) 2002 UCHIYAMA Yasushi.  All rights reserved.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.59 2009/11/21 17:40:28 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.60 2011/01/26 18:43:30 uwe Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -232,10 +232,10 @@
 #ifdef SH3
        if (CPU_IS_SH3) {
                /* A: compare all address bits */
-               _reg_write_4(SH_(BAMRA), 0x00000000);
+               _reg_write_4(SH3_BAMRA, 0x00000000);
 
                /* A: break after execution, ignore ASID */
-               _reg_write_4(SH_(BRCR), (UBC_CTL_A_AFTER_INSN
+               _reg_write_4(SH3_BRCR, (UBC_CTL_A_AFTER_INSN
                                         | SH3_UBC_CTL_A_MASK_ASID));
 
                /* will be written to BBRA before RTE */
@@ -247,10 +247,10 @@
 #ifdef SH4
        if (CPU_IS_SH4) {
                /* A: compare all address bits, ignore ASID */
-               _reg_write_1(SH_(BAMRA), SH4_UBC_MASK_NONE | SH4_UBC_MASK_ASID);
+               _reg_write_1(SH4_BAMRA, SH4_UBC_MASK_NONE | SH4_UBC_MASK_ASID);
 
                /* A: break after execution */
-               _reg_write_2(SH_(BRCR), UBC_CTL_A_AFTER_INSN);
+               _reg_write_2(SH4_BRCR, UBC_CTL_A_AFTER_INSN);
 
                /* will be written to BBRA before RTE */
                regs->tf_ubc = UBC_CYCLE_INSN | UBC_CYCLE_READ;