From: Paul Mackerras <paulus@ozlabs.org>
Date: Tue, 28 Jul 2020 02:09:02 +0000 (+1000)
Subject: execute1: Use r.<field> not v.<field> in countzero code
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=081684273e11fee3d3ec14bd97e8d858e1d29402;p=microwatt.git

execute1: Use r.<field> not v.<field> in countzero code

This simplifies logic and improves timing.

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
---

diff --git a/execute1.vhdl b/execute1.vhdl
index 1068306..edddc4a 100644
--- a/execute1.vhdl
+++ b/execute1.vhdl
@@ -949,9 +949,9 @@ begin
             -- cnt[lt]z always takes two cycles
             result := countzero_result;
             result_en := '1';
-            v.e.write_reg := gpr_to_gspr(v.slow_op_dest);
-            v.e.rc := v.slow_op_rc;
-            v.e.xerc := v.slow_op_xerc;
+            v.e.write_reg := gpr_to_gspr(r.slow_op_dest);
+            v.e.rc := r.slow_op_rc;
+            v.e.xerc := r.slow_op_xerc;
             v.e.valid := '1';
 	elsif r.mul_in_progress = '1' or r.div_in_progress = '1' then
 	    if (r.mul_in_progress = '1' and multiply_to_x.valid = '1') or