diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2010-09-29 11:31:03 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2010-09-29 11:31:03 -0700 |
| commit | c41e633e0efebb440083279c3841a2029ff50240 (patch) | |
| tree | f5c5eb3fe97c3ff2f78bb27e6928df87b7f98071 /src/arch/x86/isa | |
| parent | 7bae1f5d430687e5177c960851da689cd60c0b83 (diff) | |
| download | gem5-c41e633e0efebb440083279c3841a2029ff50240.tar.xz | |
X86: Fix the RIP relative versions of the BT, BTC, BTR, and BTS instructions.
Diffstat (limited to 'src/arch/x86/isa')
| -rw-r--r-- | src/arch/x86/isa/insts/general_purpose/compare_and_test/bit_test.py | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/arch/x86/isa/insts/general_purpose/compare_and_test/bit_test.py b/src/arch/x86/isa/insts/general_purpose/compare_and_test/bit_test.py index f87a70328..66eb0f8a2 100644 --- a/src/arch/x86/isa/insts/general_purpose/compare_and_test/bit_test.py +++ b/src/arch/x86/isa/insts/general_purpose/compare_and_test/bit_test.py @@ -75,8 +75,7 @@ def macroop BT_P_R { rdip t7 srai t2, reg, 3, dataSize=asz srai t3, t2, ldsz, dataSize=asz - lea t3, flatseg, [ldsz, t3, base], dataSize=asz - ld t1, seg, [1, t3, t7], disp + ld t1, seg, [dsz, t3, t7], disp sext t0, t1, reg, flags=(CF,) }; @@ -155,13 +154,12 @@ def macroop BTC_P_R { rdip t7, dataSize=asz srai t2, reg, 3, dataSize=asz srai t3, t2, ldsz, dataSize=asz - lea t3, flatseg, [dsz, t3, base], dataSize=asz limm t4, 1 rol t4, t4, reg - ldst t1, seg, [1, t2, t7], disp + ldst t1, seg, [dsz, t3, t7], disp sext t0, t1, reg, flags=(CF,) xor t1, t1, t4 - st t1, seg, [1, t2, t7], disp + st t1, seg, [dsz, t3, t7], disp }; def macroop BTC_LOCKED_M_R { @@ -180,13 +178,12 @@ def macroop BTC_LOCKED_P_R { rdip t7, dataSize=asz srai t2, reg, 3, dataSize=asz srai t3, t2, ldsz, dataSize=asz - lea t3, flatseg, [dsz, t3, base], dataSize=asz limm t4, 1 rol t4, t4, reg - ldstl t1, seg, [1, t2, t7], disp + ldstl t1, seg, [dsz, t3, t7], disp sext t0, t1, reg, flags=(CF,) xor t1, t1, t4 - stul t1, seg, [1, t2, t7], disp + stul t1, seg, [dsz, t3, t7], disp }; def macroop BTR_R_I { @@ -261,13 +258,12 @@ def macroop BTR_P_R { rdip t7, dataSize=asz srai t2, reg, 3, dataSize=asz srai t3, t2, ldsz, dataSize=asz - lea t3, flatseg, [dsz, t3, base], dataSize=asz limm t4, "(uint64_t(-(2ULL)))" rol t4, t4, reg - ldst t1, seg, [1, t3, t7], disp + ldst t1, seg, [dsz, t3, t7], disp sext t0, t1, reg, flags=(CF,) and t1, t1, t4 - st t1, seg, [1, t3, t7], disp + st t1, seg, [dsz, t3, t7], disp }; def macroop BTR_LOCKED_M_R { @@ -286,13 +282,12 @@ def macroop BTR_LOCKED_P_R { rdip t7, dataSize=asz srai t2, reg, 3, dataSize=asz srai t3, t2, ldsz, dataSize=asz - lea t3, flatseg, [dsz, t3, base], dataSize=asz limm t4, "(uint64_t(-(2ULL)))" rol t4, t4, reg - ldstl t1, seg, [1, t3, t7], disp + ldstl t1, seg, [dsz, t3, t7], disp sext t0, t1, reg, flags=(CF,) and t1, t1, t4 - stul t1, seg, [1, t3, t7], disp + stul t1, seg, [dsz, t3, t7], disp }; def macroop BTS_R_I { |