WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-unstable] x86_emulate: Define and use BUG() and boo

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] x86_emulate: Define and use BUG() and bool_t.
From: Xen patchbot-unstable <patchbot@xxxxxxx>
Date: Thu, 17 Nov 2011 00:33:45 +0000
Delivery-date: Wed, 16 Nov 2011 16:34:25 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1321458529 0
# Node ID 0262e108c939b64ab26aff0877d3880da931e0bf
# Parent  6316cd1183f8752d72ea2f822bdd92b4a0137ff8
x86_emulate: Define and use BUG() and bool_t.

Original patch by Jan Beulich <jbeulich@xxxxxxxx>
Signed-off-by: Keir Fraser <keir@xxxxxxx>
---


diff -r 6316cd1183f8 -r 0262e108c939 tools/tests/x86_emulator/x86_emulate.c
--- a/tools/tests/x86_emulator/x86_emulate.c    Wed Nov 16 15:28:55 2011 +0000
+++ b/tools/tests/x86_emulator/x86_emulate.c    Wed Nov 16 15:48:49 2011 +0000
@@ -1,7 +1,13 @@
+#include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
+#include <stdlib.h>
 #include <string.h>
 #include <xen/xen.h>
 
+typedef bool bool_t;
+
+#define BUG() abort()
+
 #include "x86_emulate/x86_emulate.h"
 #include "x86_emulate/x86_emulate.c"
diff -r 6316cd1183f8 -r 0262e108c939 xen/arch/x86/x86_emulate/x86_emulate.c
--- a/xen/arch/x86/x86_emulate/x86_emulate.c    Wed Nov 16 15:28:55 2011 +0000
+++ b/xen/arch/x86/x86_emulate/x86_emulate.c    Wed Nov 16 15:48:49 2011 +0000
@@ -538,7 +538,7 @@
  * Given byte has even parity (even number of 1s)? SDM Vol. 1 Sec. 3.4.3.1,
  * "Status Flags": EFLAGS.PF reflects parity of least-sig. byte of result only.
  */
-static int even_parity(uint8_t v)
+static bool_t even_parity(uint8_t v)
 {
     asm ( "test %b0,%b0; setp %b0" : "=a" (v) : "0" (v) );
     return v;
@@ -728,9 +728,9 @@
  * IN:  Multiplicand=m[0], Multiplier=m[1]
  * OUT: Return CF/OF (overflow status); Result=m[1]:m[0]
  */
-static int mul_dbl(unsigned long m[2])
+static bool_t mul_dbl(unsigned long m[2])
 {
-    int rc;
+    bool_t rc;
     asm ( "mul %4; seto %b2"
           : "=a" (m[0]), "=d" (m[1]), "=q" (rc)
           : "0" (m[0]), "1" (m[1]), "2" (0) );
@@ -742,9 +742,9 @@
  * IN:  Multiplicand=m[0], Multiplier=m[1]
  * OUT: Return CF/OF (overflow status); Result=m[1]:m[0]
  */
-static int imul_dbl(unsigned long m[2])
+static bool_t imul_dbl(unsigned long m[2])
 {
-    int rc;
+    bool_t rc;
     asm ( "imul %4; seto %b2"
           : "=a" (m[0]), "=d" (m[1]), "=q" (rc)
           : "0" (m[0]), "1" (m[1]), "2" (0) );
@@ -757,7 +757,7 @@
  * OUT: Return 1: #DE
  *      Return 0: Quotient=u[0], Remainder=u[1]
  */
-static int div_dbl(unsigned long u[2], unsigned long v)
+static bool_t div_dbl(unsigned long u[2], unsigned long v)
 {
     if ( (v == 0) || (u[1] >= v) )
         return 1;
@@ -775,9 +775,9 @@
  * NB. We don't use idiv directly as it's moderately hard to work out
  *     ahead of time whether it will #DE, which we cannot allow to happen.
  */
-static int idiv_dbl(unsigned long u[2], unsigned long v)
+static bool_t idiv_dbl(unsigned long u[2], unsigned long v)
 {
-    int negu = (long)u[1] < 0, negv = (long)v < 0;
+    bool_t negu = (long)u[1] < 0, negv = (long)v < 0;
 
     /* u = abs(u) */
     if ( negu )
@@ -809,7 +809,7 @@
     return 0;
 }
 
-static int
+static bool_t
 test_cc(
     unsigned int condition, unsigned int flags)
 {
@@ -932,7 +932,7 @@
     return ops->inject_hw_exception(EXC_GP, 0, ctxt) ? : X86EMUL_EXCEPTION;
 }
 
-static int
+static bool_t
 in_realmode(
     struct x86_emulate_ctxt *ctxt,
     const struct x86_emulate_ops  *ops)
@@ -947,7 +947,7 @@
     return (!rc && !(cr0 & CR0_PE));
 }
 
-static int
+static bool_t
 in_protmode(
     struct x86_emulate_ctxt *ctxt,
     const struct x86_emulate_ops  *ops)
@@ -1178,7 +1178,7 @@
     case 14: p = &regs->r14; break;
     case 15: p = &regs->r15; break;
 #endif
-    default: p = NULL; break;
+    default: BUG(); p = NULL; break;
     }
 
     return p;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] x86_emulate: Define and use BUG() and bool_t., Xen patchbot-unstable <=