summaryrefslogtreecommitdiff
path: root/src/arch/x86/types.hh
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2007-06-19 14:18:46 +0000
committerGabe Black <gblack@eecs.umich.edu>2007-06-19 14:18:46 +0000
commit053c715f213a6532b5644e46a5d04ef9e092139e (patch)
tree515d9abc887ddbc41431a902b1bf7c7ebb668776 /src/arch/x86/types.hh
parent2d08ab0cc26fc2b03a575f054508abc035786a08 (diff)
parent6e286cddfaf6286f96e06c26266070f6fbbd7749 (diff)
downloadgem5-053c715f213a6532b5644e46a5d04ef9e092139e.tar.xz
Merge zizzer.eecs.umich.edu:/bk/newmem
into ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86 --HG-- extra : convert_revision : 2dfc24b0720b3b378858a289e4bb6f4ee7132b3d
Diffstat (limited to 'src/arch/x86/types.hh')
-rw-r--r--src/arch/x86/types.hh12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/arch/x86/types.hh b/src/arch/x86/types.hh
index fc9f1d82b..298dff80b 100644
--- a/src/arch/x86/types.hh
+++ b/src/arch/x86/types.hh
@@ -169,6 +169,8 @@ namespace X86ISA
uint8_t opSize;
//The effective address size.
uint8_t addrSize;
+ //The effective stack size.
+ uint8_t stackSize;
//Mode information
OperatingMode mode;
@@ -193,8 +195,6 @@ namespace X86ISA
inline static bool
operator == (const ExtMachInst &emi1, const ExtMachInst &emi2)
{
- if(emi1.mode != emi2.mode)
- return false;
if(emi1.legacy != emi2.legacy)
return false;
if(emi1.rex != emi2.rex)
@@ -215,6 +215,14 @@ namespace X86ISA
return false;
if(emi1.displacement != emi2.displacement)
return false;
+ if(emi1.mode != emi2.mode)
+ return false;
+ if(emi1.opSize != emi2.opSize)
+ return false;
+ if(emi1.addrSize != emi2.addrSize)
+ return false;
+ if(emi1.stackSize != emi2.stackSize)
+ return false;
return true;
}