#71: Tested removing itracer

sdasgup3 · May 17, 2018 · 52be83a · 52be83a
1 parent 69bdcbb
commit 52be83a
Show file tree

Hide file tree

Showing 36 changed files with 518 additions and 10,492 deletions.
diff --git a/x86-semantics/scripts/run.pl b/x86-semantics/scripts/run.pl
@@ -4,6 +4,7 @@
 use Getopt::Long;
 use File::Compare;
 use File::Basename;
+use File::Temp qw/ tempfile tempdir /;
 
 use lib qw( /home/sdasgup3/x86-semantics/scripts/ );
 use kutils;
@@ -76,7 +77,7 @@ sub createEnv {
 
     my ( $fh_unused, $tmpfile ) = tempfile( "tmpfileXXXXX", DIR => "/tmp/" );
     execute(
-"cat $output | sed  '/^\\s*\$/d' | sed 's/(\\s*\"/(\\n\"/g'  1> $tmpfile  2>&1 &&  mv $tempfile $output",
+"cat $output | sed  '/^\\s*\$/d' | sed 's/(\\s*\"/(\\n\"/g'  1> $tmpfile  2>&1 &&  mv $tmpfile $output",
         1
     );
 

diff --git a/x86-semantics/tests/Features/loader/Output/test.kstate b/x86-semantics/tests/Features/loader/Output/test.kstate
@@ -339,14 +339,6 @@
     "YMM15" |-> 256'0
     "ZF" |-> 1'0
   </regstate>
-  <itracer>
-    ListItem ( storedInstr ( pushq %rbp , .Operands ) )
-    ListItem ( storedInstr ( movq %rsp , %rbp , .Operands ) )
-    ListItem ( storedInstr ( nop .Operands ) )
-    ListItem ( storedInstr ( pushq %rbp , .Operands ) )
-    ListItem ( storedInstr ( movq %rsp , %rbp , .Operands ) )
-    ListItem ( storedInstr ( popq %rbp , .Operands ) )
-  </itracer>
   <regstatequeue>
     ListItem (
 "AF" |-> 1'0

diff --git a/x86-semantics/tests/Features/memory1/Output/test.kstate b/x86-semantics/tests/Features/memory1/Output/test.kstate
@@ -338,14 +338,6 @@
     "YMM15" |-> 256'0
     "ZF" |-> 1'0
   </regstate>
-  <itracer>
-    ListItem ( storedInstr ( movq $ 61438 , %rax , .Operands ) )
-    ListItem ( storedInstr ( movq %rax , -8 ( %rsp ) , .Operands ) )
-    ListItem ( storedInstr ( addq $0xabcd , %rax , .Operands ) )
-    ListItem ( storedInstr ( movq %rax , -16 ( %rsp ) , .Operands ) )
-    ListItem ( storedInstr ( movq -12 ( %rsp ) , %rbx , .Operands ) )
-    ListItem ( storedInstr ( nop .Operands ) )
-  </itracer>
   <regstatequeue>
     ListItem (
 "AF" |-> 1'0

diff --git a/x86-semantics/tests/Features/memory2/Output/test.kstate b/x86-semantics/tests/Features/memory2/Output/test.kstate
@@ -344,20 +344,6 @@
     "YMM15" |-> 256'0
     "ZF" |-> 1'0
   </regstate>
-  <itracer>
-    ListItem ( storedInstr ( pushq %rbp , .Operands ) )
-    ListItem ( storedInstr ( movq %rsp , %rbp , .Operands ) )
-    ListItem ( storedInstr ( movl %edi , -4 ( %rbp ) , .Operands ) )
-    ListItem ( storedInstr ( movq %rsi , -16 ( %rbp ) , .Operands ) )
-    ListItem ( storedInstr ( movq -16 ( %rbp ) , %rax , .Operands ) )
-    ListItem ( storedInstr ( movq 0 ( %rax ) , %rax , .Operands ) )
-    ListItem ( storedInstr ( incq %rax , .Operands ) )
-    ListItem ( storedInstr ( movb 0 ( %rax ) , %al , .Operands ) )
-    ListItem ( storedInstr ( movsbl %al , %eax , .Operands ) )
-    ListItem ( storedInstr ( addl $ 42 , %eax , .Operands ) )
-    ListItem ( storedInstr ( popq %rbp , .Operands ) )
-    ListItem ( storedInstr ( nop .Operands ) )
-  </itracer>
   <regstatequeue>
     ListItem (
 "AF" |-> 1'0

diff --git a/x86-semantics/tests/Features/memory3/Output/test.kstate b/x86-semantics/tests/Features/memory3/Output/test.kstate
@@ -344,20 +344,6 @@
     "YMM15" |-> 256'0
     "ZF" |-> 1'0
   </regstate>
-  <itracer>
-    ListItem ( storedInstr ( pushq %rbp , .Operands ) )
-    ListItem ( storedInstr ( movq %rsp , %rbp , .Operands ) )
-    ListItem ( storedInstr ( movl $ 0 , -4 ( %rbp ) , .Operands ) )
-    ListItem ( storedInstr ( movl %edi , -8 ( %rbp ) , .Operands ) )
-    ListItem ( storedInstr ( movq %rsi , -16 ( %rbp ) , .Operands ) )
-    ListItem ( storedInstr ( movq -16 ( %rbp ) , %rsi , .Operands ) )
-    ListItem ( storedInstr ( movq 8 ( %rsi ) , %rsi , .Operands ) )
-    ListItem ( storedInstr ( movsbl 0 ( %rsi ) , %edi , .Operands ) )
-    ListItem ( storedInstr ( addl $ 42 , %edi , .Operands ) )
-    ListItem ( storedInstr ( movl %edi , %eax , .Operands ) )
-    ListItem ( storedInstr ( popq %rbp , .Operands ) )
-    ListItem ( storedInstr ( nop .Operands ) )
-  </itracer>
   <regstatequeue>
     ListItem (
 "AF" |-> 1'0

diff --git a/x86-semantics/tests/Features/memory4/Output/test.kstate b/x86-semantics/tests/Features/memory4/Output/test.kstate
@@ -346,22 +346,6 @@
     "YMM15" |-> 256'0
     "ZF" |-> 1'0
   </regstate>
-  <itracer>
-    ListItem ( storedInstr ( movq $ 61438 , %rax , .Operands ) )
-    ListItem ( storedInstr ( movq %rax , ( %rsp ) , .Operands ) )
-    ListItem ( storedInstr ( movq $0xabcd , %rax , .Operands ) )
-    ListItem ( storedInstr ( movq %rax , -8 ( %rsp ) , .Operands ) )
-    ListItem ( storedInstr ( movq $0xdcba , %rax , .Operands ) )
-    ListItem ( storedInstr ( movq %rax , -16 ( , %rsp ) , .Operands ) )
-    ListItem ( storedInstr ( movq $0xacbd , %rax , .Operands ) )
-    ListItem ( storedInstr ( movq %rax , -32 ( , %rsp , 1 ) , .Operands ) )
-    ListItem ( storedInstr ( movq ( , %rsp ) , %rbx , .Operands ) )
-    ListItem ( storedInstr ( movq -8 ( , %rsp ) , %rcx , .Operands ) )
-    ListItem ( storedInstr ( movq $ 0 , %r10 , .Operands ) )
-    ListItem ( storedInstr ( movq -16 ( %rsp , %r10 , 1 ) , %rdx , .Operands ) )
-    ListItem ( storedInstr ( movq -32 ( %r10 , %rsp , 1 ) , %r11 , .Operands ) )
-    ListItem ( storedInstr ( nop .Operands ) )
-  </itracer>
   <regstatequeue>
     ListItem (
 "AF" |-> 1'0

diff --git a/x86-semantics/tests/Features/pushpop/Output/test.kstate b/x86-semantics/tests/Features/pushpop/Output/test.kstate
@@ -347,23 +347,6 @@
     "YMM15" |-> 256'0
     "ZF" |-> 1'0
   </regstate>
-  <itracer>
-    ListItem ( storedInstr ( pushq %rsp , .Operands ) )
-    ListItem ( storedInstr ( popq %rsp , .Operands ) )
-    ListItem ( storedInstr ( pushw %sp , .Operands ) )
-    ListItem ( storedInstr ( popw %sp , .Operands ) )
-    ListItem ( storedInstr ( pushq %rsp , .Operands ) )
-    ListItem ( storedInstr ( pushw %sp , .Operands ) )
-    ListItem ( storedInstr ( popw %bx , .Operands ) )
-    ListItem ( storedInstr ( popq %rax , .Operands ) )
-    ListItem ( storedInstr ( pushq 24 ( %rsp ) , .Operands ) )
-    ListItem ( storedInstr ( popq 8 ( %rsp ) , .Operands ) )
-    ListItem ( storedInstr ( pushw 32 ( %rsp ) , .Operands ) )
-    ListItem ( storedInstr ( popw 16 ( %rsp ) , .Operands ) )
-    ListItem ( storedInstr ( pushq $0xabcd , .Operands ) )
-    ListItem ( storedInstr ( popw -16 ( %rsp ) , .Operands ) )
-    ListItem ( storedInstr ( nop .Operands ) )
-  </itracer>
   <regstatequeue>
     ListItem (
 "AF" |-> 1'0