Deleted Added
sdiff udiff text old ( 8909:7fa0a081f12f ) new ( 10037:5cac77888310 )
full compact
1// -*- mode:c++ -*-
2
3// Copyright (c) 2010 ARM Limited
4// All rights reserved
5//
6// The license below extends only to copyright in the software and shall
7// not be construed as granting a license to any other intellectual
8// property including but not limited to intellectual property relating
9// to a hardware implementation of the functionality of the software
10// licensed hereunder. You may use the software subject to the license
11// terms below provided that you ensure that this notice is replicated

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

96}};
97
98def format Thumb16CondBranchAndSvc() {{
99 decode_block = '''
100 if (bits(machInst, 11, 9) != 0x7) {
101 return new B(machInst, sext<9>(bits(machInst, 7, 0) << 1),
102 (ConditionCode)(uint32_t)bits(machInst, 11, 8));
103 } else if (bits(machInst, 8)) {
104 return new Svc(machInst);
105 } else {
106 // This space will not be allocated in the future.
107 return new Unknown(machInst);
108 }
109 '''
110}};
111
112def format Thumb16UncondBranch() {{

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

122 const uint32_t op1 = bits(machInst, 14, 12);
123 switch (op1 & 0x5) {
124 case 0x0:
125 if (op == 127) {
126 if (op1 & 0x2) {
127 // Permanently undefined.
128 return new Unknown(machInst);
129 } else {
130 return new WarnUnimplemented("smc", machInst);
131 }
132 } else if ((op & 0x38) != 0x38) {
133 const uint32_t s = bits(machInst, 26);
134 const uint32_t j1 = bits(machInst, 13);
135 const uint32_t j2 = bits(machInst, 11);
136 const uint32_t imm6 = bits(machInst, 21, 16);
137 const uint32_t imm11 = bits(machInst, 10, 0);
138 const int32_t imm = sext<21>((s << 20) |
139 (j2 << 19) | (j1 << 18) |
140 (imm6 << 12) | (imm11 << 1));
141 return new B(machInst, imm,
142 (ConditionCode)(uint32_t)bits(machInst, 25, 22));
143 } else {
144 switch (op) {
145 case 0x38:
146 {
147 const IntRegIndex rn =
148 (IntRegIndex)(uint32_t)bits(machInst, 19, 16);
149 const uint8_t byteMask = bits(machInst, 11, 8);
150 return new MsrCpsrReg(machInst, rn, byteMask);
151 }
152 case 0x39:
153 {
154 const IntRegIndex rn =
155 (IntRegIndex)(uint32_t)bits(machInst, 19, 16);
156 const uint8_t byteMask = bits(machInst, 11, 8);
157 return new MsrSpsrReg(machInst, rn, byteMask);
158 }
159 case 0x3a:
160 {
161 const uint32_t op1 = bits(machInst, 10, 8);
162 const uint32_t op2 = bits(machInst, 7, 0);
163 if (op1 != 0) {
164 const bool enable = bits(machInst, 10, 9) == 0x2;
165 const uint32_t mods = bits(machInst, 8, 0) |

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

191 switch (op) {
192 case 0x0:
193 return new Leavex(machInst);
194 case 0x1:
195 return new Enterx(machInst);
196 case 0x2:
197 return new Clrex(machInst);
198 case 0x4:
199 return new Dsb(machInst);
200 case 0x5:
201 return new Dmb(machInst);
202 case 0x6:
203 return new Isb(machInst);
204 default:
205 break;
206 }
207 break;
208 }
209 case 0x3c:
210 {
211 // On systems that don't support bxj, bxj == bx
212 return new BxReg(machInst,
213 (IntRegIndex)(uint32_t)bits(machInst, 19, 16),
214 COND_UC);
215 }
216 case 0x3d:
217 {
218 const uint32_t imm32 = bits(machInst, 7, 0);
219 return new SubsImmPclr(machInst, INTREG_PC, INTREG_LR,
220 imm32, false);
221 }
222 case 0x3e:
223 {
224 const IntRegIndex rd =
225 (IntRegIndex)(uint32_t)bits(machInst, 11, 8);
226 return new MrsCpsr(machInst, rd);
227 }
228 case 0x3f:
229 {
230 const IntRegIndex rd =
231 (IntRegIndex)(uint32_t)bits(machInst, 11, 8);
232 return new MrsSpsr(machInst, rd);
233 }
234 }
235 break;
236 }
237 case 0x1:
238 {
239 const uint32_t s = bits(machInst, 26);
240 const uint32_t i1 = !(bits(machInst, 13) ^ s);

--- 42 unchanged lines hidden ---