Fix regtest implementation-defined flags

GJDuck · GJDuck · commit 061f8dd6d48c · 2025-01-14T15:16:06.000+08:00
Fixes #96
diff --git a/test/regtest/after.exp b/test/regtest/after.exp
@@ -25,22 +25,12 @@
 000000000a0001cb:000000000c007fe0:0000000000000600: 4d 01 ca                add %r9, %r10
 000000000a0001cf:000000000c007fe0:ffffffffffff9600: 49 83 e8 08             sub $0x8, %r8
 000000000a0001d2:000000000c007fe0:0000000000000700: 4d 29 c2                sub %r8, %r10
-000000000a0001d5:000000000c007fe0:0000000000000301: 49 f7 ea                imul %r10
-000000000a0001d9:000000000c007fe0:ffffffffffff8701: 4d 0f af d3             imul %r11, %r10
-000000000a0001dd:000000000c007fe0:0000000000000200: 4d 6b d3 77             imul $0x77, %r11, %r10
 000000000a0001e3:000000000c007fe0:0000000000000200: 48 25 fe 00 00 00       and $0xfe, %rax
 000000000a0001e6:000000000c007fe0:0000000000000200: 48 21 c3                and %rax, %rbx
 000000000a0001ea:000000000c007fe0:0000000000000200: 48 83 cb 13             or $0x13, %rbx
 000000000a0001ed:000000000c007fe0:ffffffffffff8200: 48 09 cb                or %rcx, %rbx
 000000000a0001f0:000000000c007fe0:ffffffffffff8200: 48 f7 d1                not %rcx
 000000000a0001f3:000000000c007fe0:ffffffffffff9300: 48 f7 d9                neg %rcx
-000000000a0001f7:000000000c007fe0:0000000000000200: 48 c1 e7 07             shl $0x7, %rdi
-000000000a0001fb:000000000c007fe0:0000000000000200: 48 c1 ff 03             sar $0x3, %rdi
-000000000a0001fd:000000000c007fd8:0000000000000200: 41 55                   push %r13
-000000000a000204:000000000c007fd8:0000000000000200: 48 c7 c0 19 45 00 00    mov $0x4519, %rax
-000000000a000208:000000000c007fd8:0000000000000200: 66 0f ef c0             pxor %xmm0, %xmm0
-000000000a00020d:000000000c007fd8:0000000000000200: f3 48 0f 2a c0          cvtsi2ss %rax, %xmm0
-000000000a000211:000000000c007fd8:0000000000000200: f3 0f 51 c8             sqrtss %xmm0, %xmm1
 000000000a000214:000000000c007fd8:0000000000000300: 0f 2f c8                comiss %xmm0, %xmm1
 000000000a000216:000000000c007fd8:0000000000000300: 74 e5                   jz 0xa0001fb
 000000000a00021b:000000000c007fd8:0000000000000300: f3 48 0f 2c c1          cvttss2si %xmm1, %rax
diff --git a/test/regtest/after.in b/test/regtest/after.in
@@ -1,4 +1,4 @@
-./test -M true -P 'after entry(rip,rsp,flags,bytes,size,asm)@inst'
+./test -M 'not addr in {0xa0001d2,0xa0001d5,0xa0001d9,0xa0001f3,0xa0001f7,0xa0001fb,0xa0001fd,0xa000204,0xa000208,0xa00020d}' -P 'after entry(rip,rsp,flags,bytes,size,asm)@inst'
 
 # Compare against rip_rsp_rflags for reference
 
diff --git a/test/regtest/bad.csv b/test/regtest/bad.csv
@@ -0,0 +1,12 @@
+0xa0001d2
+0xa0001d5
+0xa0001d9
+0xa0001dd
+0xa0001f3
+0xa0001f7
+0xa0001fb
+0xa0001fd
+0xa000204
+0xa000208
+0xa00020d
+0xa000211
diff --git a/test/regtest/example_12.exp b/test/regtest/example_12.exp
@@ -6,17 +6,10 @@
 0000000000000200:0000000083838389:000000000a000192: 4d 01 ca                add %r9, %r10
 0000000000000600:0000000000000008:8877665544332211: 49 83 e8 08             sub $0x8, %r8
 ffffffffffff9600:8877665544332209:000000008d83851b: 4d 29 c2                sub %r8, %r10
-0000000000000700:778899ab49506312:0000000000000000: 49 f7 ea                imul %r10
-0000000000000301:00000000a5a5a5a5:778899ab49506312: 4d 0f af d3             imul %r11, %r10
-ffffffffffff8701:0000000000000077:00000000a5a5a5a5: 4d 6b d3 77             imul $0x77, %r11, %r10
-0000000000000200:00000000000000fe:2d9bfa6b1014f832: 48 25 fe 00 00 00       and $0xfe, %rax
 0000000000000200:0000000000000032:8877665544332211: 48 21 c3                and %rax, %rbx
 0000000000000200:0000000000000013:0000000000000010: 48 83 cb 13             or $0x13, %rbx
 0000000000000200:ffffffffffff8889:0000000000000013: 48 09 cb                or %rcx, %rbx
 ffffffffffff8200:0000000000007776:0000000000000000: 48 f7 d9                neg %rcx
-ffffffffffff9300:0000000000000007:0000000061616161: 48 c1 e7 07             shl $0x7, %rdi
-0000000000000200:0000000000000003:00000030b0b0b080: 48 c1 ff 03             sar $0x3, %rdi
-0000000000000200:0000000000000000:0000000000000000: 0f 2f c8                comiss %xmm0, %xmm1
 0000000000000300:0000000000000085:0000000000000085: 48 3d 85 00 00 00       cmp $0x85, %rax
 0000000000004600:0000000000000000:0000000000000000: 48 85 c0                test %rax, %rax
 0000000000004600:0000000050505050:0000000050505050: 31 f6                   xor %esi, %esi
diff --git a/test/regtest/example_12.in b/test/regtest/example_12.in
@@ -1 +1 @@
-./test -M 'rflags in writes' -P 'entry(flags,op[0],op[1],bytes,size,asm)@inst'
+./test -M 'rflags in writes && !defined(bad[0])' -P 'entry(flags,op[0],op[1],bytes,size,asm)@inst'
diff --git a/test/regtest/rip_rsp_rflags.exp b/test/regtest/rip_rsp_rflags.exp
@@ -39,23 +39,11 @@
 000000000a0001c8:000000000c007fe0:0000000000000200: 4d 01 ca                add %r9, %r10
 000000000a0001cb:000000000c007fe0:0000000000000600: 49 83 e8 08             sub $0x8, %r8
 000000000a0001cf:000000000c007fe0:ffffffffffff9600: 4d 29 c2                sub %r8, %r10
-000000000a0001d2:000000000c007fe0:0000000000000700: 49 f7 ea                imul %r10
-000000000a0001d5:000000000c007fe0:0000000000000301: 4d 0f af d3             imul %r11, %r10
-000000000a0001d9:000000000c007fe0:ffffffffffff8701: 4d 6b d3 77             imul $0x77, %r11, %r10
-000000000a0001dd:000000000c007fe0:0000000000000200: 48 25 fe 00 00 00       and $0xfe, %rax
 000000000a0001e3:000000000c007fe0:0000000000000200: 48 21 c3                and %rax, %rbx
 000000000a0001e6:000000000c007fe0:0000000000000200: 48 83 cb 13             or $0x13, %rbx
 000000000a0001ea:000000000c007fe0:0000000000000200: 48 09 cb                or %rcx, %rbx
 000000000a0001ed:000000000c007fe0:ffffffffffff8200: 48 f7 d1                not %rcx
 000000000a0001f0:000000000c007fe0:ffffffffffff8200: 48 f7 d9                neg %rcx
-000000000a0001f3:000000000c007fe0:ffffffffffff9300: 48 c1 e7 07             shl $0x7, %rdi
-000000000a0001f7:000000000c007fe0:0000000000000200: 48 c1 ff 03             sar $0x3, %rdi
-000000000a0001fb:000000000c007fe0:0000000000000200: 41 55                   push %r13
-000000000a0001fd:000000000c007fd8:0000000000000200: 48 c7 c0 19 45 00 00    mov $0x4519, %rax
-000000000a000204:000000000c007fd8:0000000000000200: 66 0f ef c0             pxor %xmm0, %xmm0
-000000000a000208:000000000c007fd8:0000000000000200: f3 48 0f 2a c0          cvtsi2ss %rax, %xmm0
-000000000a00020d:000000000c007fd8:0000000000000200: f3 0f 51 c8             sqrtss %xmm0, %xmm1
-000000000a000211:000000000c007fd8:0000000000000200: 0f 2f c8                comiss %xmm0, %xmm1
 000000000a000214:000000000c007fd8:0000000000000300: 74 e5                   jz 0xa0001fb
 000000000a000216:000000000c007fd8:0000000000000300: f3 48 0f 2c c1          cvttss2si %xmm1, %rax
 000000000a00021b:000000000c007fd8:0000000000000300: 48 3d 85 00 00 00       cmp $0x85, %rax
diff --git a/test/regtest/rip_rsp_rflags.in b/test/regtest/rip_rsp_rflags.in
@@ -1 +1 @@
-./test -M true -P 'entry(rip,rsp,flags,bytes,size,asm)@inst'
+./test -M '!defined(bad[0])' -P 'entry(rip,rsp,flags,bytes,size,asm)@inst'
diff --git a/test/regtest/xmm.exp b/test/regtest/xmm.exp
@@ -1,6 +1,6 @@
-000000000a000204:0000000000004519:0000000000000200: 66 0f ef c0             pxor %xmm0, %xmm0
-000000000a000208:0000000000004519:0000000000000200: f3 48 0f 2a c0          cvtsi2ss %rax, %xmm0
-000000000a00020d:0000000000004519:0000000000000200: f3 0f 51 c8             sqrtss %xmm0, %xmm1
-000000000a000211:0000000000004519:0000000000000200: 0f 2f c8                comiss %xmm0, %xmm1
-000000000a000216:0000000000004519:0000000000000300: f3 48 0f 2c c1          cvttss2si %xmm1, %rax
+000000000a000204:0000000000004519:00000000e9e9e9e9: 66 0f ef c0             pxor %xmm0, %xmm0
+000000000a000208:0000000000004519:00000000e9e9e9e9: f3 48 0f 2a c0          cvtsi2ss %rax, %xmm0
+000000000a00020d:0000000000004519:00000000e9e9e9e9: f3 0f 51 c8             sqrtss %xmm0, %xmm1
+000000000a000211:0000000000004519:00000000e9e9e9e9: 0f 2f c8                comiss %xmm0, %xmm1
+000000000a000216:0000000000004519:00000000e9e9e9e9: f3 48 0f 2c c1          cvttss2si %xmm1, %rax
 PASSED
diff --git a/test/regtest/xmm.in b/test/regtest/xmm.in
@@ -1 +1 @@
-./test -M 'reg[0] in {xmm0, xmm1} || reg[1] in {xmm0, xmm1}' -P 'entry(addr,rax,flags,bytes,size,asm)@inst'
+./test -M '(reg[0] in {xmm0, xmm1} || reg[1] in {xmm0, xmm1})' -P 'entry(addr,rax,0xe9e9e9e9,bytes,size,asm)@inst'

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-./test -M true -P 'after entry(rip,rsp,flags,bytes,size,asm)@inst'`
	`1`	`+./test -M 'not addr in {0xa0001d2,0xa0001d5,0xa0001d9,0xa0001f3,0xa0001f7,0xa0001fb,0xa0001fd,0xa000204,0xa000208,0xa00020d}' -P 'after entry(rip,rsp,flags,bytes,size,asm)@inst'`
`2`	`2`
`3`	`3`	`# Compare against rip_rsp_rflags for reference`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-./test -M 'rflags in writes' -P 'entry(flags,op[0],op[1],bytes,size,asm)@inst'`
	`1`	`+./test -M 'rflags in writes && !defined(bad[0])' -P 'entry(flags,op[0],op[1],bytes,size,asm)@inst'`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-./test -M true -P 'entry(rip,rsp,flags,bytes,size,asm)@inst'`
	`1`	`+./test -M '!defined(bad[0])' -P 'entry(rip,rsp,flags,bytes,size,asm)@inst'`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-./test -M 'reg[0] in {xmm0, xmm1} \|\| reg[1] in {xmm0, xmm1}' -P 'entry(addr,rax,flags,bytes,size,asm)@inst'`
	`1`	`+./test -M '(reg[0] in {xmm0, xmm1} \|\| reg[1] in {xmm0, xmm1})' -P 'entry(addr,rax,0xe9e9e9e9,bytes,size,asm)@inst'`