diff options
author | Korey Sewell <ksewell@umich.edu> | 2011-06-10 03:49:23 -0400 |
---|---|---|
committer | Korey Sewell <ksewell@umich.edu> | 2011-06-10 03:49:23 -0400 |
commit | a3862d4c593bfe2d8660035d8fe4f1f2985addac (patch) | |
tree | ecd3dc2bd084d371cb3665013650a45f5a9c9903 /src/cpu | |
parent | 9331b5d26ab8ff9d0c9e01406bd3c2fc05969a50 (diff) | |
parent | 1a451cd2c5ec20c27c39a1cd3e3b5422c2b4f679 (diff) | |
download | gem5-a3862d4c593bfe2d8660035d8fe4f1f2985addac.tar.xz |
sparc: merge regr. updates w/last update
Diffstat (limited to 'src/cpu')
-rw-r--r-- | src/cpu/inorder/cpu.cc | 1 | ||||
-rw-r--r-- | src/cpu/inorder/inorder_dyn_inst.cc | 19 |
2 files changed, 20 insertions, 0 deletions
diff --git a/src/cpu/inorder/cpu.cc b/src/cpu/inorder/cpu.cc index c27020671..97748deba 100644 --- a/src/cpu/inorder/cpu.cc +++ b/src/cpu/inorder/cpu.cc @@ -32,6 +32,7 @@ #include <algorithm> #include "arch/utility.hh" +#include "base/bigint.hh" #include "config/full_system.hh" #include "config/the_isa.hh" #include "cpu/inorder/resources/resource_list.hh" diff --git a/src/cpu/inorder/inorder_dyn_inst.cc b/src/cpu/inorder/inorder_dyn_inst.cc index 30a69bbb5..25f458379 100644 --- a/src/cpu/inorder/inorder_dyn_inst.cc +++ b/src/cpu/inorder/inorder_dyn_inst.cc @@ -35,6 +35,7 @@ #include <string> #include "arch/faults.hh" +#include "base/bigint.hh" #include "base/cprintf.hh" #include "base/trace.hh" #include "config/the_isa.hh" @@ -536,6 +537,14 @@ InOrderDynInst::read(Addr addr, T &data, unsigned flags) template Fault +InOrderDynInst::read(Addr addr, Twin32_t &data, unsigned flags); + +template +Fault +InOrderDynInst::read(Addr addr, Twin64_t &data, unsigned flags); + +template +Fault InOrderDynInst::read(Addr addr, uint64_t &data, unsigned flags); template @@ -599,6 +608,16 @@ InOrderDynInst::write(T data, Addr addr, unsigned flags, uint64_t *res) } #ifndef DOXYGEN_SHOULD_SKIP_THIS + +template +Fault +InOrderDynInst::write(Twin32_t data, Addr addr, + unsigned flags, uint64_t *res); + +template +Fault +InOrderDynInst::write(Twin64_t data, Addr addr, + unsigned flags, uint64_t *res); template Fault InOrderDynInst::write(uint64_t data, Addr addr, |