x86emul/test: don't log double % characters

They're useless and at best confusing.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c
index 8d9679ffaba0ada0934520387b24ddc2c9839d4d..eed8a0d179781216b6f536e960410498b6073fcc 100644 (file)
--- a/tools/tests/x86_emulator/test_x86_emulator.c
+++ b/tools/tests/x86_emulator/test_x86_emulator.c
@@ -268,7 +268,7 @@ int main(int argc, char **argv)
     if ( !stack_exec )
         printf("Warning: Stack could not be made executable (%d).\n", errno);
 
-    printf("%-40s", "Testing addl %%ecx,(%%eax)...");
+    printf("%-40s", "Testing addl %ecx,(%eax)...");
     instr[0] = 0x01; instr[1] = 0x08;
     regs.eflags = 0x200;
     regs.eip    = (unsigned long)&instr[0];
@@ -283,7 +283,7 @@ int main(int argc, char **argv)
         goto fail;
     printf("okay\n");
 
-    printf("%-40s", "Testing addl %%ecx,%%eax...");
+    printf("%-40s", "Testing addl %ecx,%eax...");
     instr[0] = 0x01; instr[1] = 0xc8;
     regs.eflags = 0x200;
     regs.eip    = (unsigned long)&instr[0];
@@ -298,7 +298,7 @@ int main(int argc, char **argv)
         goto fail;
     printf("okay\n");
 
-    printf("%-40s", "Testing xorl (%%eax),%%ecx...");
+    printf("%-40s", "Testing xorl (%eax),%ecx...");
     instr[0] = 0x33; instr[1] = 0x08;
     regs.eflags = 0x200;
     regs.eip    = (unsigned long)&instr[0];
@@ -316,7 +316,7 @@ int main(int argc, char **argv)
         goto fail;
     printf("okay\n");
 
-    printf("%-40s", "Testing movl (%%eax),%%ecx...");
+    printf("%-40s", "Testing movl (%eax),%ecx...");
     instr[0] = 0x8b; instr[1] = 0x08;
     regs.eflags = 0x200;
     regs.eip    = (unsigned long)&instr[0];
@@ -330,7 +330,7 @@ int main(int argc, char **argv)
         goto fail;
     printf("okay\n");
 
-    printf("%-40s", "Testing lock cmpxchgb %%cl,(%%ebx)...");
+    printf("%-40s", "Testing lock cmpxchgb %cl,(%ebx)...");
     instr[0] = 0xf0; instr[1] = 0x0f; instr[2] = 0xb0; instr[3] = 0x0b;
     regs.eflags = 0x200;
     regs.eip    = (unsigned long)&instr[0];
@@ -346,7 +346,7 @@ int main(int argc, char **argv)
         goto fail;
     printf("okay\n");
 
-    printf("%-40s", "Testing lock cmpxchgb %%cl,(%%ebx)...");
+    printf("%-40s", "Testing lock cmpxchgb %cl,(%ebx)...");
     instr[0] = 0xf0; instr[1] = 0x0f; instr[2] = 0xb0; instr[3] = 0x0b;
     regs.eflags = 0x200;
     regs.eip    = (unsigned long)&instr[0];
@@ -363,7 +363,7 @@ int main(int argc, char **argv)
         goto fail;
     printf("okay\n");
 
-    printf("%-40s", "Testing xchgl %%ecx,(%%eax)...");
+    printf("%-40s", "Testing xchgl %ecx,(%eax)...");
     instr[0] = 0x87; instr[1] = 0x08;
     regs.eflags = 0x200;
     regs.eip    = (unsigned long)&instr[0];
@@ -378,7 +378,7 @@ int main(int argc, char **argv)
         goto fail;
     printf("okay\n");
 
-    printf("%-40s", "Testing lock cmpxchgl %%ecx,(%%ebx)...");
+    printf("%-40s", "Testing lock cmpxchgl %ecx,(%ebx)...");
     instr[0] = 0xf0; instr[1] = 0x0f; instr[2] = 0xb1; instr[3] = 0x0b;
     regs.eflags = 0x200;
     *res        = 0x923456AA;
@@ -496,7 +496,7 @@ int main(int argc, char **argv)
         goto fail;
     printf("okay\n");
 
-    printf("%-40s", "Testing movsxbd (%%eax),%%ecx...");
+    printf("%-40s", "Testing movsxbd (%eax),%ecx...");
     instr[0] = 0x0f; instr[1] = 0xbe; instr[2] = 0x08;
     regs.eflags = 0x200;
     regs.eip    = (unsigned long)&instr[0];
@@ -512,7 +512,7 @@ int main(int argc, char **argv)
         goto fail;
     printf("okay\n");
 
-    printf("%-40s", "Testing movzxwd (%%eax),%%ecx...");
+    printf("%-40s", "Testing movzxwd (%eax),%ecx...");
     instr[0] = 0x0f; instr[1] = 0xb7; instr[2] = 0x08;
     regs.eflags = 0x200;
     regs.eip    = (unsigned long)&instr[0];
@@ -529,7 +529,7 @@ int main(int argc, char **argv)
     printf("okay\n");
 
 #ifndef __x86_64__
-    printf("%-40s", "Testing arpl %cx,(%%eax)...");
+    printf("%-40s", "Testing arpl %cx,(%eax)...");
     instr[0] = 0x63; instr[1] = 0x08;
     regs.eflags = 0x200;
     regs.eip    = (unsigned long)&instr[0];
@@ -545,7 +545,7 @@ int main(int argc, char **argv)
          (regs.eip != (unsigned long)&instr[2]) )
         goto fail;
 #else
-    printf("%-40s", "Testing movsxd (%%rax),%%rcx...");
+    printf("%-40s", "Testing movsxd (%rax),%rcx...");
     instr[0] = 0x48; instr[1] = 0x63; instr[2] = 0x08;
     regs.eip    = (unsigned long)&instr[0];
     regs.ecx    = 0x123456789abcdef;
@@ -566,7 +566,7 @@ int main(int argc, char **argv)
 #endif
     printf("okay\n");
 
-    printf("%-40s", "Testing xadd %%ax,(%%ecx)...");
+    printf("%-40s", "Testing xadd %ax,(%ecx)...");
     instr[0] = 0x66; instr[1] = 0x0f; instr[2] = 0xc1; instr[3] = 0x01;
     regs.eflags = 0x200;
     regs.eip    = (unsigned long)&instr[0];
@@ -582,7 +582,7 @@ int main(int argc, char **argv)
         goto fail;
     printf("okay\n");
 
-    printf("%-40s", "Testing dec %%ax...");
+    printf("%-40s", "Testing dec %ax...");
 #ifndef __x86_64__
     instr[0] = 0x66; instr[1] = 0x48;
 #else
@@ -599,7 +599,7 @@ int main(int argc, char **argv)
         goto fail;
     printf("okay\n");
 
-    printf("%-40s", "Testing lea 8(%%ebp),%%eax...");
+    printf("%-40s", "Testing lea 8(%ebp),%eax...");
     instr[0] = 0x8d; instr[1] = 0x45; instr[2] = 0x08;
     regs.eflags = 0x200;
     regs.eip    = (unsigned long)&instr[0];
@@ -696,7 +696,7 @@ int main(int argc, char **argv)
     printf("okay\n");
 #endif
 
-    printf("%-40s", "Testing movbe (%%ecx),%%eax...");
+    printf("%-40s", "Testing movbe (%ecx),%eax...");
     instr[0] = 0x0f; instr[1] = 0x38; instr[2] = 0xf0; instr[3] = 0x01;
     regs.eflags = 0x200;
     regs.eip    = (unsigned long)&instr[0];
@@ -712,7 +712,7 @@ int main(int argc, char **argv)
         goto fail;
     printf("okay\n");
 
-    printf("%-40s", "Testing movbe %%ax,(%%ecx)...");
+    printf("%-40s", "Testing movbe %ax,(%ecx)...");
     instr[0] = 0x66; instr[1] = 0x0f; instr[2] = 0x38; instr[3] = 0xf1; instr[4] = 0x01;
     regs.eip = (unsigned long)&instr[0];
     rc = x86_emulate(&ctxt, &emulops);
@@ -781,7 +781,7 @@ int main(int argc, char **argv)
     else
         printf("skipped\n");
 
-    printf("%-40s", "Testing movq %%xmm0,32(%%ecx)...");
+    printf("%-40s", "Testing movq %xmm0,32(%ecx)...");
     if ( stack_exec && cpu_has_sse2 )
     {
         decl_insn(movq_to_mem2);
@@ -805,7 +805,7 @@ int main(int argc, char **argv)
     else
         printf("skipped\n");
 
-    printf("%-40s", "Testing vmovq %%xmm1,32(%%edx)...");
+    printf("%-40s", "Testing vmovq %xmm1,32(%edx)...");
     if ( stack_exec && cpu_has_avx )
     {
         decl_insn(vmovq_to_mem);
@@ -1041,7 +1041,7 @@ int main(int argc, char **argv)
     else
         printf("skipped\n");
 
-    printf("%-40s", "Testing movd %%mm3,32(%%ecx)...");
+    printf("%-40s", "Testing movd %mm3,32(%ecx)...");
     if ( stack_exec && cpu_has_mmx )
     {
         decl_insn(movd_to_mem);
@@ -1065,7 +1065,7 @@ int main(int argc, char **argv)
     else
         printf("skipped\n");
 
-    printf("%-40s", "Testing movd %%xmm2,32(%%edx)...");
+    printf("%-40s", "Testing movd %xmm2,32(%edx)...");
     if ( stack_exec && cpu_has_sse2 )
     {
         decl_insn(movd_to_mem2);
@@ -1089,7 +1089,7 @@ int main(int argc, char **argv)
     else
         printf("skipped\n");
 
-    printf("%-40s", "Testing vmovd %%xmm1,32(%%ecx)...");
+    printf("%-40s", "Testing vmovd %xmm1,32(%ecx)...");
     if ( stack_exec && cpu_has_avx )
     {
         decl_insn(vmovd_to_mem);
@@ -1113,7 +1113,7 @@ int main(int argc, char **argv)
     else
         printf("skipped\n");
 
-    printf("%-40s", "Testing movd %%mm3,%%ebx...");
+    printf("%-40s", "Testing movd %mm3,%ebx...");
     if ( stack_exec && cpu_has_mmx )
     {
         decl_insn(movd_to_reg);
@@ -1143,7 +1143,7 @@ int main(int argc, char **argv)
     else
         printf("skipped\n");
 
-    printf("%-40s", "Testing movd %%xmm2,%%ebx...");
+    printf("%-40s", "Testing movd %xmm2,%ebx...");
     if ( stack_exec && cpu_has_sse2 )
     {
         decl_insn(movd_to_reg2);
@@ -1168,7 +1168,7 @@ int main(int argc, char **argv)
     else
         printf("skipped\n");
 
-    printf("%-40s", "Testing vmovd %%xmm1,%%ebx...");
+    printf("%-40s", "Testing vmovd %xmm1,%ebx...");
     if ( stack_exec && cpu_has_avx )
     {
         decl_insn(vmovd_to_reg);
@@ -1194,7 +1194,7 @@ int main(int argc, char **argv)
         printf("skipped\n");
 
 #ifdef __x86_64__
-    printf("%-40s", "Testing movq %%mm3,32(%%ecx)...");
+    printf("%-40s", "Testing movq %mm3,32(%ecx)...");
     if ( stack_exec && cpu_has_mmx )
     {
         decl_insn(movq_to_mem3);
@@ -1218,7 +1218,7 @@ int main(int argc, char **argv)
     else
         printf("skipped\n");
 
-    printf("%-40s", "Testing movq %%xmm2,32(%%edx)...");
+    printf("%-40s", "Testing movq %xmm2,32(%edx)...");
     if ( stack_exec )
     {
         decl_insn(movq_to_mem4);
@@ -1242,7 +1242,7 @@ int main(int argc, char **argv)
     else
         printf("skipped\n");
 
-    printf("%-40s", "Testing vmovq %%xmm1,32(%%ecx)...");
+    printf("%-40s", "Testing vmovq %xmm1,32(%ecx)...");
     if ( stack_exec && cpu_has_avx )
     {
         decl_insn(vmovq_to_mem2);
@@ -1270,7 +1270,7 @@ int main(int argc, char **argv)
     else
         printf("skipped\n");
 
-    printf("%-40s", "Testing movq %%mm3,%%rbx...");
+    printf("%-40s", "Testing movq %mm3,%rbx...");
     if ( stack_exec && cpu_has_mmx )
     {
         decl_insn(movq_to_reg);
@@ -1290,7 +1290,7 @@ int main(int argc, char **argv)
     else
         printf("skipped\n");
 
-    printf("%-40s", "Testing movq %%xmm2,%%rbx...");
+    printf("%-40s", "Testing movq %xmm2,%rbx...");
     if ( stack_exec )
     {
         decl_insn(movq_to_reg2);
@@ -1310,7 +1310,7 @@ int main(int argc, char **argv)
     else
         printf("skipped\n");
 
-    printf("%-40s", "Testing vmovq %%xmm1,%%rbx...");
+    printf("%-40s", "Testing vmovq %xmm1,%rbx...");
     if ( stack_exec && cpu_has_avx )
     {
         decl_insn(vmovq_to_reg);