From 860e4184dfc7ebfa9c2f53d87ac42eb88c871361 Mon Sep 17 00:00:00 2001 From: Peter Crosthwaite Date: Wed, 14 Feb 2018 08:08:43 -0500 Subject: [PATCH] include/exec: Move standard exceptions to cpu-all.h These exception indicies are generic and don't have any reliance on the per-arch cpu.h defs. Move them to cpu-all.h so they can be used by core code that does not have access to cpu-defs.h. Backports commit 9e0dc48c9f05505b53cb28f860456a0648e56ddf from qemu --- qemu/include/exec/cpu-all.h | 6 ++++++ qemu/include/exec/cpu-defs.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qemu/include/exec/cpu-all.h b/qemu/include/exec/cpu-all.h index 6d196ba8..e5c4f5a9 100644 --- a/qemu/include/exec/cpu-all.h +++ b/qemu/include/exec/cpu-all.h @@ -25,6 +25,12 @@ #include "qemu/thread.h" #include "qom/cpu.h" +#define EXCP_INTERRUPT 0x10000 /* async interruption */ +#define EXCP_HLT 0x10001 /* hlt instruction reached */ +#define EXCP_DEBUG 0x10002 /* cpu stopped after a breakpoint or singlestep */ +#define EXCP_HALTED 0x10003 /* cpu is halted (waiting for external event) */ +#define EXCP_YIELD 0x10004 /* cpu wants to yield timeslice to another */ + /* some important defines: * * WORDS_ALIGNED : if defined, the host cpu can only make word aligned diff --git a/qemu/include/exec/cpu-defs.h b/qemu/include/exec/cpu-defs.h index d33e94a4..211274b4 100644 --- a/qemu/include/exec/cpu-defs.h +++ b/qemu/include/exec/cpu-defs.h @@ -56,12 +56,6 @@ typedef uint64_t target_ulong; #error TARGET_LONG_SIZE undefined #endif -#define EXCP_INTERRUPT 0x10000 /* async interruption */ -#define EXCP_HLT 0x10001 /* hlt instruction reached */ -#define EXCP_DEBUG 0x10002 /* cpu stopped after a breakpoint or singlestep */ -#define EXCP_HALTED 0x10003 /* cpu is halted (waiting for external event) */ -#define EXCP_YIELD 0x10004 /* cpu wants to yield timeslice to another */ - /* Only the bottom TB_JMP_PAGE_BITS of the jump cache hash bits vary for addresses on the same page. The top bits are the same. This allows TLB invalidation to quickly clear a subset of the hash table. */