Enable same-arch consistency check on x86-64, print syscall name on error.

Also disable testing instructions unsupported by 64-bit binutils in
test-i386.c

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5277 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 0260756c23723a532ef94da5a2751dee888e0544..64d700d8f3f1342e9ac3c500e8d6c2c48b97f752 100644 (file)
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -3075,10 +3075,11 @@ void syscall_init(void)
                 target_to_host_errno_table[host_to_target_errno_table[i]] = i;
 
         /* automatic consistency check if same arch */
-#if defined(__i386__) && defined(TARGET_I386) && defined(TARGET_ABI32)
-        if (ie->target_cmd != ie->host_cmd) {
-            fprintf(stderr, "ERROR: ioctl: target=0x%x host=0x%x\n",
-                    ie->target_cmd, ie->host_cmd);
+#if (defined(__i386__) && defined(TARGET_I386) && defined(TARGET_ABI32)) || \
+    (defined(__x86_64__) && defined(TARGET_X86_64))
+        if (unlikely(ie->target_cmd != ie->host_cmd)) {
+            fprintf(stderr, "ERROR: ioctl(%s): target=0x%x host=0x%x\n",
+                    ie->name, ie->target_cmd, ie->host_cmd);
         }
 #endif
         ie++;

diff --git a/tests/test-i386.c b/tests/test-i386.c
index 9ebfa80cd72e9c1287cb91ef38a512690bef7123..43b17285f9721d0b09ef368031a53e6b238499aa 100644 (file)
--- a/tests/test-i386.c
+++ b/tests/test-i386.c
@@ -489,10 +489,12 @@ void test_loop(void)
     };
     int i, res;
 
+#if !defined(__x86_64__)
     TEST_LOOP("jcxz");
     TEST_LOOP("loopw");
     TEST_LOOP("loopzw");
     TEST_LOOP("loopnzw");
+#endif
 
     TEST_LOOP("jecxz");
     TEST_LOOP("loopl");