From: Michael Nolan <mtnolan2640@gmail.com>
Date: Wed, 18 Mar 2020 13:27:54 +0000 (-0400)
Subject: Disambiguate between all duplicated SPRs
X-Git-Tag: convert-csv-opcode-to-binary~3099
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=968bee31da20cd12cdd2e6ac0ba7a0db405781c8;p=libreriscv.git

Disambiguate between all duplicated SPRs
---

diff --git a/openpower/isatables/sprs.csv b/openpower/isatables/sprs.csv
index 19449b772..87dd0f4d3 100644
--- a/openpower/isatables/sprs.csv
+++ b/openpower/isatables/sprs.csv
@@ -11,7 +11,7 @@ Idx,SPR
 26,SRR0
 27,SRR1
 28,CFAR
-29,AMR
+29,AMR_priv
 48,PIDR
 61,IAMR
 128,TFHAR
@@ -20,7 +20,7 @@ Idx,SPR
 131,TEXASRU
 136,CTRL
 144,TIDR
-152,CTRL
+152,CTRL_priv
 153,FSCR
 157,UAMOR
 158,GSR
@@ -35,13 +35,13 @@ Idx,SPR
 259,SPRG3
 268,TB
 269,TBU
-272,SPRG0
-273,SPRG1
-274,SPRG2
-275,SPRG3
+272,SPRG0_priv
+273,SPRG1_priv
+274,SPRG2_priv
+275,SPRG3_priv
 283,CIR
 284,TBL
-285,TBU
+285,TBU_hypv
 286,TBU40
 287,PVR
 304,HSPRG0
@@ -76,19 +76,19 @@ Idx,SPR
 780,SIAR
 781,SDAR
 782,MMCR1
-784,SIER
-785,MMCR2
-786,MMCRA
-787,PMC1
-788,PMC2
-789,PMC3
-790,PMC4
-791,PMC5
-792,PMC6
-795,MMCR0
-796,SIAR
-797,SDAR
-798,MMCR1
+784,SIER_priv
+785,MMCR2_priv
+786,MMCRA_priv
+787,PMC1_priv
+788,PMC2_priv
+789,PMC3_priv
+790,PMC4_priv
+791,PMC5_priv
+792,PMC6_priv
+795,MMCR0_priv
+796,SIAR_priv
+797,SDAR_priv
+798,MMCR1_priv
 800,BESCRS
 801,BESCRSU
 802,BESCRR
@@ -96,16 +96,12 @@ Idx,SPR
 804,EBBHR
 805,EBBRR
 806,BESCR
-808,reserved
-809,reserved8
-810,reserved
-811,reserved
 815,TAR
 816,ASDR
 823,PSSCR
 848,IC
 849,VTB
-855,PSSCR
+855,PSSCR_hypv
 896,PPR
 898,PPR32
 1023,PIR