aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Waterman <waterman@eecs.berkeley.edu>2014-02-14 17:31:56 -0800
committerAndrew Waterman <waterman@eecs.berkeley.edu>2014-02-14 17:31:56 -0800
commit7c98865837bed7ad92d3afe5f99c34cbb4fca93c (patch)
tree4953edca532bd22f52b82d0ae82aef37f9d1088b
parent2cc2860d5e1992fe15449041834c2d4d39553622 (diff)
downloadriscv-opcodes-7c98865837bed7ad92d3afe5f99c34cbb4fca93c.zip
riscv-opcodes-7c98865837bed7ad92d3afe5f99c34cbb4fca93c.tar.gz
riscv-opcodes-7c98865837bed7ad92d3afe5f99c34cbb4fca93c.tar.bz2
Renumber uarch CSRs into custom CSR space
-rw-r--r--inst.chisel32
-rwxr-xr-xparse-opcodes32
2 files changed, 32 insertions, 32 deletions
diff --git a/inst.chisel b/inst.chisel
index 4708d3f..137b047 100644
--- a/inst.chisel
+++ b/inst.chisel
@@ -237,22 +237,22 @@ object CSRs {
val cycle = 0xc00
val time = 0xc01
val instret = 0xc02
- val uarch0 = 0xc10
- val uarch1 = 0xc11
- val uarch2 = 0xc12
- val uarch3 = 0xc13
- val uarch4 = 0xc14
- val uarch5 = 0xc15
- val uarch6 = 0xc16
- val uarch7 = 0xc17
- val uarch8 = 0xc18
- val uarch9 = 0xc19
- val uarch10 = 0xc1a
- val uarch11 = 0xc1b
- val uarch12 = 0xc1c
- val uarch13 = 0xc1d
- val uarch14 = 0xc1e
- val uarch15 = 0xc1f
+ val uarch0 = 0xcc0
+ val uarch1 = 0xcc1
+ val uarch2 = 0xcc2
+ val uarch3 = 0xcc3
+ val uarch4 = 0xcc4
+ val uarch5 = 0xcc5
+ val uarch6 = 0xcc6
+ val uarch7 = 0xcc7
+ val uarch8 = 0xcc8
+ val uarch9 = 0xcc9
+ val uarch10 = 0xcca
+ val uarch11 = 0xccb
+ val uarch12 = 0xccc
+ val uarch13 = 0xccd
+ val uarch14 = 0xcce
+ val uarch15 = 0xccf
val all = {
val res = collection.mutable.ArrayBuffer[Int]()
res += fflags
diff --git a/parse-opcodes b/parse-opcodes
index 8a698e7..37219cf 100755
--- a/parse-opcodes
+++ b/parse-opcodes
@@ -82,22 +82,22 @@ csrs = [
(0xC00, 'cycle'),
(0xC01, 'time'),
(0xC02, 'instret'),
- (0xC10, 'uarch0'),
- (0xC11, 'uarch1'),
- (0xC12, 'uarch2'),
- (0xC13, 'uarch3'),
- (0xC14, 'uarch4'),
- (0xC15, 'uarch5'),
- (0xC16, 'uarch6'),
- (0xC17, 'uarch7'),
- (0xC18, 'uarch8'),
- (0xC19, 'uarch9'),
- (0xC1A, 'uarch10'),
- (0xC1B, 'uarch11'),
- (0xC1C, 'uarch12'),
- (0xC1D, 'uarch13'),
- (0xC1E, 'uarch14'),
- (0xC1F, 'uarch15'),
+ (0xCC0, 'uarch0'),
+ (0xCC1, 'uarch1'),
+ (0xCC2, 'uarch2'),
+ (0xCC3, 'uarch3'),
+ (0xCC4, 'uarch4'),
+ (0xCC5, 'uarch5'),
+ (0xCC6, 'uarch6'),
+ (0xCC7, 'uarch7'),
+ (0xCC8, 'uarch8'),
+ (0xCC9, 'uarch9'),
+ (0xCCA, 'uarch10'),
+ (0xCCB, 'uarch11'),
+ (0xCCC, 'uarch12'),
+ (0xCCD, 'uarch13'),
+ (0xCCE, 'uarch14'),
+ (0xCCF, 'uarch15'),
]
opcode_base = 0