From 53681596f91014af0122e9239902859722477045 Mon Sep 17 00:00:00 2001
From: Dmitry Selyutin <dmitry.selyutin@3mdeb.com>
Date: Mon, 25 Apr 2022 19:50:13 +0000
Subject: [PATCH] sv_binutils: wrap SVP64_FIELD_SET macro

---
 src/openpower/sv/sv_binutils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/openpower/sv/sv_binutils.py b/src/openpower/sv/sv_binutils.py
index 1775aa96..e3ed5549 100644
--- a/src/openpower/sv/sv_binutils.py
+++ b/src/openpower/sv/sv_binutils.py
@@ -588,10 +588,10 @@ class Codegen(_enum.Enum):
                 (
                     "SVP64_FIELD_SET",
                     ("RESULT", "VALUE", "SRC", "DST"),
-                    " = ".join(["*(RESULT)", bit_or(
+                    ("do { (*RESULT) = " + bit_or(
                         lhs="SVP64_FIELD_CLEAR(*(RESULT), DST)",
                         rhs="SVP64_FIELD_REMAP(VALUE, SRC, DST)",
-                    )]),
+                    ) + "; } while (0)"),
                 ),
             )
             for (name, args, body) in macros:
-- 
2.30.2