From 809baef5d3828acec4f60eaa8c8645b1d12026c7 Mon Sep 17 00:00:00 2001
From: lkcl <lkcl@web>
Date: Thu, 3 Oct 2019 09:33:34 +0100
Subject: [PATCH]

---
 .../specification/bitmanip.mdwn               | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/simple_v_extension/specification/bitmanip.mdwn b/simple_v_extension/specification/bitmanip.mdwn
index a78a64d47..9af15e6f2 100644
--- a/simple_v_extension/specification/bitmanip.mdwn
+++ b/simple_v_extension/specification/bitmanip.mdwn
@@ -221,24 +221,28 @@ Pseudo-code:
     def sof(rd, rs1, rs2):
         rd = 0
         setting_mode = rs2 == x0 or (regs[rs2] & 1)
+
         while i < XLEN:
             bit = 1<<i
-            if setting_mode:
-                if regs[rs1] & bit: # found a bit in rs1:
-                    # set bit, exit setting mode immediately
-                    regs[rd] |= bit
-                    setting_mode = False
-                    # Now skip any more 1s
-                    i += 1
-                    while i < XLEN:
-                        bit = 1<<i
-                        # stop at 1st zero
-                        if regs[rs1] & bit == 0:
-                            break
-                        i += 1
-            else if rs2 != x0:
-                # only reenable when predicate in use, and bit valid
+
+            # only reenable when predicate in use, and bit valid    
+            if !setting_mode && rs2 != x0:
                 if (regs[rs2] & bit):
-                    setting_mode = True # back into "setting" mode
+                    # back into "setting" mode
+                    setting_mode = True
+
+            # skipping mode
+            if !setting_mode:
+                # skip any more 1s
+                if regs[rs1] & bit == 1:
+                    i += 1
+                    continue
+
+            # setting mode, search for 1
+            if regs[rs1] & bit: # found a bit in rs1:
+                # set bit, exit setting mode immediately
+                regs[rd] |= bit
+                setting_mode = False
+
             i += 1
 
-- 
2.30.2