thermostat / itrace / changeset / 25f709641fbe

Up to file-list itrace.c:

@@ -100,6 +100,7 @@ unsigned int gzip_output = 0;
 /* symtab */
 symbol_table_t symtab;
 unsigned int use_symtab = 1;
 unsigned int ignore_non_sym_insn = 0;
 FILE* gzopen_w(char * fname) {
   char buf[MAX_FNAME_LEN];
@@ -112,13 +113,6 @@ void gzclose_w(FILE* f) {
   pclose(f);
+}
 void print_instruction(iaddr_t eip,
                iaddr_t esp,
                        unsigned char * bin_buf,
                        char* dis_buf,
                        unsigned int text_size);
 void print_from_address(iaddr_t addr);
 void print_insn(insn_entry_t * insn);
@@ -254,35 +248,35 @@ void control_child() {
       memcpy(&(insn.binary), bin_buf, BINARY_BUFFER_SIZE);
       memcpy(&(insn.disassembly), dis_buf, DISASSEMBLY_BUFFER_SIZE);
       cache_insn(&insn);
     /*print_instruction(user_struct.regs.eip,
             user_struct.regs.esp,
-            bin_buf, dis_buf, text_size);*/
+      /* defer is used for only printing the last N instructions.
 	 if this is the case, we put them in a queue, and only print
 	 at the end.*/
       if ( defer ) {
     if ( (circ_queue_head+1) % circ_queue_size == circ_queue_tail ) {
       circ_queue_tail++;
       if (circ_queue_tail == circ_queue_size) {
         circ_queue_tail = 0;
+      }
+    }
     circ_queue_head++;
     if ( circ_queue_head == circ_queue_size ) {
       circ_queue_head = 0;
+    }
     circ_queue[circ_queue_head] = insn;
     if (ptrace(PTRACE_SINGLESTEP, pid, 0, 0) != 0) {
       perror("ptrace");
+    }
     wait(&wait_val);
     continue;
 	if ( (circ_queue_head+1) % circ_queue_size == circ_queue_tail ) {
 	  circ_queue_tail++;
 	  if (circ_queue_tail == circ_queue_size) {
 	    circ_queue_tail = 0;
+	  }
+	}
 	circ_queue_head++;
 	if ( circ_queue_head == circ_queue_size ) {
 	  circ_queue_head = 0;
+	}
 	circ_queue[circ_queue_head] = insn;
 	if (ptrace(PTRACE_SINGLESTEP, pid, 0, 0) != 0) {
 	  perror("ptrace");
+	}
 	wait(&wait_val);
 	continue;
+      }
       else {
-    print_insn(&insn);
+	print_insn(&insn);
+      }
+    }
     else {
       if ( ! defer ) {
-    print_insn(cached_insn);
+	print_insn(cached_insn);
+      }
+    }
@@ -306,7 +300,6 @@ void control_child() {
        circ_queue_size, circ_queue_head,
        circ_queue_tail);
     while ( circ_queue_head != circ_queue_tail ) {
       /*print_from_address(circ_queue[circ_queue_tail]); */
       print_insn(&(circ_queue[circ_queue_tail]));
       circ_queue_tail++;
       if ( circ_queue_tail == circ_queue_size ) {
@@ -314,63 +307,14 @@ void control_child() {
+      }
+    }
     print_insn(&(circ_queue[circ_queue_tail]));
     /*print_from_address(circ_queue[circ_queue_tail]);*/
+  }
+}
 void print_from_address(iaddr_t addr) {
   char dis_buf[DISASSEMBLY_BUFFER_SIZE];
   char bin_buf[16];
   int text_size;
   text_size = get_inst_disassembly(addr,
                    dis_buf,DISASSEMBLY_BUFFER_SIZE,
                    (int*)bin_buf);
   /* get info out of the struct */
   print_instruction(addr, 0, bin_buf, dis_buf, text_size);
+}
 /*
  * print_instruction -
  * prints the conents of bin_buf (if the print_hex
  * option is set) and the contents of dis_buf, along
  * with the eip from user_struct.
  */
 void print_instruction(/*struct user * user_struct,*/
                iaddr_t eip,
                iaddr_t esp,
                        unsigned char * bin_buf,
                        char* dis_buf,
                        unsigned int text_size) {
   unsigned int ind;
   fprintf(out, "0x%08x: ", eip);
   if ( print_hex ) {
     for ( ind = 0; ind < 10; ind++ ) {
       /* print the first 8 bytes of the hex */
       if (ind  < text_size ) {
         fprintf(out, "%02x ", (unsigned char)bin_buf[ind]);
+      }
       else {
         fprintf(out, "   ");
+      }
+    }
+  }
   fprintf(out, "%s", dis_buf);
   if ( watch_esp && esp &&
        ((strncmp("call", dis_buf, 4) == 0) ||
     (strncmp("ret", dis_buf, 3) ==0)) ) {
     fprintf(out, "  (esp=0x%08x; *esp=0x%08x)",
             esp,
             ptrace(PTRACE_PEEKTEXT, pid,
                    esp, 0));
+  }
   fprintf(out, "\n");
+}
  print an insn_entry_t structure to the out
  FD.
 */
 void print_insn(insn_entry_t * insn) {
   unsigned int ind;
@@ -380,6 +324,9 @@ void print_insn(insn_entry_t * insn) {
     if ( sym_name != NULL && (strcmp(sym_name, "") != 0)) {
       fprintf(out, "<%s>:\n", sym_name);
+    }
     else if ( ignore_non_sym_insn ) {
       return;
+    }
+  }
   fprintf(out, "0x%08x: ", insn->eip);
   if ( print_hex ) {
@@ -456,6 +403,8 @@ void exit_usage(int rc) {
     "\n"
     "--no-syms      Do not print symbols\n"
     "\n"
     "--only-syms    Only print instructions which are associated with symbols\n"
     "\n"
     "--range LOWER UPPER Only print in instructions that execute in the\n"
     "-r             given range.\n"
     "\n"
@@ -524,6 +473,10 @@ char** set_opts(int argc, char* argv[])
     else if ( strcmp(cur_arg, "--no-syms") == 0 ) {
       use_symtab = 0;
+    }
     else if ( strcmp(cur_arg, "--only-syms") == 0 ) {
       ignore_non_sym_insn = 1;
       use_symtab = 1;
+    }
     else if ( strcmp(cur_arg, "-h") == 0 ||
           strcmp(cur_arg, "--help") == 0 ) {
       exit_usage(0);

commit 22:	25f709641fbe
parent 21:	b03540a5df70
branch:	itrace

thermostat / itrace (http://cs.virginia.edu/~dww4s/tools/itrace/itrace.html)