456c456
< } else if (node_ptr->isLoad || node_ptr->isStore) {
---
> } else if (node_ptr->isLoad() || node_ptr->isStore()) {
477c477
< if (node_ptr->isLoad && !node_ptr->isStrictlyOrdered()) {
---
> if (node_ptr->isLoad() && !node_ptr->isStrictlyOrdered()) {
486c486
< if (!(*child_itr)->isStore &&
---
> if (!(*child_itr)->isStore() &&
533c533
< if (!node_ptr->isLoad || node_ptr->isStrictlyOrdered()) {
---
> if (!node_ptr->isLoad() || node_ptr->isStrictlyOrdered()) {
607c607
< node_ptr->isLoad ? ++numSOLoads : ++numSOStores;
---
> node_ptr->isLoad() ? ++numSOLoads : ++numSOStores;
633c633
< if (node_ptr->isLoad) {
---
> if (node_ptr->isLoad()) {
667,668c667
< " dependency free.\n", node_ptr->seqNum,
< node_ptr->isLoad ? "L" : (node_ptr->isStore ? "S" : "C"),
---
> " dependency free.\n", node_ptr->seqNum, node_ptr->typeToStr(),
834,835c833
< node_ptr->isLoad ? "L" : (node_ptr->isStore ? "S" : "C"),
< itr->execTick);
---
> node_ptr->typeToStr(), itr->execTick);
860c858
< if (new_node->isLoad) {
---
> if (new_node->isLoad()) {
862c860
< } else if (new_node->isStore) {
---
> } else if (new_node->isStore()) {
897c895
< if (done_node->isLoad) {
---
> if (done_node->isLoad()) {
905c903
< if (done_node->isStore && done_node->isStrictlyOrdered()) {
---
> if (done_node->isStore() && done_node->isStrictlyOrdered()) {
952c950
< if (new_node->isLoad && numInFlightLoads >= sizeLoadBuffer) {
---
> if (new_node->isLoad() && numInFlightLoads >= sizeLoadBuffer) {
955c953
< if (new_node->isStore && numInFlightStores >= sizeStoreBuffer) {
---
> if (new_node->isStore() && numInFlightStores >= sizeStoreBuffer) {
1253,1254c1251
< element->isLoad = pkt_msg.load();
< element->isStore = pkt_msg.store();
---
> element->type = pkt_msg.type();
1387,1389c1384,1385
< DPRINTFR(TraceCPUData, ",%s", (isLoad ? "True" : "False"));
< DPRINTFR(TraceCPUData, ",%s", (isStore ? "True" : "False"));
< if (isLoad || isStore) {
---
> DPRINTFR(TraceCPUData, ",%s", typeToStr());
> if (isLoad() || isStore()) {
1416a1413,1418
> std::string
> TraceCPU::ElasticDataGen::GraphNode::typeToStr() const
> {
> return Record::RecordType_Name(type);
> }
>