Merge remote-tracking branch 'upstream/main' into cachesim

This commit is contained in:
Limnanthes Serafini 2023-04-05 09:53:05 -07:00
commit 7de772dcfe

View File

@ -555,7 +555,7 @@ logic [3:0] dummy;
end end
if (`ICACHE_SUPPORTED && `I_CACHE_ADDR_LOGGER) begin : ICacheLogger if (`ICACHE_SUPPORTED && `I_CACHE_ADDR_LOGGER) begin : ICacheLogger
int file; int file;
string LogFile; string LogFile;
logic resetD, resetEdge; logic resetD, resetEdge;
@ -629,7 +629,7 @@ if (`ICACHE_SUPPORTED && `I_CACHE_ADDR_LOGGER) begin : ICacheLogger
end end
end end
if (`BPRED_SUPPORTED) begin if (`BPRED_SUPPORTED) begin : BranchLogger
if (`BPRED_LOGGER) begin if (`BPRED_LOGGER) begin
string direction; string direction;
int file; int file;