X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=host-utils.c;h=f92c3396c667669b2339d83a67bff3f372460468;hb=c16b5a2ca0b186de618654a576bdad9cdd2d1ab2;hp=d0d780e54ef2588229dde1f3c94751269770aba6;hpb=e494ead52114e9d7baa9f33bca0e5b15b577c16b;p=qemu

diff --git a/host-utils.c b/host-utils.c
index d0d780e..f92c339 100644
--- a/host-utils.c
+++ b/host-utils.c
@@ -23,9 +23,13 @@
  * THE SOFTWARE.
  */
 
-#include "vl.h"
+#include "exec.h"
+#include "host-utils.h"
+
+//#define DEBUG_MULDIV
 
 /* Long integer helpers */
+#if !defined(__x86_64__)
 static void add128 (uint64_t *plow, uint64_t *phigh, uint64_t a, uint64_t b)
 {
     *plow += a;
@@ -67,17 +71,10 @@ static void mul64 (uint64_t *plow, uint64_t *phigh, uint64_t a, uint64_t b)
     *phigh += v;
 }
 
-
 /* Unsigned 64x64 -> 128 multiplication */
 void mulu64 (uint64_t *plow, uint64_t *phigh, uint64_t a, uint64_t b)
 {
-#if defined(__x86_64__)
-    __asm__ ("mul %0\n\t"
-             : "=d" (*phigh), "=a" (*plow)
-             : "a" (a), "0" (b));
-#else
     mul64(plow, phigh, a, b);
-#endif
 #if defined(DEBUG_MULDIV)
     printf("mulu64: 0x%016llx * 0x%016llx = 0x%016llx%016llx\n",
            a, b, *phigh, *plow);
@@ -87,11 +84,6 @@ void mulu64 (uint64_t *plow, uint64_t *phigh, uint64_t a, uint64_t b)
 /* Signed 64x64 -> 128 multiplication */
 void muls64 (uint64_t *plow, uint64_t *phigh, int64_t a, int64_t b)
 {
-#if defined(__x86_64__)
-    __asm__ ("imul %0\n\t"
-             : "=d" (*phigh), "=a" (*plow)
-             : "a" (a), "0" (b));
-#else
     int sa, sb;
 
     sa = (a < 0);
@@ -104,9 +96,9 @@ void muls64 (uint64_t *plow, uint64_t *phigh, int64_t a, int64_t b)
     if (sa ^ sb) {
         neg128(plow, phigh);
     }
-#endif
 #if defined(DEBUG_MULDIV)
     printf("muls64: 0x%016llx * 0x%016llx = 0x%016llx%016llx\n",
            a, b, *phigh, *plow);
 #endif
 }
+#endif /* !defined(__x86_64__) */