changeset 951199885fd8 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=951199885fd8
description:
X86: Adjust the various sizes used for the enter and leave instructions.
diffstat:
1 file changed, 11 insertions(+), 10 deletions(-)
src/arch/x86/isa/insts/general_purpose/data_transfer/stack_operations.py | 21
+++++-----
diffs (59 lines):
diff -r 585faad1057f -r 951199885fd8
src/arch/x86/isa/insts/general_purpose/data_transfer/stack_operations.py
--- a/src/arch/x86/isa/insts/general_purpose/data_transfer/stack_operations.py
Thu Aug 06 21:44:41 2009 -0700
+++ b/src/arch/x86/isa/insts/general_purpose/data_transfer/stack_operations.py
Thu Aug 06 21:44:42 2009 -0700
@@ -150,13 +150,14 @@
# Make the default data size of pops 64 bits in 64 bit mode
.adjust_env oszIn64Override
- mov t1, t1, rbp, dataSize=asz
+ mov t1, t1, rbp, dataSize=ssz
ld rbp, ss, [1, t0, t1], dataSize=ssz
- mov rsp, rsp, t1, dataSize=asz
- addi rsp, rsp, ssz, dataSize=asz
+ mov rsp, rsp, t1, dataSize=ssz
+ addi rsp, rsp, ssz, dataSize=ssz
};
def macroop ENTER_I_I {
+ .adjust_env oszIn64Override
# This needs to check all the addresses it writes to before it actually
# writes any values.
@@ -168,10 +169,10 @@
# t1 is now the masked nesting level, and t2 is the amount of storage.
# Push rbp.
- stupd rbp, ss, [1, t0, rsp], "-env.stackSize", dataSize=ssz
+ stupd rbp, ss, [1, t0, rsp], "-env.dataSize"
# Save the stack pointer for later
- mov t6, t6, rsp, dataSize=asz
+ mov t6, t6, rsp
# If the nesting level is zero, skip all this stuff.
sub t0, t1, t0, flags=(EZF,), dataSize=2
@@ -183,8 +184,8 @@
limm t4, "ULL(-1)", dataSize=8
topOfLoop:
- ld t5, ss, [ssz, t4, rbp], dataSize=ssz
- stupd t5, ss, [1, t0, rsp], "-env.stackSize"
+ ld t5, ss, [dsz, t4, rbp]
+ stupd t5, ss, [1, t0, rsp], "-env.dataSize"
# If we're not done yet, loop
subi t4, t4, 1, dataSize=8
@@ -193,10 +194,10 @@
bottomOfLoop:
# Push the old rbp onto the stack
- stupd t6, ss, [1, t0, rsp], "-env.stackSize"
+ stupd t6, ss, [1, t0, rsp], "-env.dataSize"
skipLoop:
- sub rsp, rsp, t2, dataSize=asz
- mov rbp, rbp, t6, dataSize=asz
+ sub rsp, rsp, t2, dataSize=ssz
+ mov rbp, rbp, t6
};
'''
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
