diff options
| author | Andrew Waterman <andrew@sifive.com> | 2017-11-27 14:39:37 -0800 |
|---|---|---|
| committer | Andrew Waterman <andrew@sifive.com> | 2017-11-27 14:39:37 -0800 |
| commit | 7c3db437d8d3b6961f8eb2931792eaea1c469ff3 (patch) | |
| tree | fff06d6bcbce5c95096b700efae31182e6b4f404 | |
| parent | 32071f8f15ae6303dade36be0534c35f8bc3874c (diff) | |
| download | riscv-opcodes-7c3db437d8d3b6961f8eb2931792eaea1c469ff3.zip riscv-opcodes-7c3db437d8d3b6961f8eb2931792eaea1c469ff3.tar.gz riscv-opcodes-7c3db437d8d3b6961f8eb2931792eaea1c469ff3.tar.bz2 | |
Rename sptbr to satp and sbadaddr to stval
Closes #17
| -rw-r--r-- | encoding.h | 30 | ||||
| -rwxr-xr-x | parse-opcodes | 6 |
2 files changed, 18 insertions, 18 deletions
@@ -113,19 +113,19 @@ #define PRV_H 2 #define PRV_M 3 -#define SPTBR32_MODE 0x80000000 -#define SPTBR32_ASID 0x7FC00000 -#define SPTBR32_PPN 0x003FFFFF -#define SPTBR64_MODE 0xF000000000000000 -#define SPTBR64_ASID 0x0FFFF00000000000 -#define SPTBR64_PPN 0x00000FFFFFFFFFFF - -#define SPTBR_MODE_OFF 0 -#define SPTBR_MODE_SV32 1 -#define SPTBR_MODE_SV39 8 -#define SPTBR_MODE_SV48 9 -#define SPTBR_MODE_SV57 10 -#define SPTBR_MODE_SV64 11 +#define SATP32_MODE 0x80000000 +#define SATP32_ASID 0x7FC00000 +#define SATP32_PPN 0x003FFFFF +#define SATP64_MODE 0xF000000000000000 +#define SATP64_ASID 0x0FFFF00000000000 +#define SATP64_PPN 0x00000FFFFFFFFFFF + +#define SATP_MODE_OFF 0 +#define SATP_MODE_SV32 1 +#define SATP_MODE_SV39 8 +#define SATP_MODE_SV48 9 +#define SATP_MODE_SV57 10 +#define SATP_MODE_SV64 11 #define PMP_R 0x01 #define PMP_W 0x02 @@ -177,12 +177,12 @@ # define MSTATUS_SD MSTATUS64_SD # define SSTATUS_SD SSTATUS64_SD # define RISCV_PGLEVEL_BITS 9 -# define SPTBR_MODE SPTBR64_MODE +# define SATP_MODE SATP64_MODE #else # define MSTATUS_SD MSTATUS32_SD # define SSTATUS_SD SSTATUS32_SD # define RISCV_PGLEVEL_BITS 10 -# define SPTBR_MODE SPTBR32_MODE +# define SATP_MODE SATP32_MODE #endif #define RISCV_PGSHIFT 12 #define RISCV_PGSIZE (1 << RISCV_PGSHIFT) diff --git a/parse-opcodes b/parse-opcodes index 408ed0c..1d24c77 100755 --- a/parse-opcodes +++ b/parse-opcodes @@ -97,9 +97,9 @@ csrs = [ (0x140, 'sscratch'), (0x141, 'sepc'), (0x142, 'scause'), - (0x143, 'sbadaddr'), + (0x143, 'stval'), (0x144, 'sip'), - (0x180, 'sptbr'), + (0x180, 'satp'), # Standard Machine R/W (0x300, 'mstatus'), @@ -112,7 +112,7 @@ csrs = [ (0x340, 'mscratch'), (0x341, 'mepc'), (0x342, 'mcause'), - (0x343, 'mbadaddr'), + (0x343, 'mtval'), (0x344, 'mip'), (0x3a0, 'pmpcfg0'), (0x3a1, 'pmpcfg1'), |