387,388d386
< new_record->load = head_inst->isLoad();
< new_record->store = head_inst->isStore();
389a388,390
> new_record->type = head_inst->isLoad() ? Record::LOAD :
> (head_inst->isStore() ? Record::STORE :
> Record::COMP);
506c507
< assert(new_record->store);
---
> assert(new_record->isStore());
555c556
< if (new_record->load) {
---
> if (new_record->isLoad()) {
559c560
< } else if (new_record->store) {
---
> } else if (new_record->isStore()) {
592,595c593,594
< new_record->load ? "Load" : (new_record->store ? "Store" :
< "Non load/store"),
< new_record->instNum, past_record->instNum);
<
---
> new_record->typeToStr(), new_record->instNum,
> past_record->instNum);
611c610
< return (past_record->store && past_record->commitTick <= execute_tick);
---
> return (past_record->isStore() && past_record->commitTick <= execute_tick);
618c617
< return(past_record->load && past_record->commit &&
---
> return(past_record->isLoad() && past_record->commit &&
627c626
< return (past_record->load && past_record->commit &&
---
> return (past_record->isLoad() && past_record->commit &&
635,636c634
< return(!past_record->store && !past_record->load &&
< past_record->toCommitTick <= execute_tick);
---
> return(past_record->isComp() && past_record->toCommitTick <= execute_tick);
677,678c675,676
< if (past_record->load) {
< if (new_record->store) {
---
> if (past_record->isLoad()) {
> if (new_record->isStore()) {
683c681
< } else if (past_record->store) {
---
> } else if (past_record->isStore()) {
685c683
< } else {
---
> } else if (past_record->isComp()){
725c723
< if (past_record->store) {
---
> if (past_record->isStore()) {
748c746
< if (load) {
---
> if (isLoad()) {
752c750
< } else if (store) {
---
> } else if (isStore()) {
782,783c780,782
< // If no node dependends on a non load/store node then there is
< // no reason to track it in the dependency graph. We filter out such
---
> assert(temp_ptr->type != Record::INVALID);
> // If no node dependends on a comp node then there is no reason to
> // track the comp node in the dependency graph. We filter out such
786,787c785
< if (temp_ptr->numDepts != 0 || temp_ptr->load || temp_ptr->store) {
<
---
> if (!temp_ptr->isComp() || temp_ptr->numDepts != 0) {
790,792c788,789
< if (temp_ptr->load || temp_ptr->store) {
< DPRINTFR(ElasticTrace, "\tis a %s\n",
< (temp_ptr->load ? "Load" : "Store"));
---
> if (temp_ptr->isLoad() || temp_ptr->isStore()) {
> DPRINTFR(ElasticTrace, "\tis a %s\n", temp_ptr->typeToStr());
797c794
< DPRINTFR(ElasticTrace, "\tis not a load or store\n");
---
> DPRINTFR(ElasticTrace, "\tis a %s\n", temp_ptr->typeToStr());
800c797
< if (temp_ptr->load) {
---
> if (temp_ptr->isLoad()) {
802c799
< } else if (temp_ptr->store) {
---
> } else if (temp_ptr->isStore()) {
815,816c812
< dep_pkt.set_load(temp_ptr->load);
< dep_pkt.set_store(temp_ptr->store);
---
> dep_pkt.set_type(temp_ptr->type);
818c814
< if (temp_ptr->load || temp_ptr->store) {
---
> if (temp_ptr->isLoad() || temp_ptr->isStore()) {
918a915,920
> const std::string&
> ElasticTrace::TraceInfo::typeToStr() const
> {
> return Record::RecordType_Name(type);
> }
>