Make parseable by test_main

git-svn-id: svn://svn.valgrind.org/vex/trunk@791

diff --git a/VEX/orig_amd64/test2.orig b/VEX/orig_amd64/test2.orig
index 0cede7e628705ca92245195c7edd9176085c6079..841a91a873475d8ba92dd2582f03875cbd9c1c78 100644 (file)
--- a/VEX/orig_amd64/test2.orig
+++ b/VEX/orig_amd64/test2.orig
@@ -1188,72 +1188,72 @@ andq %rax, %rsi
 . 48 21 C6 C3
 
 call *128(%rsp)
-. 298 0x12345678 8
-. FF 94 24 80 00 00 00 C3
+. 298 0x12345678 7
+. FF 94 24 80 00 00 00
 
 call *136(%rsp)
-. 299 0x12345678 8
-. FF 94 24 88 00 00 00 C3
+. 299 0x12345678 7
+. FF 94 24 88 00 00 00
 
 call *144(%rsp)
-. 300 0x12345678 8
-. FF 94 24 90 00 00 00 C3
+. 300 0x12345678 7
+. FF 94 24 90 00 00 00
 
 call *16(%rsp)
-. 301 0x12345678 5
-. FF 54 24 10 C3
+. 301 0x12345678 4
+. FF 54 24 10
 
 call *24(%rsp)
-. 302 0x12345678 5
-. FF 54 24 18 C3
+. 302 0x12345678 4
+. FF 54 24 18
 
 call *264(%rsp)
-. 303 0x12345678 8
-. FF 94 24 08 01 00 00 C3
+. 303 0x12345678 7
+. FF 94 24 08 01 00 00
 
 call *272(%rsp)
-. 304 0x12345678 8
-. FF 94 24 10 01 00 00 C3
+. 304 0x12345678 7
+. FF 94 24 10 01 00 00
 
 call *296(%rsp)
-. 305 0x12345678 8
-. FF 94 24 28 01 00 00 C3
+. 305 0x12345678 7
+. FF 94 24 28 01 00 00
 
 call *784(%rsp)
-. 306 0x12345678 8
-. FF 94 24 10 03 00 00 C3
+. 306 0x12345678 7
+. FF 94 24 10 03 00 00
 
 call *792(%rsp)
-. 307 0x12345678 8
-. FF 94 24 18 03 00 00 C3
+. 307 0x12345678 7
+. FF 94 24 18 03 00 00
 
 call *808(%rsp)
-. 308 0x12345678 8
-. FF 94 24 28 03 00 00 C3
+. 308 0x12345678 7
+. FF 94 24 28 03 00 00
 
 call *%r10
-. 309 0x12345678 4
-. 41 FF D2 C3
+. 309 0x12345678 3
+. 41 FF D2
 
 call *%r13
-. 310 0x12345678 4
-. 41 FF D5 C3
+. 310 0x12345678 3
+. 41 FF D5
 
 call *%r14
-. 311 0x12345678 4
-. 41 FF D6 C3
+. 311 0x12345678 3
+. 41 FF D6
 
 call *%r15
-. 312 0x12345678 4
-. 41 FF D7 C3
+. 312 0x12345678 3
+. 41 FF D7
 
 call *313131(%rip)
-. 313 0x12345678 7
-. FF 15 2B C7 04 00 C3
+. 313 0x12345678 6
+. FF 15 2B C7 04 00
 
 call *9909(%rip)
-. 314 0x12345678 7
-. FF 15 B5 26 00 00 C3
+. 314 0x12345678 6
+. FF 15 B5 26 00 00
 
 cltd
 . 315 0x12345678 2
@@ -6236,12 +6236,12 @@ incq 33(%rip)
 . 48 FF 05 21 00 00 00 C3
 
 jmp *3998(,%rax,8)
-. 1560 0x12345678 8
-. FF 24 C5 9E 0F 00 00 C3
+. 1560 0x12345678 7
+. FF 24 C5 9E 0F 00 00
 
 jmp *%rdx
-. 1561 0x12345678 3
-. FF E2 C3
+. 1561 0x12345678 2
+. FF E2
 
 leal 0(,%r14,8), %r12d
 . 1562 0x12345678 9
@@ -20123,10 +20123,6 @@ movsbq (%rdi,%rax),%rax
 . 5031 0x12345678 6
 . 48 0F BE 04 07 C3
 
-movsd %xmm0, 8(%rsp)
-. 5032 0x12345678 7
-. F2 0F 11 44 24 08 C3
-
 movslq 104(%rsp),%rdi
 . 5033 0x12345678 6
 . 48 63 7C 24 68 C3
@@ -22184,12 +22180,12 @@ pushq %rbx
 . 53 C3
 
 rep ; ret
-. 5547 0x12345678 3
-. F3 C3 C3
+. 5547 0x12345678 2
+. F3 C3
 
 ret
-. 5548 0x12345678 2
-. C3 C3
+. 5548 0x12345678 1
+. C3
 
 rorl %cl, %r12d
 . 5549 0x12345678 4
@@ -23918,3 +23914,4 @@ nop
 nop
 . 5980 0x12345678 2
 . 90 C3
+