diff --git a/src/cpu/testers/rubytest/Check.cc b/src/cpu/testers/rubytest/Check.cc index 49332ab01d..90e7b877e8 100644 --- a/src/cpu/testers/rubytest/Check.cc +++ b/src/cpu/testers/rubytest/Check.cc @@ -107,8 +107,9 @@ Check::initiatePrefetch() } // Prefetches are assumed to be 0 sized - RequestPtr req = std::make_shared(m_address, 0, flags, - m_tester_ptr->masterId(), curTick(), m_pc); + RequestPtr req = std::make_shared( + m_address, 0, flags, m_tester_ptr->masterId()); + req->setPC(m_pc); req->setContext(index); PacketPtr pkt = new Packet(req, cmd); @@ -145,8 +146,9 @@ Check::initiateFlush() Request::Flags flags; - RequestPtr req = std::make_shared(m_address, CHECK_SIZE, flags, - m_tester_ptr->masterId(), curTick(), m_pc); + RequestPtr req = std::make_shared( + m_address, CHECK_SIZE, flags, m_tester_ptr->masterId()); + req->setPC(m_pc); Packet::Command cmd; @@ -179,7 +181,8 @@ Check::initiateAction() // Stores are assumed to be 1 byte-sized RequestPtr req = std::make_shared( - writeAddr, 1, flags, m_tester_ptr->masterId(), curTick(), m_pc); + writeAddr, 1, flags, m_tester_ptr->masterId()); + req->setPC(m_pc); req->setContext(index); Packet::Command cmd; @@ -242,8 +245,9 @@ Check::initiateCheck() } // Checks are sized depending on the number of bytes written - RequestPtr req = std::make_shared(m_address, CHECK_SIZE, flags, - m_tester_ptr->masterId(), curTick(), m_pc); + RequestPtr req = std::make_shared( + m_address, CHECK_SIZE, flags, m_tester_ptr->masterId()); + req->setPC(m_pc); req->setContext(index); PacketPtr pkt = new Packet(req, MemCmd::ReadReq); diff --git a/src/cpu/trace/trace_cpu.cc b/src/cpu/trace/trace_cpu.cc index 729699001d..a3d97707c9 100644 --- a/src/cpu/trace/trace_cpu.cc +++ b/src/cpu/trace/trace_cpu.cc @@ -650,9 +650,8 @@ TraceCPU::ElasticDataGen::executeMemReq(GraphNode* node_ptr) // Create a request and the packet containing request auto req = std::make_shared( - node_ptr->physAddr, node_ptr->size, - node_ptr->flags, masterID, node_ptr->seqNum, - ContextID(0)); + node_ptr->physAddr, node_ptr->size, node_ptr->flags, masterID); + req->setReqInstSeqNum(node_ptr->seqNum); req->setPC(node_ptr->pc); // If virtual address is valid, set the asid and virtual address fields