Module Name: src
Committed By: uwe
Date: Wed Jan 26 18:43:30 UTC 2011
Modified Files:
src/sys/arch/sh3/sh3: db_interface.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/sh3/sh3/db_interface.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sh3/sh3/db_interface.c
diff -u src/sys/arch/sh3/sh3/db_interface.c:1.59 src/sys/arch/sh3/sh3/db_interface.c:1.60
--- src/sys/arch/sh3/sh3/db_interface.c:1.59 Sat Nov 21 17:40:28 2009
+++ src/sys/arch/sh3/sh3/db_interface.c Wed Jan 26 18:43:30 2011
@@ -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;
