Deleted Added
sdiff udiff text old ( 7359:c1ed3d411971 ) new ( 7421:9962b65e6b1f )
full compact
1// Copyright (c) 2010 ARM Limited
2// All rights reserved
3//
4// The license below extends only to copyright in the software and shall
5// not be construed as granting a license to any other intellectual
6// property including but not limited to intellectual property relating
7// to a hardware implementation of the functionality of the software
8// licensed hereunder. You may use the software subject to the license

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

230 case 0x1:
231 {
232 const uint32_t imm =
233 (sext<26>(bits(machInst, 23, 0) << 2)) |
234 (bits(machInst, 24) << 1);
235 return new BlxImm(machInst, imm);
236 }
237 case 0x2:
238 if (CPNUM == 0xa || CPNUM == 0xb) {
239 return decodeExtensionRegLoadStore(machInst);
240 }
241 if (bits(op1, 0) == 1) {
242 if (rn == INTREG_PC) {
243 if (bits(op1, 4, 3) != 0x0) {
244 return new WarnUnimplemented(
245 "ldc, ldc2 (literal)", machInst);
246 }
247 } else {
248 if (op1 == 0xC3 || op1 == 0xC7) {
249 return new WarnUnimplemented(
250 "ldc, ldc2 (immediate)", machInst);
251 }
252 }
253 if (op1 == 0xC5) {
254 return new WarnUnimplemented("mrrc, mrrc2", machInst);
255 }
256 } else {
257 if (bits(op1, 4, 3) != 0 || bits(op1, 1) == 1) {
258 return new WarnUnimplemented("stc, stc2", machInst);
259 } else if (op1 == 0xC4) {
260 return new WarnUnimplemented("mcrr, mcrrc", machInst);
261 }
262 }
263 break;
264 case 0x3:
265 {
266 if (CPNUM == 0xa || CPNUM == 0xb) {
267 return decodeShortFpTransfer(machInst);
268 } else if (CPNUM == 0xf) {
269 return decodeMcrMrc15(machInst);
270 }
271 const bool op = bits(machInst, 4);
272 if (op) {
273 if (bits(op1, 0)) {

--- 46 unchanged lines hidden ---