From b46967decbf9c586b010f794e136ae38a0d60c7b Mon Sep 17 00:00:00 2001 From: Akilan Date: Mon, 23 Feb 2026 11:53:03 +0000 Subject: [PATCH] saving current changes --- libs/cheri-cap-lib | 2 +- src_Core/RISCY_OOO/procs/lib/Exec.bsv | 2 +- src_Core/RISCY_OOO/procs/lib/Types.bsv | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libs/cheri-cap-lib b/libs/cheri-cap-lib index f7884bb..b772286 160000 --- a/libs/cheri-cap-lib +++ b/libs/cheri-cap-lib @@ -1 +1 @@ -Subproject commit f7884bb932b33355be650d0bc9be9ef8702fafcd +Subproject commit b77228626174c346a67b1debced2a6da70ee34a5 diff --git a/src_Core/RISCY_OOO/procs/lib/Exec.bsv b/src_Core/RISCY_OOO/procs/lib/Exec.bsv index 78b32b6..86129aa 100644 --- a/src_Core/RISCY_OOO/procs/lib/Exec.bsv +++ b/src_Core/RISCY_OOO/procs/lib/Exec.bsv @@ -285,7 +285,7 @@ function CapPipe capModify(CapPipe a, CapPipe b, CapModifyFunc func); tagged FromPtr : (getAddr(a) == 0 ? nullCap : setAddr(b_mut, getAddr(a)).value); tagged SetHigh: - // fromMemTest(tuple2(False, {getAddr(b), getAddr(a)})); + //fromMem(tuple2(False, {getAddr(b), getAddr(a)})); capFromAddrs(a,b); // getTruncatedTuple(getAddr(b)) tagged BuildCap : diff --git a/src_Core/RISCY_OOO/procs/lib/Types.bsv b/src_Core/RISCY_OOO/procs/lib/Types.bsv index 589e84e..868b7bb 100644 --- a/src_Core/RISCY_OOO/procs/lib/Types.bsv +++ b/src_Core/RISCY_OOO/procs/lib/Types.bsv @@ -49,6 +49,11 @@ import RVFI_DII_Types::*; typedef 64 AddrSz; typedef Bit#(AddrSz) Addr; +// typedef struct { +// Vector#(2, Data) data; +// Bit#(52) padding; +// } MemData deriving (Bits); + typedef 64 DataSz; typedef Bit#(DataSz) Data; typedef TDiv#(DataSz, 8) DataBytes; @@ -60,6 +65,7 @@ typedef struct { function tag_t getTag(TaggedData#(tag_t, data_t) td) = td.tag; function data_t getData(TaggedData#(tag_t, data_t) td) = td.data; typedef Vector#(2, Data) MemData; +// typedef Bit#(180) MemData; typedef Bool MemTag; typedef SizeOf#(MemData) MemDataSz; typedef TDiv#(MemDataSz, 8) MemDataBytes;