diff options
| author | Tim Deegan <Tim.Deegan@citrix.com> | 2011-03-07 11:21:11 +0000 |
|---|---|---|
| committer | Tim Deegan <Tim.Deegan@citrix.com> | 2011-03-07 11:21:11 +0000 |
| commit | b021dd99f4b53657537e8aec22fc1b7338e6127d (patch) | |
| tree | 6aff492d32a33e41860b28264d89d40c895acdcf /xen/include/asm-x86/bug.h | |
| parent | 024456981b27d793f8c17ce8e0818bfee47cc504 (diff) | |
| download | xen-b021dd99f4b53657537e8aec22fc1b7338e6127d.tar.gz xen-b021dd99f4b53657537e8aec22fc1b7338e6127d.tar.bz2 xen-b021dd99f4b53657537e8aec22fc1b7338e6127d.zip | |
Xen: remove run_in_exception_handler() and recode its only caller
(dump_execution_state()) as its own bug-trap.
This is needed to compile xen with clang, which can't handle using a
function name in an asm immediate.
Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com>
Acked-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/include/asm-x86/bug.h')
| -rw-r--r-- | xen/include/asm-x86/bug.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/xen/include/asm-x86/bug.h b/xen/include/asm-x86/bug.h index 05083e0168..19fc06a0c8 100644 --- a/xen/include/asm-x86/bug.h +++ b/xen/include/asm-x86/bug.h @@ -13,16 +13,15 @@ struct bug_frame { unsigned short id; /* BUGFRAME_??? */ } __attribute__((packed)); -#define BUGFRAME_run_fn 0 +#define BUGFRAME_state 0 #define BUGFRAME_warn 1 #define BUGFRAME_bug 2 #define BUGFRAME_assert 3 -#define run_in_exception_handler(fn) \ +#define dump_execution_state() \ asm volatile ( \ - "ud2 ; ret %0" BUG_STR(1) \ - : : "i" (BUGFRAME_run_fn), \ - "i" (fn) ) + "ud2 ; ret %0" \ + : : "i" (BUGFRAME_state) ) #define WARN() \ asm volatile ( \ |