diff options
| author | Megan Wachs <megan@sifive.com> | 2017-04-17 10:59:38 -0700 |
|---|---|---|
| committer | Megan Wachs <megan@sifive.com> | 2017-04-17 10:59:38 -0700 |
| commit | 84e1ac19ed5a69224aa8c3f920e3840fbc670771 (patch) | |
| tree | 7bc2ba170fc237a4e5cfd2551800c7909620ac04 /riscv/processor.h | |
| parent | 773fab34d46e2ddaf4318b851ab23bd813f168ad (diff) | |
| parent | d6fce459767509249311a120fddb21c844dc9b2c (diff) | |
| download | spike-84e1ac19ed5a69224aa8c3f920e3840fbc670771.zip spike-84e1ac19ed5a69224aa8c3f920e3840fbc670771.tar.gz spike-84e1ac19ed5a69224aa8c3f920e3840fbc670771.tar.bz2 | |
Merge remote-tracking branch 'origin/priv-1.10' into HEAD
Diffstat (limited to 'riscv/processor.h')
| -rw-r--r-- | riscv/processor.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/riscv/processor.h b/riscv/processor.h index 3268029..4d94d5b 100644 --- a/riscv/processor.h +++ b/riscv/processor.h @@ -105,8 +105,8 @@ struct state_t reg_t mip; reg_t medeleg; reg_t mideleg; - uint32_t mucounteren; - uint32_t mscounteren; + uint32_t mcounteren; + uint32_t scounteren; reg_t sepc; reg_t sbadaddr; reg_t sscratch; @@ -167,7 +167,6 @@ public: void reset(); void step(size_t n); // run for n cycles void set_csr(int which, reg_t val); - void raise_interrupt(reg_t which); reg_t get_csr(int which); mmu_t* get_mmu() { return mmu; } state_t* get_state() { return &state; } @@ -304,8 +303,8 @@ private: static const size_t OPCODE_CACHE_SIZE = 8191; insn_desc_t opcode_cache[OPCODE_CACHE_SIZE]; - void check_timer(); - void take_interrupt(); // take a trap if any interrupts are pending + void take_pending_interrupt() { take_interrupt(state.mip & state.mie); } + void take_interrupt(reg_t mask); // take first enabled interrupt in mask void take_trap(trap_t& t, reg_t epc); // take an exception void disasm(insn_t insn); // disassemble and print an instruction int paddr_bits(); @@ -314,7 +313,7 @@ private: friend class sim_t; friend class mmu_t; - friend class rtc_t; + friend class clint_t; friend class extension_t; void parse_isa_string(const char* isa); |