diff options
| author | David Turner <digit@android.com> | 2010-09-09 22:54:36 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2010-09-13 00:30:34 -0700 |
| commit | 6a9ef1773bf874dea493ff3861782a1e577b67dd (patch) | |
| tree | 18cb2addd19195710b8860077ed9bfbef8ad44a5 /target-arm | |
| parent | 0c0b2b4e96b030854987b16a779e30a3741d3b0d (diff) | |
| download | external_qemu-6a9ef1773bf874dea493ff3861782a1e577b67dd.zip external_qemu-6a9ef1773bf874dea493ff3861782a1e577b67dd.tar.gz external_qemu-6a9ef1773bf874dea493ff3861782a1e577b67dd.tar.bz2 | |
upstream: move timer management code to qemu-timer.c
Diffstat (limited to 'target-arm')
| -rw-r--r-- | target-arm/cpu.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/target-arm/cpu.h b/target-arm/cpu.h index afc0146..240be27 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -14,8 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA + * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef CPU_ARM_H #define CPU_ARM_H @@ -41,6 +40,7 @@ #define EXCP_BKPT 7 #define EXCP_EXCEPTION_EXIT 8 /* Return from v7M exception. */ #define EXCP_KERNEL_TRAP 9 /* Jumped to kernel code page. */ +#define EXCP_STREX 10 #define ARMV7M_EXCP_RESET 1 #define ARMV7M_EXCP_NMI 2 @@ -388,6 +388,7 @@ void cpu_arm_set_cp_io(CPUARMState *env, int cpnum, #define ARM_CPUID_ARM1136_R2 0x4107b362 #define ARM_CPUID_ARM11MPCORE 0x410fb022 #define ARM_CPUID_CORTEXA8 0x410fc080 +#define ARM_CPUID_CORTEXA9 0x410fc090 #define ARM_CPUID_CORTEXM3 0x410fc231 #define ARM_CPUID_ANY 0xffffffff |