diff options
Diffstat (limited to 'src/arch/x86/isa/insts/compare_and_test')
-rw-r--r-- | src/arch/x86/isa/insts/compare_and_test/compare.py | 12 | ||||
-rw-r--r-- | src/arch/x86/isa/insts/compare_and_test/set_byte_on_condition.py | 64 | ||||
-rw-r--r-- | src/arch/x86/isa/insts/compare_and_test/test.py | 8 |
3 files changed, 42 insertions, 42 deletions
diff --git a/src/arch/x86/isa/insts/compare_and_test/compare.py b/src/arch/x86/isa/insts/compare_and_test/compare.py index 8f5890b23..76c75a442 100644 --- a/src/arch/x86/isa/insts/compare_and_test/compare.py +++ b/src/arch/x86/isa/insts/compare_and_test/compare.py @@ -56,21 +56,21 @@ microcode = ''' def macroop CMP_R_M { - ld t1, ds, [scale, index, base], disp + ld t1, seg, sib, disp sub t0, reg, t1, flags=(OF, SF, ZF, AF, PF, CF) }; def macroop CMP_R_P { rdip t7 - ld t1, ds, [0, t0, t7], disp + ld t1, seg, riprel, disp sub t0, reg, t1, flags=(OF, SF, ZF, AF, PF, CF) }; def macroop CMP_M_I { limm t2, imm - ld t1, ds, [scale, index, base], disp + ld t1, seg, sib, disp sub t0, t1, t2, flags=(OF, SF, ZF, AF, PF, CF) }; @@ -78,20 +78,20 @@ def macroop CMP_P_I { limm t2, imm rdip t7 - ld t1, ds, [0, t0, t7], disp + ld t1, seg, riprel, disp sub t0, t1, t2, flags=(OF, SF, ZF, AF, PF, CF) }; def macroop CMP_M_R { - ld t1, ds, [scale, index, base], disp + ld t1, seg, sib, disp sub t0, t1, reg, flags=(OF, SF, ZF, AF, PF, CF) }; def macroop CMP_P_R { rdip t7 - ld t1, ds, [0, t0, t7], disp + ld t1, seg, riprel, disp sub t0, t1, reg, flags=(OF, SF, ZF, AF, PF, CF) }; diff --git a/src/arch/x86/isa/insts/compare_and_test/set_byte_on_condition.py b/src/arch/x86/isa/insts/compare_and_test/set_byte_on_condition.py index 2008bf666..81091905c 100644 --- a/src/arch/x86/isa/insts/compare_and_test/set_byte_on_condition.py +++ b/src/arch/x86/isa/insts/compare_and_test/set_byte_on_condition.py @@ -64,7 +64,7 @@ def macroop SETZ_M { movi t1, t1, 1, flags=(CZF,) movi t1, t1, 0, flags=(nCZF,) - st t1, ds, [scale, index, base], disp + st t1, seg, sib, disp }; def macroop SETZ_P @@ -72,7 +72,7 @@ def macroop SETZ_P rdip t7 movi t1, t1, 1, flags=(CZF,) movi t1, t1, 0, flags=(nCZF,) - st t1, ds, [0, t0, t7], disp + st t1, seg, riprel, disp }; def macroop SETNZ_R @@ -85,7 +85,7 @@ def macroop SETNZ_M { movi t1, t1, 1, flags=(nCZF,) movi t1, t1, 0, flags=(CZF,) - st t1, ds, [scale, index, base], disp + st t1, seg, sib, disp }; def macroop SETNZ_P @@ -93,7 +93,7 @@ def macroop SETNZ_P rdip t7 movi t1, t1, 1, flags=(nCZF,) movi t1, t1, 0, flags=(CZF,) - st t1, ds, [0, t0, t7], disp + st t1, seg, riprel, disp }; def macroop SETB_R @@ -106,7 +106,7 @@ def macroop SETB_M { movi t1, t1, 1, flags=(CCF,) movi t1, t1, 0, flags=(nCCF,) - st t1, ds, [scale, index, base], disp + st t1, seg, sib, disp }; def macroop SETB_P @@ -114,7 +114,7 @@ def macroop SETB_P rdip t7 movi t1, t1, 1, flags=(CCF,) movi t1, t1, 0, flags=(nCCF,) - st t1, ds, [0, t0, t7], disp + st t1, seg, riprel, disp }; def macroop SETNB_R @@ -127,7 +127,7 @@ def macroop SETNB_M { movi t1, t1, 1, flags=(nCCF,) movi t1, t1, 0, flags=(CCF,) - st t1, ds, [scale, index, base], disp + st t1, seg, sib, disp }; def macroop SETNB_P @@ -135,7 +135,7 @@ def macroop SETNB_P rdip t7 movi t1, t1, 1, flags=(nCCF,) movi t1, t1, 0, flags=(CCF,) - st t1, ds, [0, t0, t7], disp + st t1, seg, riprel, disp }; def macroop SETBE_R @@ -148,7 +148,7 @@ def macroop SETBE_M { movi t1, t1, 1, flags=(CCvZF,) movi t1, t1, 0, flags=(nCCvZF,) - st t1, ds, [scale, index, base], disp + st t1, seg, sib, disp }; def macroop SETBE_P @@ -156,7 +156,7 @@ def macroop SETBE_P rdip t7 movi t1, t1, 1, flags=(CCvZF,) movi t1, t1, 0, flags=(nCCvZF,) - st t1, ds, [0, t0, t7], disp + st t1, seg, riprel, disp }; def macroop SETNBE_R @@ -169,7 +169,7 @@ def macroop SETNBE_M { movi t1, t1, 1, flags=(nCCvZF,) movi t1, t1, 0, flags=(CCvZF,) - st t1, ds, [scale, index, base], disp + st t1, seg, sib, disp }; def macroop SETNBE_P @@ -177,7 +177,7 @@ def macroop SETNBE_P rdip t7 movi t1, t1, 1, flags=(nCCvZF,) movi t1, t1, 0, flags=(CCvZF,) - st t1, ds, [0, t0, t7], disp + st t1, seg, riprel, disp }; def macroop SETS_R @@ -190,7 +190,7 @@ def macroop SETS_M { movi t1, t1, 1, flags=(CSF,) movi t1, t1, 0, flags=(nCSF,) - st t1, ds, [scale, index, base], disp + st t1, seg, sib, disp }; def macroop SETS_P @@ -198,7 +198,7 @@ def macroop SETS_P rdip t7 movi t1, t1, 1, flags=(CSF,) movi t1, t1, 0, flags=(nCSF,) - st t1, ds, [0, t0, t7], disp + st t1, seg, riprel, disp }; def macroop SETNS_R @@ -211,7 +211,7 @@ def macroop SETNS_M { movi t1, t1, 1, flags=(nCSF,) movi t1, t1, 0, flags=(CSF,) - st t1, ds, [scale, index, base], disp + st t1, seg, sib, disp }; def macroop SETNS_P @@ -219,7 +219,7 @@ def macroop SETNS_P rdip t7 movi t1, t1, 1, flags=(nCSF,) movi t1, t1, 0, flags=(CSF,) - st t1, ds, [0, t0, t7], disp + st t1, seg, riprel, disp }; def macroop SETP_R @@ -232,7 +232,7 @@ def macroop SETP_M { movi t1, t1, 1, flags=(CPF,) movi t1, t1, 0, flags=(nCPF,) - st t1, ds, [scale, index, base], disp + st t1, seg, sib, disp }; def macroop SETP_P @@ -240,7 +240,7 @@ def macroop SETP_P rdip t7 movi t1, t1, 1, flags=(CPF,) movi t1, t1, 0, flags=(nCPF,) - st t1, ds, [0, t0, t7], disp + st t1, seg, riprel, disp }; def macroop SETNP_R @@ -253,7 +253,7 @@ def macroop SETNP_M { movi t1, t1, 1, flags=(nCPF,) movi t1, t1, 0, flags=(CPF,) - st t1, ds, [scale, index, base], disp + st t1, seg, sib, disp }; def macroop SETNP_P @@ -261,7 +261,7 @@ def macroop SETNP_P rdip t7 movi t1, t1, 1, flags=(nCPF,) movi t1, t1, 0, flags=(CPF,) - st t1, ds, [0, t0, t7], disp + st t1, seg, riprel, disp }; def macroop SETL_R @@ -274,7 +274,7 @@ def macroop SETL_M { movi t1, t1, 1, flags=(CSxOF,) movi t1, t1, 0, flags=(nCSxOF,) - st t1, ds, [scale, index, base], disp + st t1, seg, sib, disp }; def macroop SETL_P @@ -282,7 +282,7 @@ def macroop SETL_P rdip t7 movi t1, t1, 1, flags=(CSxOF,) movi t1, t1, 0, flags=(nCSxOF,) - st t1, ds, [0, t0, t7], disp + st t1, seg, riprel, disp }; def macroop SETNL_R @@ -295,7 +295,7 @@ def macroop SETNL_M { movi t1, t1, 1, flags=(nCSxOF,) movi t1, t1, 0, flags=(CSxOF,) - st t1, ds, [scale, index, base], disp + st t1, seg, sib, disp }; def macroop SETNL_P @@ -303,7 +303,7 @@ def macroop SETNL_P rdip t7 movi t1, t1, 1, flags=(nCSxOF,) movi t1, t1, 0, flags=(CSxOF,) - st t1, ds, [0, t0, t7], disp + st t1, seg, riprel, disp }; def macroop SETLE_R @@ -316,7 +316,7 @@ def macroop SETLE_M { movi t1, t1, 1, flags=(CSxOvZF,) movi t1, t1, 0, flags=(nCSxOvZF,) - st t1, ds, [scale, index, base], disp + st t1, seg, sib, disp }; def macroop SETLE_P @@ -324,7 +324,7 @@ def macroop SETLE_P rdip t7 movi t1, t1, 1, flags=(CSxOvZF,) movi t1, t1, 0, flags=(nCSxOvZF,) - st t1, ds, [0, t0, t7], disp + st t1, seg, riprel, disp }; def macroop SETNLE_R @@ -337,7 +337,7 @@ def macroop SETNLE_M { movi t1, t1, 1, flags=(nCSxOvZF,) movi t1, t1, 0, flags=(CSxOvZF,) - st t1, ds, [scale, index, base], disp + st t1, seg, sib, disp }; def macroop SETNLE_P @@ -345,7 +345,7 @@ def macroop SETNLE_P rdip t7 movi t1, t1, 1, flags=(nCSxOvZF,) movi t1, t1, 0, flags=(CSxOvZF,) - st t1, ds, [0, t0, t7], disp + st t1, seg, riprel, disp }; def macroop SETO_R @@ -358,7 +358,7 @@ def macroop SETO_M { movi t1, t1, 1, flags=(COF,) movi t1, t1, 0, flags=(nCOF,) - st t1, ds, [scale, index, base], disp + st t1, seg, sib, disp }; def macroop SETO_P @@ -366,7 +366,7 @@ def macroop SETO_P rdip t7 movi t1, t1, 1, flags=(COF,) movi t1, t1, 0, flags=(nCOF,) - st t1, ds, [0, t0, t7], disp + st t1, seg, riprel, disp }; def macroop SETNO_R @@ -379,7 +379,7 @@ def macroop SETNO_M { movi t1, t1, 1, flags=(nCOF,) movi t1, t1, 0, flags=(COF,) - st t1, ds, [scale, index, base], disp + st t1, seg, sib, disp }; def macroop SETNO_P @@ -387,6 +387,6 @@ def macroop SETNO_P rdip t7 movi t1, t1, 1, flags=(nCOF,) movi t1, t1, 0, flags=(COF,) - st t1, ds, [0, t0, t7], disp + st t1, seg, riprel, disp }; ''' diff --git a/src/arch/x86/isa/insts/compare_and_test/test.py b/src/arch/x86/isa/insts/compare_and_test/test.py index 8da33899a..2b4bf7b9a 100644 --- a/src/arch/x86/isa/insts/compare_and_test/test.py +++ b/src/arch/x86/isa/insts/compare_and_test/test.py @@ -56,14 +56,14 @@ microcode = ''' def macroop TEST_M_R { - ld t1, ds, [scale, index, base], disp + ld t1, seg, sib, disp and t0, t1, reg, flags=(SF, ZF, PF) }; def macroop TEST_P_R { rdip t7 - ld t1, ds, [0, t0, t7], disp + ld t1, seg, riprel, disp and t0, t1, reg, flags=(SF, ZF, PF) }; @@ -74,7 +74,7 @@ def macroop TEST_R_R def macroop TEST_M_I { - ld t1, ds, [scale, index, base], disp + ld t1, seg, sib, disp limm t2, imm and t0, t1, t2, flags=(SF, ZF, PF) }; @@ -82,7 +82,7 @@ def macroop TEST_M_I def macroop TEST_P_I { rdip t7 - ld t1, ds, [0, t0, t7], disp + ld t1, seg, riprel, disp limm t2, imm and t0, t1, t2, flags=(SF, ZF, PF) }; |