bug 1034: add crternlogi. involved adding a new CR field BFA_BFB_BF sigh

[openpower-isa.git] / src / openpower / decoder / power_enums.py

diff --git a/src/openpower/decoder/power_enums.py b/src/openpower/decoder/power_enums.py
index 28c2018913fc3e7561004ddf7be617568cabb74e..981675cb9c63c5eb6577fdbd9b73e4e553947f0a 100644 (file)
--- a/src/openpower/decoder/power_enums.py
+++ b/src/openpower/decoder/power_enums.py
@@ -970,10 +970,13 @@ class MicrOp(Enum):
     OP_SETBC = 111
     OP_BMAT = 112 # bmatflip/xor/and - known by many names (vgbbd in Power)
     OP_CRTERNLOG = 113
+<<<<<<< HEAD
     OP_BINLOG = 114
     OP_CRBINLOG = 115
     OP_CRFBINLOG = 116
     OP_CRFTERNLOG = 117
+=======
+>>>>>>> ef668555 (bug 1034: add crternlogi. involved adding a new CR field BFA_BFB_BF sigh)
 
 
 class SelType(Enum):