[src/trunk]: src/sys/arch/riscv Fix some of the previous - I must have compil...

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

details:   https://anonhg.NetBSD.org/src/rev/05682e479bfb
branches:  trunk
changeset: 956672:05682e479bfb
user:      skrll <skrll%NetBSD.org@localhost>
date:      Wed Nov 04 07:51:08 2020 +0000

description:
Fix some of the previous - I must have compile tested the wrong tree

diffstat:

 sys/arch/riscv/include/frame.h   |  8 ++++----
 sys/arch/riscv/riscv/genassym.cf |  6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (42 lines):

diff -r 7af7ba1d2624 -r 05682e479bfb sys/arch/riscv/include/frame.h
--- a/sys/arch/riscv/include/frame.h    Wed Nov 04 07:41:34 2020 +0000
+++ b/sys/arch/riscv/include/frame.h    Wed Nov 04 07:51:08 2020 +0000
@@ -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]
diff -r 7af7ba1d2624 -r 05682e479bfb sys/arch/riscv/riscv/genassym.cf
--- a/sys/arch/riscv/riscv/genassym.cf  Wed Nov 04 07:41:34 2020 +0000
+++ b/sys/arch/riscv/riscv/genassym.cf  Wed Nov 04 07:51:08 2020 +0000
@@ -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_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)