From 0dd1f7f01a8a744811aede5814111b8681271a6b Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Tue, 14 Sep 2010 00:29:38 -0700 Subject: CPU: Trim unnecessary includes from some common files. This reduces the scope of those includes and makes it less likely for there to be a dependency loop. This also moves the hashing functions associated with ExtMachInst objects to be with the ExtMachInst definitions and out of utility.hh. --- src/arch/x86/utility.hh | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'src/arch/x86/utility.hh') diff --git a/src/arch/x86/utility.hh b/src/arch/x86/utility.hh index db03da7a0..bfa102529 100644 --- a/src/arch/x86/utility.hh +++ b/src/arch/x86/utility.hh @@ -50,26 +50,6 @@ class ThreadContext; -namespace __hash_namespace { - template<> - struct hash { - size_t operator()(const X86ISA::ExtMachInst &emi) const { - return (((uint64_t)emi.legacy << 56) | - ((uint64_t)emi.rex << 48) | - ((uint64_t)emi.modRM << 40) | - ((uint64_t)emi.sib << 32) | - ((uint64_t)emi.opcode.num << 24) | - ((uint64_t)emi.opcode.prefixA << 16) | - ((uint64_t)emi.opcode.prefixB << 8) | - ((uint64_t)emi.opcode.op)) ^ - emi.immediate ^ emi.displacement ^ - emi.mode ^ - emi.opSize ^ emi.addrSize ^ - emi.stackSize ^ emi.dispSize; - }; - }; -} - namespace X86ISA { uint64_t getArgument(ThreadContext *tc, int number, bool fp); -- cgit v1.2.3