Module Name: src
Committed By: skrll
Date: Wed Nov 4 07:51:09 UTC 2020
Modified Files:
src/sys/arch/riscv/include: frame.h
src/sys/arch/riscv/riscv: genassym.cf
Log Message:
Fix some of the previous - I must have compile tested the wrong tree
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/riscv/include/frame.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/riscv/riscv/genassym.cf
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/frame.h
diff -u src/sys/arch/riscv/include/frame.h:1.3 src/sys/arch/riscv/include/frame.h:1.4
--- src/sys/arch/riscv/include/frame.h:1.3 Wed Nov 4 06:56:56 2020
+++ src/sys/arch/riscv/include/frame.h Wed Nov 4 07:51:08 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: frame.h,v 1.3 2020/11/04 06:56:56 skrll Exp $ */
+/* $NetBSD: frame.h,v 1.4 2020/11/04 07:51:08 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -36,9 +36,9 @@
struct trapframe {
struct reg tf_regs __aligned(8);
- register_t tf_stval; // supervisor trap value
- register_t tf_sepc; // supervisor exception program counter
- register_t tf_scause; // supervisor cause register
+ register_t tf_tval; // supervisor trap value
+ register_t tf_pc; // supervisor exception program counter
+ register_t tf_cause; // supervisor cause register
register_t tf_sr; // supervisor status register
#define tf_reg tf_regs.r_reg
#define tf_a0 tf_reg[_X_A0]
Index: src/sys/arch/riscv/riscv/genassym.cf
diff -u src/sys/arch/riscv/riscv/genassym.cf:1.8 src/sys/arch/riscv/riscv/genassym.cf:1.9
--- src/sys/arch/riscv/riscv/genassym.cf:1.8 Wed Nov 4 06:56:56 2020
+++ src/sys/arch/riscv/riscv/genassym.cf Wed Nov 4 07:51:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.8 2020/11/04 06:56:56 skrll Exp $
+# $NetBSD: genassym.cf,v 1.9 2020/11/04 07:51:08 skrll Exp $
#-
# Copyright (c) 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -107,8 +107,8 @@ define TF_T5 offsetof(struct trapframe,
define TF_T6 offsetof(struct trapframe, tf_reg[_X_T6])
define TF_GP offsetof(struct trapframe, tf_reg[_X_GP])
define TF_PC offsetof(struct trapframe, tf_pc)
-define TF_SCAUSE offsetof(struct trapframe, tf_scause)
-define TF_STVAL offsetof(struct trapframe, tf_stval)
+define TF_CAUSE offsetof(struct trapframe, tf_cause)
+define TF_TVA L offsetof(struct trapframe, tf_tval)
define TF_SR offsetof(struct trapframe, tf_sr)
define L_CPU offsetof(struct lwp, l_cpu)
