aboutsummaryrefslogtreecommitdiff
path: root/riscv/interactive.cc
diff options
context:
space:
mode:
authorAndrew Waterman <andrew@sifive.com>2021-11-08 22:03:07 -0800
committerAndrew Waterman <andrew@sifive.com>2021-11-08 22:21:44 -0800
commitad96b52e18a51519b57509ab1964c43ba9559c07 (patch)
tree9f0a1bd0d6c7ba2e70b55c97ac2d397797c80223 /riscv/interactive.cc
parentd2bbb60aace5ff1c851bc769f47b87d480cd19ad (diff)
downloadspike-ad96b52e18a51519b57509ab1964c43ba9559c07.zip
spike-ad96b52e18a51519b57509ab1964c43ba9559c07.tar.gz
spike-ad96b52e18a51519b57509ab1964c43ba9559c07.tar.bz2
Move definitions of P and require macros
Avoids namespace conflicts with Boost. Fixes #820 in a better way.
Diffstat (limited to 'riscv/interactive.cc')
-rw-r--r--riscv/interactive.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/riscv/interactive.cc b/riscv/interactive.cc
index d0f6b4e..dc6837d 100644
--- a/riscv/interactive.cc
+++ b/riscv/interactive.cc
@@ -353,19 +353,19 @@ void sim_t::interactive_vreg(const std::string& cmd, const std::vector<std::stri
uint64_t val;
switch(elen){
case 8:
- val = P.VU.elt<uint64_t>(r, e);
+ val = p->VU.elt<uint64_t>(r, e);
out << std::dec << "[" << e << "]: 0x" << std::hex << std::setfill ('0') << std::setw(16) << val << " ";
break;
case 4:
- val = P.VU.elt<uint32_t>(r, e);
+ val = p->VU.elt<uint32_t>(r, e);
out << std::dec << "[" << e << "]: 0x" << std::hex << std::setfill ('0') << std::setw(8) << (uint32_t)val << " ";
break;
case 2:
- val = P.VU.elt<uint16_t>(r, e);
+ val = p->VU.elt<uint16_t>(r, e);
out << std::dec << "[" << e << "]: 0x" << std::hex << std::setfill ('0') << std::setw(8) << (uint16_t)val << " ";
break;
case 1:
- val = P.VU.elt<uint8_t>(r, e);
+ val = p->VU.elt<uint8_t>(r, e);
out << std::dec << "[" << e << "]: 0x" << std::hex << std::setfill ('0') << std::setw(8) << (int)(uint8_t)val << " ";
break;
}