Deleted Added
sdiff udiff text old ( 6748:dc2adb7ffff5 ) new ( 7093:9832d4b070fc )
full compact
1/*
2 * Copyright (c) 2010 ARM Limited
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
9 * licensed hereunder. You may use the software subject to the license
10 * terms below provided that you ensure that this notice is replicated
11 * unmodified and in its entirety in all distributions of the software,
12 * modified or unmodified, in source code or in binary form.
13 *
14 * Copyright (c) 2007-2008 The Florida State University
15 * All rights reserved.
16 *
17 * Redistribution and use in source and binary forms, with or without
18 * modification, are permitted provided that the following conditions are
19 * met: redistributions of source code must retain the above copyright
20 * notice, this list of conditions and the following disclaimer;
21 * redistributions in binary form must reproduce the above copyright
22 * notice, this list of conditions and the following disclaimer in the

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

132 bitMask = bitMask | mask(19, 16);
133 if (bits(byteMask, 1))
134 bitMask = bitMask | mask(15, 8);
135 if (bits(byteMask, 0))
136 bitMask = bitMask | mask(7, 0);
137
138 return ((spsr & ~bitMask) | (val & bitMask));
139 }
140
141 template<class XC>
142 static void
143 setNextPC(XC *xc, Addr val)
144 {
145 xc->setNextPC((xc->readNextPC() & PcModeMask) |
146 (val & ~PcModeMask));
147 }
148};
149}
150
151#endif //__ARCH_ARM_INSTS_STATICINST_HH__