From ad96b52e18a51519b57509ab1964c43ba9559c07 Mon Sep 17 00:00:00 2001
From: Andrew Waterman <andrew@sifive.com>
Date: Mon, 8 Nov 2021 22:03:07 -0800
Subject: Move definitions of P and require macros

Avoids namespace conflicts with Boost.

Fixes #820 in a better way.
---
 riscv/interactive.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'riscv/interactive.cc')

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;
       }
-- 
cgit v1.1