Fix some insn behaviour

Change-Id: I44587fbf1e1665693fea2050e2126940a55f0326
project-starch · Sep 28, 2023 · 8bcb6ea · 8bcb6ea
1 parent 6cbd2f8
commit 8bcb6ea
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 22 deletions.
diff --git a/src/arch/riscvcapstone/isa/decoder.isa b/src/arch/riscvcapstone/isa/decoder.isa
@@ -521,17 +521,21 @@ decode QUADRANT default Unknown::unknown() {
                         temp.getRegVal().rawCapVal() = (uint128_t)rs1_cap;
                         temp.setTag(true);
 
-                        Rd_trv = temp;
-
-                        //movc semantics
-                        //rs1 still retains the original cap
-                        if(rs1_cap.type() != CapType::NONLIN)
-                            Rs1_trv.setTag(false);
-                        else {
-                            uint64_t node_id = rs1_cap.nodeId();
-                            dyn_inst->initiateNodeCommand(new NodeRcUpdate(node_id, 1));
+                        if(RS1 != RD) {
+                            //movc semantics
+                            //rs1 still retains the original cap
+                            if(rs1_cap.type() != CapType::NONLIN)
+                                Rs1_trv.setTag(false);
+                            else {
+                                uint64_t node_id = rs1_cap.nodeId();
+                                dyn_inst->initiateNodeCommand(new NodeRcUpdate(node_id, 1));
+                            }
+                            Rs1_trv = Rs1_trv;
+                        } else {
+                            Rs1_trv = temp;
                         }
-                        Rs1_trv = Rs1_trv;
+
+                        Rd_trv = temp;
                     }});
                     0x1: shrink ({{
                         using namespace gem5::RiscvcapstoneISA::o3;
@@ -604,7 +608,9 @@ decode QUADRANT default Unknown::unknown() {
                         Rs1_trv.getRegVal().rawCapVal() = (uint128_t)rs1_cap;
                         Rd_trv = Rs1_trv;
 
-                        Rs1_trv.setTag(false);
+                        if(RS1 != RD) {
+                            Rs1_trv.setTag(false);
+                        }
                         Rs1_trv = Rs1_trv;
                     }});
                     0x7: seal ({{
@@ -763,12 +769,20 @@ decode QUADRANT default Unknown::unknown() {
                         if(fault != NoFault)
                             return fault;
 
-                        Rd_trv = Rs1_trv;
-                        Rd_trv.getRegVal().capVal().setNodeId(node_id);
-                        Rd_trv.getRegVal().capVal().setType(CapType::REV);
+                        Cap rs1_cap = Rs1_trv.getRegVal().capVal();
+                        Cap rd_cap = rs1_cap;
+                        rd_cap.setNodeId(node_id);
+                        rd_cap.setType(CapType::REV);
 
-                        Rs1_trv.getRegVal().capVal().setNodeId(to_allocate);
+                        rs1_cap.setNodeId(to_allocate);
 
+                        Rs1_trv.getRegVal().rawCapVal() = (uint128_t)rs1_cap;
+
+                        ConstTaggedRegVal temp_regval;
+                        temp_regval.setTag(true);
+                        temp_regval.getRegVal().rawCapVal() = (uint128_t)rd_cap;
+
+                        Rd_trv = temp_regval;
                         Rs1_trv = Rs1_trv;
                     }});
                     0x0: revoke ({{
@@ -1415,15 +1429,18 @@ decode QUADRANT default Unknown::unknown() {
 
                         Cap rs1_cap = Rs1_trv.getRegVal().capVal();
                         int64_t imm = sext<12>(IMM12);
-                        NPC = rs1_cap.cursor() + imm;
 
-                        //write pc to rd
-                        //todo: actually pc + 4
-                        Rd_trv.getRegVal().rawCapVal() = (uint128_t)dyn_inst->cpu->getIEWObject().getPCCap(dyn_inst->threadNumber);
+                        Cap pc_cap = dyn_inst->cpu->getIEWObject().getPCCap(dyn_inst->threadNumber);
+                        pc_cap.setCursor(NPC);
+
+                        Rd_trv.getRegVal().rawCapVal() = (uint128_t)pc_cap;
+                        Rd_trv.setTag(true);
 
                         dyn_inst->cpu->getIEWObject().setPCCap(rs1_cap,
                                                             dyn_inst->threadNumber);
 
+                        NPC = rs1_cap.cursor() + imm;
+
                         //write cnull to rs1
                         if(RS1 != RD) {
                             if(rs1_cap.type() != CapType::NONLIN) {
@@ -1554,9 +1571,16 @@ decode QUADRANT default Unknown::unknown() {
                         Rs1; Rs2; Rd;
                     }});
                 }
-                format RcUpdateTest {
+                format ROp {
                     0x1: rcup ({{
-                        Rs1; Rs2; Rd;
+                        using namespace gem5::RiscvcapstoneISA::o3;
+
+                        DynInst* dyn_inst = dynamic_cast<DynInst*>(xc);
+                        assert(dyn_inst);
+
+                        NodeID node_id = Rd_ud;
+                        int delta = Rs1_sd;
+                        return dyn_inst->initiateNodeCommand(new NodeRcUpdate(node_id, delta));
                     }});
                 }
                 format AllocTest {

diff --git a/src/arch/riscvcapstone/o3/iew.cc b/src/arch/riscvcapstone/o3/iew.cc
@@ -1294,6 +1294,11 @@ IEW::executeInsts()
         if(fault == NoFault) {
             DPRINTF(IEW, "Execute instruction %i -> %s\n", inst->seqNum, inst->staticInst->getName());
             fault = inst->execute();
+            // #ifdef DEBUG
+            // if(fault != NoFault) {
+            //     panic("Instruction [sn:%llu] PC: %s execute() faulted!", inst->seqNum, inst->pcState());
+            // }
+            // #endif
             //only one case will not mark executecalled -> when it's a rescheduled load
             if(!inst->isLoad() || (inst->isLoad() && inst->loadEffAddrValid()) || inst->fault != NoFault)
                 inst->setExecuteCalled();

diff --git a/src/arch/riscvcapstone/o3/node_commands.cc b/src/arch/riscvcapstone/o3/node_commands.cc
@@ -334,8 +334,9 @@ NodeRcUpdate::handleResp(PacketPtr pkt) {
             savedNode = pkt->getRaw<Node>();
             savedNode.counter += delta;
             //do I need to make the counter check against 1 here?
-            if(savedNode.counter == 0 && savedNode.state == 0) {
+            if(savedNode.counter == 0) {
                 // add node to free list
+                savedNode.state = Node::INVALID;
                 inst->getNodeController().freeNode(savedNode, nodeId);
             }