seafoam 0.11 → 0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc92671f5ea437e5afccf98c5874434251e6df05fde08e325e0b8b4a60d5d2b0
-  data.tar.gz: 77a8f71d631be2c02674784598a97d7da4b83c4556f2fc21c5d66496678b3792
+  metadata.gz: 5365ea61783b2be678609c214262d4df073fa4e66df60e9370b6fd33dd73825a
+  data.tar.gz: 322fe5170082c57d51120c3fa43910ca2e79a7839737167955ad1f330084af83
 SHA512:
-  metadata.gz: 2c9d7b5ccea117d2b1b686d66fffbeebe4282dde52f5c9880125f57911f4da4ed2e7660f1957597931e5bf714258b0c1a08e6c9fc0bfbc822915b2ae22c08964
-  data.tar.gz: 2c991ed3d87e80ccdb92630dfc3d2283b01ed2125c70883eec7b5e0cd6031d55acbb8930feb7cf6ef6e029b0e58ff2b01b2d2c81c0a2a0bca266070a2c28ba2c
+  metadata.gz: 33cdf9e0f73e9a41d11ee2c19f60b015f8fe5168ddd92eaee1a254c13c6296e8696514858e0fc0c77c583657c3d01b2292919077f9131768198801bd9610dbc9
+  data.tar.gz: 2354dd4f1c5d87c83d265577a0e64b5130cd9dc7de46e6222629b985bdac038b6977f3fe10ffc2624e45b2cc56dbd67ea243734a528a17eab780a80c00996621

data/lib/seafoam/commands.rb

@@ -147,50 +147,6 @@ module Seafoam
       end
     end
 
-    def cfg2asm(*args)
-      case args.first
-      when nil, 'help', '-h', '--help', '-help'
-        args = args.drop(1)
-        raise ArgumentError, "unexpected arguments #{args.join(' ')}" unless args.empty?
-
-        @out.puts 'cfg2asm file.bgv...'
-        @out.puts '            --no-comments'
-        @out.puts '        --help'
-        @out.puts '        --version'
-      when 'version', '-v', '-version', '--version'
-        args = args.drop(1)
-        version(*args)
-      else
-        comments = true
-        files = []
-
-        until args.empty?
-          arg = args.shift
-          if arg.start_with?('-')
-            case arg
-            when '--no-comments'
-              comments = false
-            else
-              raise ArgumentError, "unknown option #{arg}"
-            end
-          else
-            files.push arg
-          end
-        end
-
-        files.each_with_index do |file, n|
-          parser = Seafoam::CFG::CFGParser.new(@out, file)
-          parser.skip_over_cfg 'After code installation'
-          nmethod = parser.read_nmethod
-
-          disassembler = Seafoam::CFG::Disassembler.new(@out)
-          @out.puts if n.positive?
-          @out.puts "[#{file}]"
-          disassembler.disassemble(nmethod, comments)
-        end
-      end
-    end
-
     private
 
     # seafoam file.bgv info

data/lib/seafoam/version.rb

@@ -1,5 +1,5 @@
 module Seafoam
   MAJOR_VERSION = 0
-  MINOR_VERSION = 11
+  MINOR_VERSION = 12
   VERSION = "#{MAJOR_VERSION}.#{MINOR_VERSION}"
 end

data/lib/seafoam.rb

@@ -1,8 +1,6 @@
 require 'seafoam/version'
 require 'seafoam/binary/io_binary_reader'
 require 'seafoam/bgv/bgv_parser'
-require 'seafoam/cfg/cfg_parser'
-require 'seafoam/cfg/disassembler'
 require 'seafoam/colors'
 require 'seafoam/graph'
 require 'seafoam/graal/graph_description'

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: seafoam
 version: !ruby/object:Gem::Version
-  version: '0.11'
+  version: '0.12'
 platform: ruby
 authors:
 - Chris Seaton
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-26 00:00:00.000000000 Z
+date: 2022-02-03 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: crabstone
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: benchmark-ips
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,25 +52,21 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.74'
-description: 
-email: 
+description:
+email:
 executables:
 - seafoam
 - bgv2json
 - bgv2isabelle
-- cfg2asm
 extensions: []
 extra_rdoc_files: []
 files:
 - bin/bgv2isabelle
 - bin/bgv2json
-- bin/cfg2asm
 - bin/seafoam
 - lib/seafoam.rb
 - lib/seafoam/bgv/bgv_parser.rb
 - lib/seafoam/binary/io_binary_reader.rb
-- lib/seafoam/cfg/cfg_parser.rb
-- lib/seafoam/cfg/disassembler.rb
 - lib/seafoam/colors.rb
 - lib/seafoam/commands.rb
 - lib/seafoam/formatters/base.rb
@@ -122,7 +90,7 @@ homepage: https://github.com/Shopify/seafoam
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -137,9 +105,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.3
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: A tool for working with compiler graphs
 test_files: []

data/bin/cfg2asm

@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'seafoam'
-
-# This is the 'cfg2asm' command line entry point.
-
-begin
-  # Run the command line.
-  commands = Seafoam::Commands.new($stdout)
-  commands.cfg2asm(*ARGV)
-rescue StandardError => e
-  if $DEBUG
-    # Re-raise the exception so the user sees it, if debugging is
-    # enabled (ruby -d).
-    raise e
-  else
-    # Otherwise, just print the message.
-    warn "seafoam: #{e.message}"
-  end
-end

data/lib/seafoam/cfg/cfg_parser.rb

@@ -1,93 +0,0 @@
-require 'stringio'
-require 'zlib'
-
-module Seafoam
-  module CFG
-    Code = Struct.new(:arch, :arch_width, :base, :code)
-    Comment = Struct.new(:offset, :comment)
-    NMethod = Struct.new(:code, :comments)
-
-    # A parser for CFG files.
-    class CFGParser
-      def initialize(out, file)
-        @out = out
-        data = File.read(file, encoding: Encoding::ASCII_8BIT)
-        if data[0..1].bytes == [0x1f, 0x8b]
-          data = Zlib.gunzip(data)
-        end
-        @reader = StringIO.new(data)
-        @state = :any
-        @cfg_name = nil
-      end
-
-      def skip_over_cfg(name)
-        loop do
-          line = @reader.readline("\n")
-          case line
-          when "begin_cfg\n"
-            @state = :cfg
-            @cfg_name = nil
-          when /  name "(.*)"\n/
-            if @state == :cfg
-              @cfg_name = Regexp.last_match(1)
-            end
-          when "end_cfg\n"
-            raise unless @state == :cfg
-
-            @state = :any
-            break if @cfg_name == name
-          else
-            next
-          end
-        end
-      end
-
-      def read_nmethod
-        raise unless @state == :any
-
-        arch = nil
-        arch_width = nil
-        code = nil
-        comments = []
-        raise unless @reader.readline == "begin_nmethod\n"
-
-        loop do
-          line = @reader.readline("\n")
-          case line
-          when /  Platform (.*) (.*)  <\|\|@\n/
-            arch = Regexp.last_match(1)
-            arch_width = Regexp.last_match(2)
-          when /  HexCode (.*) (.*)  <\|\|@\n/
-            base = Regexp.last_match(1).to_i(16)
-            code = [Regexp.last_match(2)].pack('H*')
-            raise if arch.nil? || arch_width.nil?
-
-            code = Code.new(arch, arch_width, base, code)
-          when /  Comment (\d*) (.*)  <\|\|@\n/
-            offset = Regexp.last_match(1).to_i
-            comment = Regexp.last_match(2)
-            comments.push Comment.new(offset, comment)
-          when "  <<<HexCodeFile\n"
-            next
-          when "  HexCodeFile>>> <|@\n"
-            next
-          when "end_nmethod\n"
-            break
-          when /  (.*)  <\|\|@\n/
-            offset = -1
-            comment = Regexp.last_match(1)
-            comments.push Comment.new(offset, comment)
-          when /  (.*)\n/
-            offset = -1
-            comment = Regexp.last_match(1)
-            comments.push Comment.new(offset, comment)
-          else
-            # In case anything was missed
-            raise 'There is currently no case for this line. Please open an issue so it can be addressed.'
-          end
-        end
-        NMethod.new(code, comments)
-      end
-    end
-  end
-end

data/lib/seafoam/cfg/disassembler.rb

@@ -1,70 +0,0 @@
-require 'stringio'
-
-module Seafoam
-  module CFG
-    # Disassemble and print comments from cfg files
-    class Disassembler
-      def initialize(out)
-        @out = out
-      end
-
-      def disassemble(nmethod, print_comments)
-        require_crabstone
-
-        comments = nmethod.comments
-        comments_n = 0
-
-        case [nmethod.code.arch, nmethod.code.arch_width]
-        when %w[AMD64 64]
-          crabstone_arch = [Crabstone::ARCH_X86, Crabstone::MODE_64]
-        else
-          raise "Unknown architecture #{nmethod.code.arch} and bit width #{nmethod.code.arch_width}"
-        end
-
-        cs = Crabstone::Disassembler.new(*crabstone_arch)
-        begin
-          cs.disasm(nmethod.code.code, nmethod.code.base).each do |i|
-            if print_comments
-              # Print comments associated to the instruction.
-              last_comment = i.address + i.bytes.length - nmethod.code.base
-              while comments_n < comments.length && comments[comments_n].offset < last_comment
-                if comments[comments_n].offset == -1
-                  @out.printf("\t\t\t\t;%<comment>s\n", comment: comments[comments_n].comment)
-                else
-                  @out.printf(
-                    "\t\t\t\t;Comment %<loc>i:\t%<comment>s\n",
-                    loc: comments[comments_n].offset,
-                    comment: comments[comments_n].comment
-                  )
-                end
-                comments_n += 1
-              end
-            end
-
-            # Print the instruction.
-            @out.printf(
-              "\t0x%<address>x:\t%<instruction>s\t%<details>s\n",
-              address: i.address,
-              instruction: i.mnemonic,
-              details: i.op_str
-            )
-          end
-        rescue StandardError => e
-          raise "Disassembly error: #{e.message}"
-        ensure
-          cs.close
-        end
-      end
-
-      def require_crabstone
-        require 'crabstone'
-      rescue LoadError => e
-        if $DEBUG
-          raise e
-        else
-          raise 'Could not load Capstone - is it installed?'
-        end
-      end
-    end
-  end
-end