From 863e6e72d6276492ff1d3706f84272de2fd8dc28 Mon Sep 17 00:00:00 2001 From: David Harris Date: Sat, 17 Jul 2021 15:04:39 -0400 Subject: [PATCH] hptw: Propagating PageTableEntryF removal through IFU --- wally-pipelined/src/ifu/ifu.sv | 4 ++-- wally-pipelined/src/wally/wallypipelinedhart.sv | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wally-pipelined/src/ifu/ifu.sv b/wally-pipelined/src/ifu/ifu.sv index 9c2e92915..946b38211 100644 --- a/wally-pipelined/src/ifu/ifu.sv +++ b/wally-pipelined/src/ifu/ifu.sv @@ -67,7 +67,7 @@ module ifu ( // mmu management input logic [1:0] PrivilegeModeW, - input logic [`XLEN-1:0] PageTableEntryF, + input logic [`XLEN-1:0] PTE, input logic [1:0] PageType, input logic [`XLEN-1:0] SATP_REGW, input logic STATUS_MXR, STATUS_SUM, STATUS_MPRV, @@ -116,7 +116,7 @@ module ifu ( mmu #(.TLB_ENTRIES(`ITLB_ENTRIES), .IMMU(1)) immu(.Address(PCF), .Size(2'b10), - .PTE(PageTableEntryF), + .PTE(PTE), .PageTypeWriteVal(PageType), .TLBWrite(ITLBWriteF), .TLBFlush(ITLBFlushF), diff --git a/wally-pipelined/src/wally/wallypipelinedhart.sv b/wally-pipelined/src/wally/wallypipelinedhart.sv index a5102ab84..77800bc80 100644 --- a/wally-pipelined/src/wally/wallypipelinedhart.sv +++ b/wally-pipelined/src/wally/wallypipelinedhart.sv @@ -117,7 +117,7 @@ module wallypipelinedhart logic STATUS_MXR, STATUS_SUM, STATUS_MPRV; logic [1:0] STATUS_MPP; logic [1:0] PrivilegeModeW; - logic [`XLEN-1:0] PageTableEntryF, PageTableEntryM; + logic [`XLEN-1:0] PTE; logic [1:0] PageType; // PMA checker signals @@ -225,7 +225,7 @@ module wallypipelinedhart .PCF(PCF), .ITLBMissF(ITLBMissF), - .PTE(PageTableEntryF), + .PTE(PTE), .PageType, .ITLBWriteF(ITLBWriteF), .WalkerInstrPageFaultF(WalkerInstrPageFaultF),