Fix flags on imul and shifts

mehfooz09 · May 25, 2018 · ab81122 · ab81122
1 parent 2593132
commit ab81122
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/emu/gadgets-x86/bits.S b/emu/gadgets-x86/bits.S
@@ -7,7 +7,7 @@
                 pushq %rcx
                 movb (%_ip), %cl
             .endif
-            testb %cl, %cl
+            testb $(\size - 1), %cl
             jz 1f
             \type\()l %cl, %_tmp
             setf_oc

diff --git a/emu/gadgets-x86/math.S b/emu/gadgets-x86/math.S
@@ -36,7 +36,7 @@
         btw $0, CPU_cf(%_cpu)
     .endifin
     \op\ss \arg, %tmp\s
-    .ifin(\op, add,sub,adc,sbb)
+    .ifin(\op, add,sub,adc,sbb,imul)
         setf_oc
     .endifin
     .ifin(\op, add,sub,adc,sbb,and,or,xor)
@@ -147,6 +147,7 @@ do_op_size imul, 32
 .endm
 .macro do_imul1 size, s, ss
     imul\ss %tmp\s
+    setf_oc
 .endm
 .macro do_neg size, s, ss
     setf_a src=$0 dst=%tmp\s ss=\ss

diff --git a/tools/undefined-flags.c b/tools/undefined-flags.c
@@ -54,8 +54,6 @@ int undefined_flags_mask(int pid, struct cpu_state *cpu) {
                 shift_count = cpu->cl;
             else
                 pt_readn(pid, ip++, &shift_count, sizeof(shift_count));
-            if (shift_count % 32 == 0)
-                return O|P; // please delete this as soon as you can
             if (shift_count > 1)
                 return O;
             break;