Module Name: src
Committed By: skrll
Date: Sat Nov 23 11:37:43 UTC 2024
Modified Files:
src/sys/arch/riscv/include: db_machdep.h
src/sys/arch/riscv/riscv: db_machdep.c db_trace.c trap.c
Log Message:
risc-v: don't include locore.h in db_machdep.h
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/riscv/include/db_machdep.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/riscv/riscv/db_machdep.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/riscv/riscv/db_trace.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/riscv/riscv/trap.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/riscv/include/db_machdep.h
diff -u src/sys/arch/riscv/include/db_machdep.h:1.11 src/sys/arch/riscv/include/db_machdep.h:1.12
--- src/sys/arch/riscv/include/db_machdep.h:1.11 Fri Nov 22 08:37:34 2024
+++ src/sys/arch/riscv/include/db_machdep.h Sat Nov 23 11:37:43 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.11 2024/11/22 08:37:34 skrll Exp $ */
+/* $NetBSD: db_machdep.h,v 1.12 2024/11/23 11:37:43 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -32,7 +32,6 @@
#ifndef _RISCV_DB_MACHDEP_H_
#define _RISCV_DB_MACHDEP_H_
-#include <riscv/locore.h> /* T_BREAK */
#include <riscv/frame.h>
#define DB_ELF_SYMBOLS
Index: src/sys/arch/riscv/riscv/db_machdep.c
diff -u src/sys/arch/riscv/riscv/db_machdep.c:1.11 src/sys/arch/riscv/riscv/db_machdep.c:1.12
--- src/sys/arch/riscv/riscv/db_machdep.c:1.11 Mon Jun 12 19:04:14 2023
+++ src/sys/arch/riscv/riscv/db_machdep.c Sat Nov 23 11:37:43 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.c,v 1.11 2023/06/12 19:04:14 skrll Exp $ */
+/* $NetBSD: db_machdep.c,v 1.12 2024/11/23 11:37:43 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,10 +31,12 @@
#include <sys/cdefs.h>
-__RCSID("$NetBSD: db_machdep.c,v 1.11 2023/06/12 19:04:14 skrll Exp $");
+__RCSID("$NetBSD: db_machdep.c,v 1.12 2024/11/23 11:37:43 skrll Exp $");
#include <sys/param.h>
+#include <sys/cpu.h>
+
#include <riscv/insn.h>
#include <riscv/db_machdep.h>
Index: src/sys/arch/riscv/riscv/db_trace.c
diff -u src/sys/arch/riscv/riscv/db_trace.c:1.5 src/sys/arch/riscv/riscv/db_trace.c:1.6
--- src/sys/arch/riscv/riscv/db_trace.c:1.5 Tue Nov 19 21:17:09 2024
+++ src/sys/arch/riscv/riscv/db_trace.c Sat Nov 23 11:37:43 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.5 2024/11/19 21:17:09 skrll Exp $ */
+/* $NetBSD: db_trace.c,v 1.6 2024/11/23 11:37:43 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,9 +31,10 @@
#include <sys/cdefs.h>
-__RCSID("$NetBSD: db_trace.c,v 1.5 2024/11/19 21:17:09 skrll Exp $");
+__RCSID("$NetBSD: db_trace.c,v 1.6 2024/11/23 11:37:43 skrll Exp $");
#include <sys/param.h>
+
#include <sys/systm.h>
#include <riscv/db_machdep.h>
Index: src/sys/arch/riscv/riscv/trap.c
diff -u src/sys/arch/riscv/riscv/trap.c:1.28 src/sys/arch/riscv/riscv/trap.c:1.29
--- src/sys/arch/riscv/riscv/trap.c:1.28 Fri Nov 22 20:01:04 2024
+++ src/sys/arch/riscv/riscv/trap.c Sat Nov 23 11:37:43 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.28 2024/11/22 20:01:04 skrll Exp $ */
+/* $NetBSD: trap.c,v 1.29 2024/11/23 11:37:43 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#define __PMAP_PRIVATE
#define __UFETCHSTORE_PRIVATE
-__RCSID("$NetBSD: trap.c,v 1.28 2024/11/22 20:01:04 skrll Exp $");
+__RCSID("$NetBSD: trap.c,v 1.29 2024/11/23 11:37:43 skrll Exp $");
#include <sys/param.h>
@@ -47,6 +47,7 @@ __RCSID("$NetBSD: trap.c,v 1.28 2024/11/
#include <uvm/uvm.h>
+#include <machine/locore.h>
#include <machine/machdep.h>
#include <machine/db_machdep.h>
#include <machine/userret.h>
