From 3ce758297aa846dd353f8bfe79ab4eeb80db4233 Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Sat, 24 Sep 2022 17:03:58 +0100 Subject: [PATCH] frickin frick --- src/openpower/sv/trans/svp64.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/openpower/sv/trans/svp64.py b/src/openpower/sv/trans/svp64.py index 58cf4f1b..cf26f43f 100644 --- a/src/openpower/sv/trans/svp64.py +++ b/src/openpower/sv/trans/svp64.py @@ -1147,14 +1147,11 @@ class SVP64Asm: elif encmode == 'vli': assert sv_mode == 0b01 # only allow ff mode vli = True -<<<<<<< HEAD -======= elif encmode == 'sea': assert sv_mode in (None, 0b00, 0b01) assert rm['mode'] == "LDST_IDX" sea = True assert failfirst is False, "cannot use ffirst+signed-address" ->>>>>>> 54866195 (add asserts to ensure failfirst+sea not attempted) elif is_bc: if encmode == 'all': svp64_rm.branch.ALL = 1 -- 2.30.2