Skip to content

Commit

Permalink
#9, #10 instructions update PC and PCCap accordingly
Browse files Browse the repository at this point in the history
  • Loading branch information
@hakase56557
hakase56557 committed Sep 19, 2023
1 parent 716ad23 commit 7366010
Show file tree
Hide file tree
Showing 4 changed files with 109 additions and 83 deletions.
168 changes: 93 additions & 75 deletions src/arch/riscvcapstone/isa/decoder.isa
View file
Original file line number Diff line number Diff line change
Expand Up @@ -913,6 +913,8 @@ decode QUADRANT default Unknown::unknown() {
Cap pc_cap_new(pc_mem_load);
dyn_inst->cpu->getIEWObject().setPCCap(pc_cap_new, dyn_inst->threadNumber);

NPC = pc_cap_new.cursor();

ceh.getRegVal().rawCapVal() = ceh_mem_load;
dyn_inst->setTaggedMiscReg(CAPMISCREG_CEH, ceh);

Expand Down Expand Up @@ -940,7 +942,8 @@ decode QUADRANT default Unknown::unknown() {

Cap rs1_cap = Rs1_trv.getRegVal().capVal();

if(rs1_cap.type() != CapType::SEALEDRET && rs1_cap.async() == CapAsync::INTERRUPT) {
if(rs1_cap.type() != CapType::SEALEDRET ||
(rs1_cap.type() == CapType::SEALEDRET && rs1_cap.async() == CapAsync::INTERRUPT)) {
return std::make_shared<IllegalInstFault>("Unexpected capability type (26)", machInst);
}

Expand All @@ -950,7 +953,7 @@ decode QUADRANT default Unknown::unknown() {
RiscvcapstoneISAInst::PCState pc_state;
set(pc_state, xc->pcState());
Cap pc_cap = dyn_inst->cpu->getIEWObject().getPCCap(dyn_inst->threadNumber);
pc_cap.setCursor(Rs1_trv.getRegVal().intVal());
pc_cap.setCursor(Rs2_trv.getRegVal().intVal());

ConstTaggedRegVal v;
v.setTag(true);
Expand All @@ -963,6 +966,8 @@ decode QUADRANT default Unknown::unknown() {

dyn_inst->cpu->getIEWObject().setPCCap(pc_cap_new, dyn_inst->threadNumber);

NPC = pc_cap_new.cursor();

if(pc_cap_new.type() != CapType::NONLIN) {
epc.setTag(false);
dyn_inst->setTaggedMiscReg(CAPMISCREG_EPC, epc);
Expand Down Expand Up @@ -1026,6 +1031,8 @@ decode QUADRANT default Unknown::unknown() {
Cap pc_cap_new(pc_mem_load);
dyn_inst->cpu->getIEWObject().setPCCap(pc_cap_new, dyn_inst->threadNumber);

NPC = pc_cap_new.cursor();

ceh.getRegVal().rawCapVal() = ceh_mem_load;
dyn_inst->setTaggedMiscReg(CAPMISCREG_CEH, ceh);

Expand All @@ -1037,6 +1044,7 @@ decode QUADRANT default Unknown::unknown() {
rs1_cap.setType(CapType::SEALED);
Rs1_trv.getRegVal().rawCapVal() = (uint128_t)rs1_cap;
//might not work
//todo: need to set tag true
dyn_inst->cpu->setArchReg(cap_reg, Rs1_trv.getRegVal(), dyn_inst->threadNumber);
} else if(rs1_cap.async() == CapAsync::EXCEPT) {
assert(dyn_inst->memReadN == 33);
Expand All @@ -1053,7 +1061,7 @@ decode QUADRANT default Unknown::unknown() {
memcpy(&pc_mem_load, dyn_inst->getMemReadRes(0), sizeof(pc_mem_load));
//also assert tag results maybe?

Addr cur_addr = rs1_cap.start();
Addr cur_addr = rs1_cap.start() + 2 * sizeof(RegVal);

ConstTaggedRegVal ceh = dyn_inst->readTaggedMiscReg(CAPMISCREG_CEH);
Cap ceh_cap = ceh.getRegVal().capVal();
Expand All @@ -1074,72 +1082,7 @@ decode QUADRANT default Unknown::unknown() {
Cap pc_cap_new(pc_mem_load);
dyn_inst->cpu->getIEWObject().setPCCap(pc_cap_new, dyn_inst->threadNumber);

//write context
for(int i = 0; i < NumIntArchRegs; i ++, cur_addr += sizeof(RegVal)) {
ConstTaggedRegVal v;
v = dyn_inst->getTaggedRegOperand(this, i);

// store value
// DPRINTFN("Write context x%d %llx\n", i, v.getRegVal().intVal());
fault = writeMemTimingLE(xc, traceData, v.getRegVal(), cur_addr,
Request::Flags(), nullptr);
if(fault != NoFault) {
return fault;
}
// store tag
//DPRINTFN("Set tag %d %d\n", i, v.getTag());
fault = dyn_inst->initiateSetTag(cur_addr, v.getTag());
if(fault != NoFault) {
return fault;
}
}

for(int reg_idx = 0; reg_idx < NumIntArchRegs; reg_idx ++) {
RegVal& v = *(RegVal*)(dyn_inst->getMemReadRes(reg_idx + 2));
ConstTagRef tag = dyn_inst->getTagQueryRes(reg_idx + 2);
//DPRINTFN("Load context reg %d = 0x%llx (tag = %d)\n",
// reg_idx, v.intVal(), tag);

// write back to registers
ConstTaggedRegVal tagged_val(v, tag);
dyn_inst->setTaggedRegOperand(this, reg_idx, tagged_val);
}
} else { //upon interrupt
assert(dyn_inst->memReadN == 33);

RiscvcapstoneISAInst::PCState pc_state;
set(pc_state, xc->pcState());
uint64_t npc = pc_state.npc();
Cap pc_cap = dyn_inst->cpu->getIEWObject().getPCCap(dyn_inst->threadNumber);
pc_cap.setCursor(Rs2_trv.getRegVal().intVal()); // prepare the PC cap to save

uint128_t pc_mem_load, ceh_mem_load;
//need to fix rescheduled call? like a rescheduled load

memcpy(&pc_mem_load, dyn_inst->getMemReadRes(0), sizeof(pc_mem_load));
memcpy(&ceh_mem_load, dyn_inst->getMemReadRes(1), sizeof(ceh_mem_load));
//also assert tag results maybe?

Addr cur_addr = rs1_cap.start();

ConstTaggedRegVal ceh = dyn_inst->readTaggedMiscReg(CAPMISCREG_CEH);
Cap ceh_cap = ceh.getRegVal().capVal();

Fault fault = writeMemTimingLE(xc, traceData, (uint128_t)pc_cap, cur_addr, Request::Flags(), nullptr);
if (fault != NoFault)
return fault;
fault = writeMemTimingLE(xc, traceData, (uint128_t)ceh_cap, cur_addr + sizeof(RegVal), Request::Flags(), nullptr);
if (fault != NoFault)
return fault;

rs1_cap.setType(CapType::SEALED);
rs1_cap.setAsync(CapAsync::SYNC);

ceh.getRegVal().rawCapVal() = ceh_mem_load;
dyn_inst->setTaggedMiscReg(CAPMISCREG_CEH, ceh);

Cap pc_cap_new(pc_mem_load);
dyn_inst->cpu->getIEWObject().setPCCap(pc_cap_new, dyn_inst->threadNumber);
NPC = pc_cap_new.cursor();

//write context
for(int i = 0; i < NumIntArchRegs; i ++, cur_addr += sizeof(RegVal)) {
Expand Down Expand Up @@ -1221,7 +1164,7 @@ decode QUADRANT default Unknown::unknown() {
Cap pc_cap = dyn_inst->cpu->getIEWObject().getPCCap(dyn_inst->threadNumber);
uint64_t pc = pc_cap.cursor();

cpu->normal_pc[dyn_inst->threadNumber] = pc;
cpu->normal_pc[dyn_inst->threadNumber] = PC;
cpu->normal_sp[dyn_inst->threadNumber] = sp_trv;

uint128_t pc_mem_load, ceh_mem_load, csp_mem_load;
Expand All @@ -1236,6 +1179,8 @@ decode QUADRANT default Unknown::unknown() {
Cap pc_cap_new(pc_mem_load);
dyn_inst->cpu->getIEWObject().setPCCap(pc_cap_new, dyn_inst->threadNumber);

NPC = pc_cap_new.cursor();

ConstTaggedRegVal ceh;
ceh.setTag(true);
ceh.getRegVal().rawCapVal() = ceh_mem_load;
Expand All @@ -1258,7 +1203,7 @@ decode QUADRANT default Unknown::unknown() {
Cap pc_cap = dyn_inst->cpu->getIEWObject().getPCCap(dyn_inst->threadNumber);
uint64_t pc = pc_cap.cursor();

cpu->normal_pc[dyn_inst->threadNumber] = pc;
cpu->normal_pc[dyn_inst->threadNumber] = PC;
cpu->normal_sp[dyn_inst->threadNumber] = sp_trv;

uint128_t pc_mem_load, ceh_mem_load;
Expand All @@ -1272,6 +1217,8 @@ decode QUADRANT default Unknown::unknown() {
Cap pc_cap_new(pc_mem_load);
dyn_inst->cpu->getIEWObject().setPCCap(pc_cap_new, dyn_inst->threadNumber);

NPC = pc_cap_new.cursor();

ConstTaggedRegVal ceh;
ceh.setTag(true);
ceh.getRegVal().rawCapVal() = ceh_mem_load;
Expand Down Expand Up @@ -1345,8 +1292,8 @@ decode QUADRANT default Unknown::unknown() {
if (fault != NoFault)
return fault;

//todo: update PC
sp_trv = cpu->normal_sp[dyn_inst->threadNumber];
NPC = cpu->normal_pc[dyn_inst->threadNumber] + 4;

rs1_cap.setType(CapType::SEALED);
rs1_cap.setAsync(CapAsync::SYNC);
Expand Down Expand Up @@ -1507,6 +1454,8 @@ decode QUADRANT default Unknown::unknown() {

dyn_inst->cpu->getIEWObject().setPCCap(rd_cap, dyn_inst->threadNumber);

NPC = rd_cap.cursor();

//write cnull to rd
if(rd_cap.type() != CapType::NONLIN) {
Rd_trv.setTag(false);
Expand Down Expand Up @@ -3182,41 +3131,71 @@ decode QUADRANT default Unknown::unknown() {
format BOp {
0x0: beq({{
if (Rs1 == Rs2) {
if(dyn_inst->isSecureWorld()) {
Cap pc_cap = dyn_inst->cpu->getIEWObject().getPCCap(dyn_inst->threadNumber);
pc_cap.setCursor(PC + imm);
dyn_inst->cpu->getIEWObject().setPCCap(pc_cap, dyn_inst->threadNumber);
}
NPC = PC + imm;
} else {
NPC = NPC;
}
}}, IsDirectControl, IsCondControl);
0x1: bne({{
if (Rs1 != Rs2) {
if(dyn_inst->isSecureWorld()) {
Cap pc_cap = dyn_inst->cpu->getIEWObject().getPCCap(dyn_inst->threadNumber);
pc_cap.setCursor(PC + imm);
dyn_inst->cpu->getIEWObject().setPCCap(pc_cap, dyn_inst->threadNumber);
}
NPC = PC + imm;
} else {
NPC = NPC;
}
}}, IsDirectControl, IsCondControl);
0x4: blt({{
if (Rs1_sd < Rs2_sd) {
if(dyn_inst->isSecureWorld()) {
Cap pc_cap = dyn_inst->cpu->getIEWObject().getPCCap(dyn_inst->threadNumber);
pc_cap.setCursor(PC + imm);
dyn_inst->cpu->getIEWObject().setPCCap(pc_cap, dyn_inst->threadNumber);
}
NPC = PC + imm;
} else {
NPC = NPC;
}
}}, IsDirectControl, IsCondControl);
0x5: bge({{
if (Rs1_sd >= Rs2_sd) {
if(dyn_inst->isSecureWorld()) {
Cap pc_cap = dyn_inst->cpu->getIEWObject().getPCCap(dyn_inst->threadNumber);
pc_cap.setCursor(PC + imm);
dyn_inst->cpu->getIEWObject().setPCCap(pc_cap, dyn_inst->threadNumber);
}
NPC = PC + imm;
} else {
NPC = NPC;
}
}}, IsDirectControl, IsCondControl);
0x6: bltu({{
if (Rs1 < Rs2) {
if(dyn_inst->isSecureWorld()) {
Cap pc_cap = dyn_inst->cpu->getIEWObject().getPCCap(dyn_inst->threadNumber);
pc_cap.setCursor(PC + imm);
dyn_inst->cpu->getIEWObject().setPCCap(pc_cap, dyn_inst->threadNumber);
}
NPC = PC + imm;
} else {
NPC = NPC;
}
}}, IsDirectControl, IsCondControl);
0x7: bgeu({{
if (Rs1 >= Rs2) {
if(dyn_inst->isSecureWorld()) {
Cap pc_cap = dyn_inst->cpu->getIEWObject().getPCCap(dyn_inst->threadNumber);
pc_cap.setCursor(PC + imm);
dyn_inst->cpu->getIEWObject().setPCCap(pc_cap, dyn_inst->threadNumber);
}
NPC = PC + imm;
} else {
NPC = NPC;
Expand All @@ -3227,14 +3206,53 @@ decode QUADRANT default Unknown::unknown() {

0x19: decode FUNCT3 {
0x0: Jump::jalr({{
Rd = NPC;
using namespace gem5::RiscvcapstoneISA::o3;

DynInst* dyn_inst = dynamic_cast<DynInst*>(xc);
assert(dyn_inst);

Cap pc_cap = dyn_inst->cpu->getIEWObject().getPCCap(dyn_inst->threadNumber);
ConstTaggedRegVal temp_regval;

if(dyn_inst->isSecureWorld()) {
pc_cap.setCursor(NPC);
temp_regval.setTag(true);
temp_regval.getRegVal().rawCapVal() = (uint128_t)pc_cap;
} else {
temp_regval.setTag(false);
temp_regval.getRegVal().intVal() = NPC;
}

NPC = (imm + Rs1) & (~0x1);
Rd_trv = temp_regval;

if(dyn_inst->isSecureWorld()) {
pc_cap.setCursor(NPC);
dyn_inst->cpu->getIEWObject().setPCCap(pc_cap, dyn_inst->threadNumber);
}
}}, IsIndirectControl, IsUncondControl);
}

0x1b: JOp::jal({{
Rd = NPC;
NPC = PC + imm;
Cap pc_cap = dyn_inst->cpu->getIEWObject().getPCCap(dyn_inst->threadNumber);
ConstTaggedRegVal temp_regval;

if(dyn_inst->isSecureWorld()) {
pc_cap.setCursor(NPC);
temp_regval.setTag(true);
temp_regval.getRegVal().rawCapVal() = (uint128_t)pc_cap;
} else {
temp_regval.setTag(false);
temp_regval.getRegVal().intVal() = NPC;
}

NPC = PC + imm;
Rd_trv = temp_regval;

if(dyn_inst->isSecureWorld()) {
pc_cap.setCursor(NPC);
dyn_inst->cpu->getIEWObject().setPCCap(pc_cap, dyn_inst->threadNumber);
}
}}, IsDirectControl, IsUncondControl);

0x1c: decode FUNCT3 {
Expand Down
4 changes: 4 additions & 0 deletions src/arch/riscvcapstone/isa/formats/standard.isa
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,10 @@ def template BranchExecute {{
%(class_name)s::execute(ExecContext *xc,
Trace::InstRecord *traceData) const
{
using namespace gem5::RiscvcapstoneISA::o3;
DynInst* dyn_inst = dynamic_cast<DynInst*>(xc);
assert(dyn_inst);

%(op_decl)s;
%(op_rd)s;
%(code)s;
Expand Down
2 changes: 2 additions & 0 deletions src/arch/riscvcapstone/o3/cpu.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -571,6 +571,8 @@ CPU::startup()
ctrv.setTag(true);
ctrv.getRegVal().rawCapVal() = (uint128_t)*cap;
isa[tid]->setTaggedMiscReg(1, ctrv); //capmiscreg_cinit

cwrld[tid] = 0;
}
}

Expand Down
18 changes: 10 additions & 8 deletions src/arch/riscvcapstone/o3/iew.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1271,14 +1271,16 @@ IEW::executeInsts()

ThreadID thread_id = inst->threadNumber;
CapPerm pc_perm = pcCaps[thread_id].perm();
if(!capInBound(pcCaps[thread_id], inst->pcState().instAddr()) ||
(pc_perm != CapPerm::RX && pc_perm != CapPerm::RWX)) {
DPRINTF(IEW, "Cap %llx %llx %llx (perm = %d)\n", pcCaps[thread_id].start(), pcCaps[thread_id].end(),
inst->pcState().instAddr(), static_cast<int>(pc_perm));
fault = std::make_shared<IllegalInstFault>("PC cap check failed",
dynamic_cast<RiscvStaticInst*>(inst->staticInst.get())->machInst);
} else {
fault = inst->getFault();
if(cpu->cwrld[thread_id]) {
if(!capInBound(pcCaps[thread_id], inst->pcState().instAddr()) ||
(pc_perm != CapPerm::RX && pc_perm != CapPerm::RWX)) {
DPRINTF(IEW, "Cap %llx %llx %llx (perm = %d)\n", pcCaps[thread_id].start(), pcCaps[thread_id].end(),
inst->pcState().instAddr(), static_cast<int>(pc_perm));
fault = std::make_shared<IllegalInstFault>("PC cap check failed",
dynamic_cast<RiscvStaticInst*>(inst->staticInst.get())->machInst);
} else {
fault = inst->getFault();
}
}


Expand Down

0 comments on commit 7366010

Please sign in to comment.