From 73dedec3090e7842ba6f2524b2f87c132af249f6 Mon Sep 17 00:00:00 2001
From: Jessica Clarke <jrtc27@jrtc27.com>
Date: Fri, 24 Jul 2020 20:02:10 +0100
Subject: [PATCH] FetchStage: Use map rather than for loop

Also add some spaces in the following line.
---
 src_Core/RISCY_OOO/procs/RV64G_OOO/FetchStage.bsv | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src_Core/RISCY_OOO/procs/RV64G_OOO/FetchStage.bsv b/src_Core/RISCY_OOO/procs/RV64G_OOO/FetchStage.bsv
index 37f03bc..e403fcc 100644
--- a/src_Core/RISCY_OOO/procs/RV64G_OOO/FetchStage.bsv
+++ b/src_Core/RISCY_OOO/procs/RV64G_OOO/FetchStage.bsv
@@ -797,9 +797,8 @@ module mkFetchStage(FetchStage);
             end
         end
         else if (parse_f22f3) begin
-            Vector#(SupSizeX2,Instruction16) v_x16;
-            for (Integer i=0; i<valueOf(SupSizeX2); i=i+1) v_x16[i] = fromMaybe(?,inst_d[i]);
-            SupCntX2 n_x16s = min(zeroExtend(nbSupX2In)+1, pack(countIf(isValid,inst_d)));
+            Vector#(SupSizeX2, Instruction16) v_x16 = map(fromMaybe(?), inst_d);
+            SupCntX2 n_x16s = min(zeroExtend(nbSupX2In) + 1, pack(countIf(isValid, inst_d)));
 
             // Parse v_x16 into 32-bit and 16-bit instructions
             CapMem pred_next_pc;