Module Name: src
Committed By: andvar
Date: Sun Sep 3 20:52:13 UTC 2023
Modified Files:
src/sys/arch/hppa/hppa: kgdb_hppa.c
src/sys/arch/hppa/include: db_machdep.h
Log Message:
remove (db_addr_t) cast in hppa PC_REGS(regs) definition.
rename tf_hptm to tf_cr24 in kgdb_hppa.c.
This name was lost from trapframe (frame.h) in v1.8 and restored as tf_cr24 in
v1.12.
Fixes KGDB enabled build for hppa.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hppa/hppa/kgdb_hppa.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hppa/include/db_machdep.h
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/hppa/hppa/kgdb_hppa.c
diff -u src/sys/arch/hppa/hppa/kgdb_hppa.c:1.10 src/sys/arch/hppa/hppa/kgdb_hppa.c:1.11
--- src/sys/arch/hppa/hppa/kgdb_hppa.c:1.10 Mon Sep 6 21:56:03 2021
+++ src/sys/arch/hppa/hppa/kgdb_hppa.c Sun Sep 3 20:52:13 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kgdb_hppa.c,v 1.10 2021/09/06 21:56:03 andvar Exp $ */
+/* $NetBSD: kgdb_hppa.c,v 1.11 2023/09/03 20:52:13 andvar Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kgdb_hppa.c,v 1.10 2021/09/06 21:56:03 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kgdb_hppa.c,v 1.11 2023/09/03 20:52:13 andvar Exp $");
#include <sys/param.h>
#include <sys/kgdb.h>
@@ -206,7 +206,7 @@ kgdb_signal(int type)
KGDB_MOVEREG(54, tf_ccr); /* cr10 */ \
KGDB_MOVEREG(55, tf_pidr3); /* cr12 */ \
KGDB_MOVEREG(56, tf_pidr4); /* cr13 */ \
- KGDB_MOVEREG(57, tf_hptm); /* cr24 - DDB */ \
+ KGDB_MOVEREG(57, tf_cr24); /* cr24 - DDB */ \
KGDB_MOVEREG(58, tf_vtop); /* cr25 - DDB */ \
/* 59 should be cr26, which we don't have available */ \
KGDB_MOVEREG(60, tf_cr27); /* - DDB */ \
Index: src/sys/arch/hppa/include/db_machdep.h
diff -u src/sys/arch/hppa/include/db_machdep.h:1.14 src/sys/arch/hppa/include/db_machdep.h:1.15
--- src/sys/arch/hppa/include/db_machdep.h:1.14 Mon Nov 6 03:47:46 2017
+++ src/sys/arch/hppa/include/db_machdep.h Sun Sep 3 20:52:13 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.14 2017/11/06 03:47:46 christos Exp $ */
+/* $NetBSD: db_machdep.h,v 1.15 2023/09/03 20:52:13 andvar Exp $ */
/* $OpenBSD: db_machdep.h,v 1.5 2001/02/16 19:20:13 mickey Exp $ */
@@ -61,7 +61,7 @@ typedef long kgdb_reg_t;
/* XXX fredette - I think this is just a "big enough" kind of value */
#define KGDB_BUFLEN 2048
-#define PC_REGS(regs) ((db_addr_t)(regs)->tf_iioq_head)
+#define PC_REGS(regs) ((regs)->tf_iioq_head)
/* Breakpoint related definitions */
#define BKPT_ADDR(addr) (addr) /* breakpoint address */
