plympton 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c809128838470cc20b4ae9b7bac312bd736b33b
-  data.tar.gz: a770fb56e21f7c3f0bf1abda87a6873629f87094
+  metadata.gz: aef250c09540302f8fbd9f4b99314e2814a7498e
+  data.tar.gz: a98d40ec8e34936fc41ea248fd7ef90c4db03be0
 SHA512:
-  metadata.gz: 57781fabc6343ce5c5e3fb35dea0ad55525694026d2bbfd2da24302276f2ae9f3af4696c97f45235046d84c0586304097912a3536cfe68c5a39509b52d386386
-  data.tar.gz: 6970e51b07c92beead632679de4b653ac6d0d4b82e1f690bb59a38600791049e5e6c6904036c07c2e1fc87038c967096c82c00da5ac1ebbcda70e01572a75eac
+  metadata.gz: d4503adfd993f6bbc19b8667fb0a2468201abb7fcbf15eb4a8edfe1c5e484f67a179f50da0ff347eeb273e3c9e00dc8a5840f8dad25f5aef6b7b78febeda3e46
+  data.tar.gz: 5a84bf8c76b7b7a8698b74f1bcd91c3556359e3bbb1fbecbadf741c8bb125fcb5fdc2f85563b1d813619b246a4d5af56062785c360438f1390d79b3110354e35

data/Gemfile

@@ -12,4 +12,3 @@ end
 gem 'nokogiri', '~> 1.6'
 gem 'antlr3', '~> 1.10'
 gem 'narray', '~> 0.6'
-gem 'coveralls', require: false

data/README.md

@@ -7,6 +7,15 @@ A gem to read program disassembly from a YAML dump.  The YAML dump is generated
 [![Coverage Status](https://coveralls.io/repos/rogwfu/plympton/badge.png)](https://coveralls.io/r/rogwfu/plympton)
 [![Dependency Status](https://www.versioneye.com/user/projects/543603aab2a9c5dd3d000092/badge.svg?style=flat)](https://www.versioneye.com/user/projects/543603aab2a9c5dd3d000092)
 
+## Dependencies
+
+The IDA Python auto analysis script requires YAML for serializing program information.  To install:
+
+### Mac OS X
+```bash
+sudo /usr/bin/easy_install-2.6 pyyaml
+```
+
 ## Contributing to plympton
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/bin/func-auto.py

@@ -413,8 +413,11 @@ yamlFilename  = os.environ['PWD'] + "/" + GetInputFile() + ".fz"
 # Open the file
 yamlFile = open(yamlFilename, 'w')
 
-# Get the start and end of the text section
-textSegmentSelector = SegByName("__text")
+# Get the start and end of the text section (__text Mac, .text Linux)
+textSegmentSelector = SegByName(".text")
+if textSegmentSelector == BADADDR:
+	textSegmentSelector = SegByName("__text")
+
 textSegmentStart = SegByBase(textSegmentSelector)
 textSegmentEnd = SegEnd(textSegmentStart)
 

data/lib/plympton/disassembly.rb

@@ -40,6 +40,29 @@ module Plympton
 			return(result)
 		end
 
+		# Function to process hit tracing recorded by lldb 
+		# @param [String] Path to a lldb trace file
+		def lldb_coverage(lldbTrace)
+		  # Open the valgrind xml trace file
+		  xmlFile = File.open(lldbTrace, "r")
+		  xmlDoc = Nokogiri::XML(xmlFile)
+
+		  # Delete any previous hit traces
+		  @attributes.functionHitTrace.clear()
+
+		  # Parse all the function hits 
+		  xmlDoc.xpath("//hit").each do |hit|
+			functionOffset = hit.search("offset").first().inner_text()
+			functionHits = hit.search("count").first().inner_text()
+			@attributes.functionHitTrace[functionOffset] = [functionHits.to_i()] 
+		  end
+
+		  # FIXME: Add code to handle the markov matrix
+
+		  # Cleanup open file
+		  xmlFile.close()
+		end
+
 		# Function to process hit tracing recorded by Valgrind tools (rufus and callgrind)
 		# @param [String] Path to a valgrind trace file
 		def valgrind_coverage(valgrindTrace)
@@ -79,7 +102,7 @@ module Plympton
 							@attributes.functionHash[functionOffset].numTransitions += BigDecimal("#{numberOfCalls}")
 
 							# Update the transition matrix
-							@attributes.transitionMatrix[@attributes.functionHash[functionOffset].markovIdx, @attributes.functionHash[calleeOffset].markovIdx] = @attributes.transitionMatrix[@attributes.functionHash[functionOffset].markovIdx, @attributes.functionHash[calleeOffset].markovIdx] + BigDecimal("#{numberOfCalls}") 
+#							@attributes.transitionMatrix[@attributes.functionHash[functionOffset].markovIdx, @attributes.functionHash[calleeOffset].markovIdx] = @attributes.transitionMatrix[@attributes.functionHash[functionOffset].markovIdx, @attributes.functionHash[calleeOffset].markovIdx] + BigDecimal("#{numberOfCalls}") 
 
 							# Keep track of call trace and number of times called
 							@attributes.trace << "#{@attributes.functionHash[functionOffset].markovIdx}:#{@attributes.functionHash[calleeOffset].markovIdx}:#{numberOfCalls}"

data/lib/plympton/object.rb

@@ -47,7 +47,7 @@ module Plympton
 			# Transition matrix persists across test case runs
 #			dimension = @functionHash.size() + 1
 			dimension = @functionHash.size()
-			@transitionMatrix = NMatrix.object(dimension, dimension).fill!(BigDecimal("0"))
+#			@transitionMatrix = NMatrix.object(dimension, dimension).fill!(BigDecimal("0"))
 
 			# Allocate a trace for Markov chains
 			@trace = Array.new()

data/plympton.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: plympton 1.1.0 ruby lib
+# stub: plympton 1.1.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "plympton"
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Roger Seagle"]
-  s.date = "2014-10-09"
+  s.date = "2014-11-17"
   s.description = "A Gem to read program disassembly from a YAML dump.  The YAML dump is generated from an ida pro python script.  This script is included along with this Gem (func.py)"
   s.email = "roger.seagle@gmail.com"
   s.executables = ["func-auto.py", "func.py", "func.py.new", "idascript.py"]
@@ -66,7 +66,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<nokogiri>, ["~> 1.6"])
       s.add_runtime_dependency(%q<antlr3>, ["~> 1.10"])
       s.add_runtime_dependency(%q<narray>, ["~> 0.6"])
-      s.add_runtime_dependency(%q<coveralls>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
       s.add_development_dependency(%q<yard>, ["~> 0.8"])
       s.add_development_dependency(%q<rspec>, ["~> 3.1"])
@@ -75,7 +74,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<nokogiri>, ["~> 1.6"])
       s.add_dependency(%q<antlr3>, ["~> 1.10"])
       s.add_dependency(%q<narray>, ["~> 0.6"])
-      s.add_dependency(%q<coveralls>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 2.0"])
       s.add_dependency(%q<yard>, ["~> 0.8"])
       s.add_dependency(%q<rspec>, ["~> 3.1"])
@@ -85,7 +83,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<nokogiri>, ["~> 1.6"])
     s.add_dependency(%q<antlr3>, ["~> 1.10"])
     s.add_dependency(%q<narray>, ["~> 0.6"])
-    s.add_dependency(%q<coveralls>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 2.0"])
     s.add_dependency(%q<yard>, ["~> 0.8"])
     s.add_dependency(%q<rspec>, ["~> 3.1"])

data/spec/plympton_spec.rb

@@ -202,19 +202,19 @@ describe "PlymptonRefactor" do
 	end
 
 	# Test probability matrix calculation
-	it "should correctly calculate probability matrix" do
-		@object = Plympton::Disassembly.new(File.expand_path(File.dirname(__FILE__) + "/libFontParser.64.dylib.fz"), "U")
-		@object.valgrind_coverage(File.expand_path(File.dirname(__FILE__) + "/steady-state.64bit.trace.xml"))
-		onePass = @object.evaluate()
-#		onePass.should == BigDecimal("0.000026097275191916865333298250824189")
-
-		@object.initialize_solver("U")
-		@object.valgrind_coverage(File.expand_path(File.dirname(__FILE__) + "/steady-state.64bit.trace.xml"))
-		@object.attributes.trace.clear()  # Simulate two independent traces
-		@object.valgrind_coverage(File.expand_path(File.dirname(__FILE__) + "/steady-state.64bit.trace.xml"))
-		twoPass = @object.evaluate()
-
-		# Test Function Path Uniqueness
-		onePass.should == twoPass
-	end
+#	it "should correctly calculate probability matrix" do
+#		@object = Plympton::Disassembly.new(File.expand_path(File.dirname(__FILE__) + "/libFontParser.64.dylib.fz"), "U")
+#		@object.valgrind_coverage(File.expand_path(File.dirname(__FILE__) + "/steady-state.64bit.trace.xml"))
+#		onePass = @object.evaluate()
+##		onePass.should == BigDecimal("0.000026097275191916865333298250824189")
+#
+#		@object.initialize_solver("U")
+#		@object.valgrind_coverage(File.expand_path(File.dirname(__FILE__) + "/steady-state.64bit.trace.xml"))
+#		@object.attributes.trace.clear()  # Simulate two independent traces
+#		@object.valgrind_coverage(File.expand_path(File.dirname(__FILE__) + "/steady-state.64bit.trace.xml"))
+#		twoPass = @object.evaluate()
+#
+#		# Test Function Path Uniqueness
+#		onePass.should == twoPass
+#	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plympton
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Roger Seagle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement