X86: Bit scan forward/reverse were accidentally transposed.

diff --git a/src/arch/x86/isa/insts/general_purpose/compare_and_test/bit_scan.py b/src/arch/x86/isa/insts/general_purpose/compare_and_test/bit_scan.py
index 71059e80d2e4713457e2dab8d3c122456eb561a9..a18437df348ee64544e3d9489023a24ba37ceffa 100644 (file)
--- a/src/arch/x86/isa/insts/general_purpose/compare_and_test/bit_scan.py
+++ b/src/arch/x86/isa/insts/general_purpose/compare_and_test/bit_scan.py
@@ -82,7 +82,7 @@
 # Authors: Gabe Black
 
 microcode = '''
-def macroop BSF_R_R {
+def macroop BSR_R_R {
     # Determine if the input was zero, and also move it to a temp reg.
     movi t1, t1, t0, dataSize=8
     and t1, regm, regm, flags=(ZF,)
@@ -131,7 +131,7 @@ end:
     fault "NoFault"
 };
 
-def macroop BSF_R_M {
+def macroop BSR_R_M {
 
     movi t1, t1, t0, dataSize=8
     ld t1, seg, sib, disp
@@ -183,7 +183,7 @@ end:
     fault "NoFault"
 };
 
-def macroop BSF_R_P {
+def macroop BSR_R_P {
 
     rdip t7
     movi t1, t1, t0, dataSize=8
@@ -236,7 +236,7 @@ end:
     fault "NoFault"
 };
 
-def macroop BSR_R_R {
+def macroop BSF_R_R {
     # Determine if the input was zero, and also move it to a temp reg.
     mov t1, t1, t0, dataSize=8
     and t1, regm, regm, flags=(ZF,)
@@ -282,7 +282,7 @@ end:
     fault "NoFault"
 };
 
-def macroop BSR_R_M {
+def macroop BSF_R_M {
 
     mov t1, t1, t0, dataSize=8
     ld t1, seg, sib, disp
@@ -331,7 +331,7 @@ end:
     fault "NoFault"
 };
 
-def macroop BSR_R_P {
+def macroop BSF_R_P {
 
     rdip t7
     mov t1, t1, t0, dataSize=8