1 files changed, 13 insertions, 3 deletions
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 b038cc00a..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
@@ -1,4 +1,4 @@
-# Copyright (c) 2007 The Hewlett-Packard Development Company
+# Copyright (c) 2007-2008 The Hewlett-Packard Development Company
 # All rights reserved.
 #
 # Redistribution and use of this software in source and binary forms,
@@ -73,34 +73,44 @@ def macroop SCAS_M {
 #
 
 def macroop SCAS_E_M {
+    and t0, rcx, rcx, flags=(EZF,), dataSize=asz
+    br label("end"), flags=(CEZF,)
+
     # Find the constant we need to either add or subtract from rdi
     ruflag t0, 10
     movi t2, t2, dsz, flags=(CEZF,), dataSize=asz
     subi t3, t0, dsz, dataSize=asz
     mov t2, t2, t3, flags=(nCEZF,), dataSize=asz
 
+topOfLoop:
     ld t1, es, [1, t0, rdi]
     sub t0, t1, rax, flags=(OF, SF, ZF, AF, PF, CF)
 
     subi rcx, rcx, 1, flags=(EZF,), dataSize=asz
     add rdi, rdi, t2, dataSize=asz
-    bri t0, 4, flags=(CSTRZnEZF,)
+    br label("topOfLoop"), flags=(CSTRZnEZF,)
+end:
     fault "NoFault"
 };
 
 def macroop SCAS_N_M {
+    and t0, rcx, rcx, flags=(EZF,), dataSize=asz
+    br label("end"), flags=(CEZF,)
+
     # Find the constant we need to either add or subtract from rdi
     ruflag t0, 10
     movi t2, t2, dsz, flags=(CEZF,), dataSize=asz
     subi t3, t0, dsz, dataSize=asz
     mov t2, t2, t3, flags=(nCEZF,), dataSize=asz
 
+topOfLoop:
     ld t1, es, [1, t0, rdi]
     sub t0, t1, rax, flags=(OF, SF, ZF, AF, PF, CF)
 
     subi rcx, rcx, 1, flags=(EZF,), dataSize=asz
     add rdi, rdi, t2, dataSize=asz
-    bri t0, 4, flags=(CSTRnZnEZF,)
+    br label("topOfLoop"), flags=(CSTRnZnEZF,)
+end:
     fault "NoFault"
 };