Cheri-research/Toooba
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Implement cap_mode switch for legacy loads and stores, as the mechanism

Browse Source 
for decoding has changed and was not setting the new flag.
This commit is contained in:
jon
2020-06-02 19:00:28 +01:00
parent 078d39b9df
commit bb3eddccf2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src_Core/RISCY_OOO/procs/lib/Decode.bsv
View File

@@ -33,7 +33,7 @@ import ISA_Decls_CHERI::*;
Bit#(3) memWU = 3'b110;
// Smaller decode functions
function Maybe#(MemInst) decodeMemInst(Instruction inst);
function Maybe#(MemInst) decodeMemInst(Instruction inst, Bool cap_mode);
Bool illegalInst = False;
Opcode opcode = unpackOpcode(inst[6:0]);
let funct5 = inst[31:27];
@@ -147,7 +147,7 @@ function Maybe#(MemInst) decodeMemInst(Instruction inst);
byteEn: byteEn,
aq: aq,
rl: rl,
reg_bounds: False } );
reg_bounds: cap_mode } );
end
endfunction
@@ -299,7 +299,7 @@ function DecodeResult decode(Instruction inst, Bool cap_mode);
ImmData immIunsigned = zeroExtend(inst[31:20]);
// Results of mini-decoders
Maybe#(MemInst) mem_inst = decodeMemInst(inst);
Maybe#(MemInst) mem_inst = decodeMemInst(inst, cap_mode);
Maybe#(MemInst) exp_bnds_mem_inst = decodeExplicitBoundsMemInst(inst);
// TODO better detection of illegal insts