From 7cdc0412849acbd5a4a041b24c9defb7e2f6d9bc Mon Sep 17 00:00:00 2001
From: Andrew Waterman <andrew@sifive.com>
Date: Wed, 25 Aug 2021 15:58:51 -0700
Subject: Remove vestages of N extension

N has been deprecated in favor of bare S.
---
 opcodes-system |  1 -
 parse_opcodes  | 10 +---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/opcodes-system b/opcodes-system
index 9517814..aa26e38 100644
--- a/opcodes-system
+++ b/opcodes-system
@@ -1,7 +1,6 @@
 # SYSTEM
 ecall     11..7=0 19..15=0 31..20=0x000 14..12=0 6..2=0x1C 1..0=3
 ebreak    11..7=0 19..15=0 31..20=0x001 14..12=0 6..2=0x1C 1..0=3
-uret      11..7=0 19..15=0 31..20=0x002 14..12=0 6..2=0x1C 1..0=3
 sret      11..7=0 19..15=0 31..20=0x102 14..12=0 6..2=0x1C 1..0=3
 mret      11..7=0 19..15=0 31..20=0x302 14..12=0 6..2=0x1C 1..0=3
 dret      11..7=0 19..15=0 31..20=0x7b2 14..12=0 6..2=0x1C 1..0=3
diff --git a/parse_opcodes b/parse_opcodes
index bec7250..b8059e5 100755
--- a/parse_opcodes
+++ b/parse_opcodes
@@ -87,18 +87,10 @@ csrs = [
   (0x001, 'fflags'),
   (0x002, 'frm'),
   (0x003, 'fcsr'),
-  (0x000, 'ustatus'),
-  (0x004, 'uie'),
-  (0x005, 'utvec'),
   (0x008, 'vstart'),
   (0x009, 'vxsat'),
   (0x00A, 'vxrm'),
   (0x00F, 'vcsr'),
-  (0x040, 'uscratch'),
-  (0x041, 'uepc'),
-  (0x042, 'ucause'),
-  (0x043, 'utval'),
-  (0x044, 'uip'),
 
   # Standard User RO
   (0xC00, 'cycle'),
@@ -834,7 +826,7 @@ def print_insts(*names):
 def make_supervisor_latex_table():
   print_header('r', 'i')
   print_subtitle('Trap-Return Instructions')
-  print_insts('uret', 'sret', 'mret')
+  print_insts('sret', 'mret')
   print_subtitle('Interrupt-Management Instructions')
   print_insts('wfi')
   print_subtitle('Supervisor Memory-Management Instructions')
-- 
cgit v1.1