From 080ec44b4482d38e34394d45c95862f5cba5777e Mon Sep 17 00:00:00 2001 From: Andrew Waterman Date: Thu, 3 Mar 2016 17:02:09 -0800 Subject: Update CSR encoding --- encoding.h | 7 +++++-- parse-opcodes | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/encoding.h b/encoding.h index 3960252..35f5876 100644 --- a/encoding.h +++ b/encoding.h @@ -61,8 +61,11 @@ #define IRQ_S_TIMER 5 #define IRQ_H_TIMER 6 #define IRQ_M_TIMER 7 -#define IRQ_COP 8 -#define IRQ_HOST 9 +#define IRQ_S_DEV 9 +#define IRQ_H_DEV 10 +#define IRQ_M_DEV 11 +#define IRQ_COP 12 +#define IRQ_HOST 13 #define DEFAULT_RSTVEC 0x0 #define DEFAULT_NMIVEC 0x4 diff --git a/parse-opcodes b/parse-opcodes index fb4d29d..354ff61 100755 --- a/parse-opcodes +++ b/parse-opcodes @@ -90,6 +90,11 @@ csrs = [ (0x180, 'sptbr'), (0x181, 'sasid'), + # Standard Supervisor RO + (0xD00, 'scycle'), + (0xD01, 'stime'), + (0xD02, 'sinstret'), + # Standard Machine R/W (0x300, 'mstatus'), (0x302, 'medeleg'), @@ -103,6 +108,14 @@ csrs = [ (0x343, 'mbadaddr'), (0x344, 'mip'), (0x345, 'mipi'), + (0x310, 'mucounteren'), + (0x311, 'mscounteren'), + (0x700, 'mucycle_delta'), + (0x701, 'mutime_delta'), + (0x702, 'muinstret_delta'), + (0x704, 'mscycle_delta'), + (0x705, 'mstime_delta'), + (0x706, 'msinstret_delta'), # Standard Machine RO (0xF00, 'mcycle'), @@ -129,6 +142,12 @@ csrs32 = [ # Standard Machine R/W (0x361, 'mtimecmph'), + (0x780, 'mucycle_deltah'), + (0x781, 'mutime_deltah'), + (0x782, 'muinstret_deltah'), + (0x784, 'mscycle_deltah'), + (0x785, 'mstime_deltah'), + (0x786, 'msinstret_deltah'), # Standard Machine RO (0xF80, 'mcycleh'), -- cgit v1.1