diff options
| author | Andrew Waterman <waterman@s141.Millennium.Berkeley.EDU> | 2010-09-09 15:41:59 -0700 |
|---|---|---|
| committer | Andrew Waterman <waterman@s141.Millennium.Berkeley.EDU> | 2010-09-09 15:41:59 -0700 |
| commit | 5c88aa157be7696eac03b9fb1e36d19ccc96f5dc (patch) | |
| tree | a6f9bd62f42fad9e62c304975684f4d5ebb8d556 /riscv/processor.h | |
| parent | 64ec64876199ef94d7a8ac6eb64b68d7f9c84ee2 (diff) | |
| parent | a9176ab510f8f45990a46da2d5fbe4c4fb4a217c (diff) | |
| download | spike-5c88aa157be7696eac03b9fb1e36d19ccc96f5dc.zip spike-5c88aa157be7696eac03b9fb1e36d19ccc96f5dc.tar.gz spike-5c88aa157be7696eac03b9fb1e36d19ccc96f5dc.tar.bz2 | |
Merge branch 'master' of /project/eecs/parlab/git/projects/riscv
Conflicts:
sim/riscv/insns/mtpcr.h
sim/riscv/processor.cc
Diffstat (limited to 'riscv/processor.h')
| -rw-r--r-- | riscv/processor.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/riscv/processor.h b/riscv/processor.h index 8e9e6f0..fab6c9c 100644 --- a/riscv/processor.h +++ b/riscv/processor.h @@ -27,6 +27,8 @@ private: reg_t epc; reg_t badvaddr; reg_t ebase; + reg_t tohost; + reg_t fromhost; reg_t pcr_k0; reg_t pcr_k1; uint32_t id; |