bitkeeper revision 1.1159.180.2 (419dc71eHwyXT3BVHFdxBKRp1BPxFw)

Add return codes to exception handlers to indicate if a fault was fixed
up and so instruction replay ought to work.

1 files changed, 3 insertions, 23 deletions

diff --git a/xen/include/asm-x86/debugger.h b/xen/include/asm-x86/debugger.h
index b19e099a9f..4b32491d15 100644
--- a/xen/include/asm-x86/debugger.h
+++ b/xen/include/asm-x86/debugger.h
@@ -22,33 +22,13 @@
 #ifndef __X86_DEBUGGER_H__
 #define __X86_DEBUGGER_H__
 
-/* Avoid magic vector numbers by using these semi-sensical names. */
-#define TRAP_divide_error     0
-#define TRAP_debug            1
-#define TRAP_nmi              2
-#define TRAP_int3             3
-#define TRAP_overflow         4
-#define TRAP_bounds           5
-#define TRAP_invalid_op       6
-#define TRAP_no_device        7
-#define TRAP_double_fault     8
-#define TRAP_copro_seg        9
-#define TRAP_invalid_tss     10
-#define TRAP_no_segment      11
-#define TRAP_stack_error     12
-#define TRAP_gp_fault        13
-#define TRAP_page_fault      14
-#define TRAP_spurious_int    15
-#define TRAP_copro_error     16
-#define TRAP_alignment_check 17
-#define TRAP_machine_check   18
-#define TRAP_simd_error      19
+#include <asm/processor.h>
 
 /* The main trap handlers use these helper macros which include early bail. */
 #define DEBUGGER_trap_entry(_v, _r, _e) \
-    if ( debugger_trap_entry(_v, _r, _e) ) return;
+    if ( debugger_trap_entry(_v, _r, _e) ) return EXCRET_fault_fixed;
 #define DEBUGGER_trap_fatal(_v, _r, _e) \
-    if ( debugger_trap_fatal(_v, _r, _e) ) return;
+    if ( debugger_trap_fatal(_v, _r, _e) ) return EXCRET_fault_fixed;
 
 #ifdef XEN_DEBUGGER