From 86bae2eca646667b31133825a6a1e8cbc7fd6840 Mon Sep 17 00:00:00 2001
From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Thu, 17 Mar 2022 06:14:16 +0000
Subject: [PATCH] revert bitmask changes

---
 openpower/sv/bitmanip.mdwn | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/openpower/sv/bitmanip.mdwn b/openpower/sv/bitmanip.mdwn
index 3cfe2f6d8..468c5cca5 100644
--- a/openpower/sv/bitmanip.mdwn
+++ b/openpower/sv/bitmanip.mdwn
@@ -284,19 +284,22 @@ def MASK(x, y):
 uint_xlen_t bmset(RS, RB, sh)
 {
     int shamt = RB & (XLEN - 1);
-    return RS | MASK(shamt, sh)
+    mask = (2<<sh)-1;
+    return RS | (mask << shamt);
 }
 
 uint_xlen_t bmclr(RS, RB, sh)
 {
     int shamt = RB & (XLEN - 1);
-    return RS & ~MASK(shamt, sh)
+    mask = (2<<sh)-1;
+    return RS & ~(mask << shamt);
 }
 
 uint_xlen_t bminv(RS, RB, sh)
 {
     int shamt = RB & (XLEN - 1);
-    return RS ^ MASK(shamt, sh)
+    mask = (2<<sh)-1;
+    return RS ^ (mask << shamt);
 }
 
 uint_xlen_t bmext(RS, RB, sh)
-- 
2.30.2