X86: Create a SeqOp class of microops and make Br one of them.

5 files changed, 14 insertions, 14 deletions

diff --git a/src/arch/x86/isa/insts/general_purpose/string/compare_strings.py b/src/arch/x86/isa/insts/general_purpose/string/compare_strings.py
index 9810fe3c2..561b8a415 100644
--- a/src/arch/x86/isa/insts/general_purpose/string/compare_strings.py
+++ b/src/arch/x86/isa/insts/general_purpose/string/compare_strings.py
@@ -76,7 +76,7 @@ def macroop CMPS_M_M {
 
 def macroop CMPS_E_M_M {
     and t0, rcx, rcx, flags=(EZF,), dataSize=asz
-    bri t0, label("end"), flags=(CEZF,)
+    br label("end"), flags=(CEZF,)
 
     # Find the constant we need to either add or subtract from rdi
     ruflag t0, 10
@@ -92,14 +92,14 @@ topOfLoop:
     subi rcx, rcx, 1, flags=(EZF,), dataSize=asz
     add rdi, rdi, t3, dataSize=asz
     add rsi, rsi, t3, dataSize=asz
-    bri t0, label("topOfLoop"), flags=(CSTRZnEZF,)
+    br label("topOfLoop"), flags=(CSTRZnEZF,)
 end:
     fault "NoFault"
 };
 
 def macroop CMPS_N_M_M {
     and t0, rcx, rcx, flags=(EZF,), dataSize=asz
-    bri t0, label("end"), flags=(CEZF,)
+    br label("end"), flags=(CEZF,)
 
     # Find the constant we need to either add or subtract from rdi
     ruflag t0, 10
@@ -115,7 +115,7 @@ topOfLoop:
     subi rcx, rcx, 1, flags=(EZF,), dataSize=asz
     add rdi, rdi, t3, dataSize=asz
     add rsi, rsi, t3, dataSize=asz
-    bri t0, label("topOfLoop"), flags=(CSTRnZnEZF,)
+    br label("topOfLoop"), flags=(CSTRnZnEZF,)
 end:
     fault "NoFault"
 };
diff --git a/src/arch/x86/isa/insts/general_purpose/string/load_string.py b/src/arch/x86/isa/insts/general_purpose/string/load_string.py
index 8cf07fea6..8d144dc4d 100644
--- a/src/arch/x86/isa/insts/general_purpose/string/load_string.py
+++ b/src/arch/x86/isa/insts/general_purpose/string/load_string.py
@@ -68,7 +68,7 @@ def macroop LODS_M {
 
 def macroop LODS_E_M {
     and t0, rcx, rcx, flags=(EZF,), dataSize=asz
-    bri t0, label("end"), flags=(CEZF,)
+    br label("end"), flags=(CEZF,)
     # Find the constant we need to either add or subtract from rdi
     ruflag t0, 10
     movi t3, t3, dsz, flags=(CEZF,), dataSize=asz
@@ -80,7 +80,7 @@ topOfLoop:
 
     subi rcx, rcx, 1, flags=(EZF,), dataSize=asz
     add rdi, rdi, t3, dataSize=asz
-    bri t0, label("topOfLoop"), flags=(nCEZF,)
+    br label("topOfLoop"), flags=(nCEZF,)
 end:
     fault "NoFault"
 };
diff --git a/src/arch/x86/isa/insts/general_purpose/string/move_string.py b/src/arch/x86/isa/insts/general_purpose/string/move_string.py
index 1d7dd75ad..18faa38e2 100644
--- a/src/arch/x86/isa/insts/general_purpose/string/move_string.py
+++ b/src/arch/x86/isa/insts/general_purpose/string/move_string.py
@@ -70,7 +70,7 @@ def macroop MOVS_M_M {
 
 def macroop MOVS_E_M_M {
     and t0, rcx, rcx, flags=(EZF,), dataSize=asz
-    bri t0, label("end"), flags=(CEZF,)
+    br label("end"), flags=(CEZF,)
     # Find the constant we need to either add or subtract from rdi
     ruflag t0, 10
     movi t3, t3, dsz, flags=(CEZF,), dataSize=asz
@@ -84,7 +84,7 @@ topOfLoop:
     subi rcx, rcx, 1, flags=(EZF,), dataSize=asz
     add rdi, rdi, t3, dataSize=asz
     add rsi, rsi, t3, dataSize=asz
-    bri t0, label("topOfLoop"), flags=(nCEZF,)
+    br label("topOfLoop"), flags=(nCEZF,)
 end:
     fault "NoFault"
 };
diff --git a/src/arch/x86/isa/insts/general_purpose/string/scan_string.py b/src/arch/x86/isa/insts/general_purpose/string/scan_string.py
index b37e367be..5b0e74aad 100644
--- a/src/arch/x86/isa/insts/general_purpose/string/scan_string.py
+++ b/src/arch/x86/isa/insts/general_purpose/string/scan_string.py
@@ -74,7 +74,7 @@ def macroop SCAS_M {
 
 def macroop SCAS_E_M {
     and t0, rcx, rcx, flags=(EZF,), dataSize=asz
-    bri t0, label("end"), flags=(CEZF,)
+    br label("end"), flags=(CEZF,)
 
     # Find the constant we need to either add or subtract from rdi
     ruflag t0, 10
@@ -88,14 +88,14 @@ topOfLoop:
 
     subi rcx, rcx, 1, flags=(EZF,), dataSize=asz
     add rdi, rdi, t2, dataSize=asz
-    bri t0, label("topOfLoop"), flags=(CSTRZnEZF,)
+    br label("topOfLoop"), flags=(CSTRZnEZF,)
 end:
     fault "NoFault"
 };
 
 def macroop SCAS_N_M {
     and t0, rcx, rcx, flags=(EZF,), dataSize=asz
-    bri t0, label("end"), flags=(CEZF,)
+    br label("end"), flags=(CEZF,)
 
     # Find the constant we need to either add or subtract from rdi
     ruflag t0, 10
@@ -109,7 +109,7 @@ topOfLoop:
 
     subi rcx, rcx, 1, flags=(EZF,), dataSize=asz
     add rdi, rdi, t2, dataSize=asz
-    bri t0, label("topOfLoop"), flags=(CSTRnZnEZF,)
+    br label("topOfLoop"), flags=(CSTRnZnEZF,)
 end:
     fault "NoFault"
 };
diff --git a/src/arch/x86/isa/insts/general_purpose/string/store_string.py b/src/arch/x86/isa/insts/general_purpose/string/store_string.py
index b52b1f1fb..fe9917ce6 100644
--- a/src/arch/x86/isa/insts/general_purpose/string/store_string.py
+++ b/src/arch/x86/isa/insts/general_purpose/string/store_string.py
@@ -68,7 +68,7 @@ def macroop STOS_M {
 
 def macroop STOS_E_M {
     and t0, rcx, rcx, flags=(EZF,), dataSize=asz
-    bri t0, label("end"), flags=(CEZF,)
+    br label("end"), flags=(CEZF,)
     # Find the constant we need to either add or subtract from rdi
     ruflag t0, 10
     movi t3, t3, dsz, flags=(CEZF,), dataSize=asz
@@ -80,7 +80,7 @@ topOfLoop:
 
     subi rcx, rcx, 1, flags=(EZF,), dataSize=asz
     add rdi, rdi, t3, dataSize=asz
-    bri t0, label("topOfLoop"), flags=(nCEZF,)
+    br label("topOfLoop"), flags=(nCEZF,)
 end:
     fault "NoFault"
 };