diff options
Diffstat (limited to 'src/arch/x86')
-rw-r--r-- | src/arch/x86/types.hh | 17 | ||||
-rw-r--r-- | src/arch/x86/utility.hh | 13 |
2 files changed, 23 insertions, 7 deletions
diff --git a/src/arch/x86/types.hh b/src/arch/x86/types.hh index 63f65eee5..3f3c1ca0e 100644 --- a/src/arch/x86/types.hh +++ b/src/arch/x86/types.hh @@ -62,10 +62,19 @@ namespace X86ISA { - //XXX This won't work - typedef uint32_t MachInst; - //XXX This won't work either - typedef uint64_t ExtMachInst; + //This really determines how many bytes are passed to the predecoder. + typedef uint64_t MachInst; + //The intermediate structure the x86 predecoder returns. + struct ExtMachInst + { + //Empty for now... + }; + + bool operator == (const ExtMachInst &emi1, const ExtMachInst &emi2) + { + //Since this is empty, it's always equal + return true; + } typedef uint64_t IntReg; //XXX Should this be a 128 bit structure for XMM memory ops? diff --git a/src/arch/x86/utility.hh b/src/arch/x86/utility.hh index 1d9d8d3d5..0baa249c3 100644 --- a/src/arch/x86/utility.hh +++ b/src/arch/x86/utility.hh @@ -72,9 +72,16 @@ namespace X86ISA return false; } - inline ExtMachInst - makeExtMI(MachInst inst, ThreadContext * xc) { - return inst; + PredecodeResult { + MoreBytes = 1, + ExtMIReady = 2 + }; + + unsigned int + predecode(ExtMachInst &extMachInst, Addr currPC, MachInst machInst, + ThreadContext * xc) { + //Do something to fill up extMachInst... + return MoreBytes | ExtMIReady; } inline bool isCallerSaveIntegerRegister(unsigned int reg) { |