Deleted Added
sdiff udiff text old ( 11321:02e930db812d ) new ( 12104:edd63f9c6184 )
full compact
1/*
2 * Copyright (c) 2007 The Hewlett-Packard Development Company
3 * All rights reserved.
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

--- 37 unchanged lines hidden (view full) ---

46
47namespace X86ISA
48{
49 /**
50 * Class for register indices passed to instruction constructors. Using a
51 * wrapper struct for these lets take advantage of the compiler's type
52 * checking.
53 */
54 struct InstRegIndex
55 {
56 RegIndex idx;
57 explicit InstRegIndex(RegIndex _idx) : idx(_idx)
58 {}
59 };
60
61 /**
62 * Base class for all X86 static instructions.
63 */
64
65 class X86StaticInst : public StaticInst
66 {

--- 9 unchanged lines hidden (view full) ---

76 const SymbolTable *symtab) const;
77
78 void printMnemonic(std::ostream &os, const char * mnemonic) const;
79 void printMnemonic(std::ostream &os, const char * instMnemonic,
80 const char * mnemonic) const;
81
82 void printSegment(std::ostream &os, int segment) const;
83
84 void printReg(std::ostream &os, int reg, int size) const;
85 void printSrcReg(std::ostream &os, int reg, int size) const;
86 void printDestReg(std::ostream &os, int reg, int size) const;
87 void printMem(std::ostream &os, uint8_t segment,
88 uint8_t scale, RegIndex index, RegIndex base,
89 uint64_t disp, uint8_t addressSize, bool rip) const;
90
91 inline uint64_t merge(uint64_t into, uint64_t val, int size) const
92 {
93 X86IntReg reg = into;
94 if (_destRegIdx[0] & IntFoldBit)
95 {
96 reg.H = val;
97 return reg;
98 }
99 switch(size)
100 {
101 case 1:
102 reg.L = val;

--- 14 unchanged lines hidden (view full) ---

117 }
118 return reg;
119 }
120
121 inline uint64_t pick(uint64_t from, int idx, int size) const
122 {
123 X86IntReg reg = from;
124 DPRINTF(X86, "Picking with size %d\n", size);
125 if (_srcRegIdx[idx] & IntFoldBit)
126 return reg.H;
127 switch(size)
128 {
129 case 1:
130 return reg.L;
131 case 2:
132 return reg.X;
133 case 4:

--- 4 unchanged lines hidden (view full) ---

138 panic("Tried to pick with unrecognized size %d.\n", size);
139 }
140 }
141
142 inline int64_t signedPick(uint64_t from, int idx, int size) const
143 {
144 X86IntReg reg = from;
145 DPRINTF(X86, "Picking with size %d\n", size);
146 if (_srcRegIdx[idx] & IntFoldBit)
147 return reg.SH;
148 switch(size)
149 {
150 case 1:
151 return reg.SL;
152 case 2:
153 return reg.SX;
154 case 4:

--- 17 unchanged lines hidden ---