diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2007-06-22 09:24:33 -0700 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2007-06-22 09:24:33 -0700 |
| commit | 4d1bcbcd36e5735e76b38abb151de716c31a2272 (patch) | |
| tree | 58c29ad6905c45332e1d1d12b9d66596ae6d30d4 /src/arch/x86/isa/insts/data_transfer/stack_operations.py | |
| parent | bdd5fd20fb19eb52ef812cd284094e5513646e36 (diff) | |
| parent | 470a6a9a74eb28a5052e6492c0a3aa9724c57500 (diff) | |
| download | gem5-4d1bcbcd36e5735e76b38abb151de716c31a2272.tar.xz | |
Merge vm1.(none):/home/stever/bk/newmem-head
into vm1.(none):/home/stever/bk/newmem-cache2
--HG--
extra : convert_revision : 1da75335907fee2d1745ec13e515819dfe2aad89
Diffstat (limited to 'src/arch/x86/isa/insts/data_transfer/stack_operations.py')
| -rw-r--r-- | src/arch/x86/isa/insts/data_transfer/stack_operations.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/arch/x86/isa/insts/data_transfer/stack_operations.py b/src/arch/x86/isa/insts/data_transfer/stack_operations.py index ad95fd468..ca2443752 100644 --- a/src/arch/x86/isa/insts/data_transfer/stack_operations.py +++ b/src/arch/x86/isa/insts/data_transfer/stack_operations.py @@ -55,21 +55,19 @@ microcode = ''' def macroop POP_R { - # Make the default data size of pops 64 bits in 64 bit mode - .adjust_env "if(machInst.mode.submode == SixtyFourBitMode && env.dataSize == 4) env.dataSize = 8\;" + .adjust_env oszIn64Override - ld "env.reg", 2, [0, "NUM_INTREGS", "INTREG_RSP"] - addi "INTREG_RSP", "INTREG_RSP", "env.dataSize" + ld reg, ss, [0, t0, "INTREG_RSP"] + addi "INTREG_RSP", "INTREG_RSP", dsz }; def macroop PUSH_R { - # Make the default data size of pops 64 bits in 64 bit mode - .adjust_env "if(machInst.mode.submode == SixtyFourBitMode && env.dataSize == 4) env.dataSize = 8\;" + .adjust_env oszIn64Override - subi "INTREG_RSP", "INTREG_RSP", "env.dataSize" - st "env.reg", 2, [0, "NUM_INTREGS", "INTREG_RSP"] + subi "INTREG_RSP", "INTREG_RSP", dsz + st reg, ss, [0, t0, "INTREG_RSP"] }; ''' #let {{ |