From bd55e186e0ccc86bc8e5af872092dc8c2b2ce3c1 Mon Sep 17 00:00:00 2001 From: Greg Chadwick Date: Mon, 28 Oct 2024 15:54:15 +0000 Subject: [PATCH] Update lowrisc_ibex to lowrisc/cheriot-ibex@ea2df9db Update code from upstream repository https://github.com/lowrisc/cheriot-ibex.git to revision ea2df9db3bcea776f0dc72d6d89c31c73798ecd4 * Feed RV32M through ibexc_top_tracing/ibexc_top (Greg Chadwick) * Switch to no bitmanip by default (Greg Chadwick) * Feed RV32B through in ibexc_top (Greg Chadwick) Signed-off-by: Greg Chadwick --- vendor/lowrisc_ibex.lock.hjson | 2 +- vendor/lowrisc_ibex/rtl/ibexc_top.sv | 5 +++-- vendor/lowrisc_ibex/rtl/ibexc_top_tracing.sv | 4 +++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/vendor/lowrisc_ibex.lock.hjson b/vendor/lowrisc_ibex.lock.hjson index 2572a83f2..4289d933f 100644 --- a/vendor/lowrisc_ibex.lock.hjson +++ b/vendor/lowrisc_ibex.lock.hjson @@ -9,6 +9,6 @@ upstream: { url: https://github.com/lowrisc/cheriot-ibex.git - rev: adc4803d5d13cdf5a629b3f53fb4ce8d1ac38fe5 + rev: ea2df9db3bcea776f0dc72d6d89c31c73798ecd4 } } diff --git a/vendor/lowrisc_ibex/rtl/ibexc_top.sv b/vendor/lowrisc_ibex/rtl/ibexc_top.sv index e725f7fdb..bf3bdeb66 100644 --- a/vendor/lowrisc_ibex/rtl/ibexc_top.sv +++ b/vendor/lowrisc_ibex/rtl/ibexc_top.sv @@ -26,6 +26,7 @@ module ibexc_top import ibex_pkg::*; import cheri_pkg::*; #( parameter int unsigned MHPMCounterNum = 0, parameter int unsigned MHPMCounterWidth = 40, parameter bit RV32E = 1'b0, + parameter rv32m_e RV32M = RV32MFast, parameter rv32b_e RV32B = RV32BNone, parameter bit WritebackStage = 1'b1, parameter bit BranchPredictor = 1'b0, @@ -258,8 +259,8 @@ module ibexc_top import ibex_pkg::*; import cheri_pkg::*; #( .MHPMCounterNum (MHPMCounterNum ), .MHPMCounterWidth (MHPMCounterWidth), .RV32E (RV32E), - .RV32M (RV32MFast), - .RV32B (RV32BNone), + .RV32M (RV32M), + .RV32B (RV32B), .BranchTargetALU (1'b1), .ICache (ICache), .ICacheECC (1'b0), diff --git a/vendor/lowrisc_ibex/rtl/ibexc_top_tracing.sv b/vendor/lowrisc_ibex/rtl/ibexc_top_tracing.sv index f89489bc0..8c2d0083a 100644 --- a/vendor/lowrisc_ibex/rtl/ibexc_top_tracing.sv +++ b/vendor/lowrisc_ibex/rtl/ibexc_top_tracing.sv @@ -14,12 +14,13 @@ module ibexc_top_tracing import ibex_pkg::*; import cheri_pkg::*; #( parameter int unsigned DmHaltAddr = 32'h1A110800, parameter int unsigned DmExceptionAddr = 32'h1A110808, parameter bit RV32E = 1'b0, + parameter rv32m_e RV32M = RV32MFast, + parameter rv32b_e RV32B = RV32BNone, parameter bit CheriTBRE = 1'b1, parameter bit CheriStkZ = 1'b1, parameter bit DbgTriggerEn = 1'b1, parameter int unsigned DbgHwBreakNum = 4, parameter int unsigned MHPMCounterNum = 0, - parameter rv32b_e RV32B = RV32BFull, parameter int unsigned HeapBase = 32'h2001_0000, parameter int unsigned TSMapBase = 32'h2004_0000, // 4kB default parameter int unsigned TSMapSize = 1024, // in words @@ -155,6 +156,7 @@ module ibexc_top_tracing import ibex_pkg::*; import cheri_pkg::*; #( .DbgTriggerEn (DbgTriggerEn), .DbgHwBreakNum (DbgHwBreakNum), .RV32E (RV32E), + .RV32M (RV32M), .RV32B (RV32B), .WritebackStage (1'b1), .BranchPredictor (1'b0),