furnace 0.4.0.beta.1 → 0.4.0.beta.2

data/lib/furnace/ssa/instructions/branch.rb

@@ -1,11 +1,11 @@
 module Furnace
   class SSA::BranchInsn < SSA::TerminatorInstruction
     syntax do |s|
-      s.operand :target, SSA::BasicBlock
+      s.operand :target
     end
 
     def exits?
       false
     end
   end
-end
+end

data/lib/furnace/ssa/instructions/phi.rb

@@ -1,7 +1,7 @@
 module Furnace
   class SSA::PhiInsn < SSA::GenericInstruction
-    def initialize(basic_block, type, operands={}, name=nil)
-      super(basic_block, type, operands, name)
+    def initialize(type, operands={}, name=nil)
+      super(type, operands, name)
     end
 
     def each_operand(&block)
@@ -29,13 +29,11 @@ module Furnace
 
     protected
 
-    def pretty_operands(p)
-      @operands.each_with_index do |(basic_block, value), index|
-        p.name basic_block.name
-        p.text '=>'
-        value.inspect_as_value p
-
-        p << ',' if index < @operands.count - 1
+    def awesome_print_operands(p)
+      p.collection('', ', ', '', @operands) do |basic_block, value|
+        p.name(basic_block.name).
+          text('=>')
+        value.awesome_print_as_value p
       end
     end
 
@@ -45,6 +43,8 @@ module Furnace
         @operands.delete use
         @operands[new_use] = value
 
+        SSA.instrument(self)
+
         true
       else
         found = false
@@ -56,8 +56,10 @@ module Furnace
           end
         end
 
+        SSA.instrument(self)
+
         found
       end
     end
   end
-end
+end

data/lib/furnace/ssa/instructions/return.rb

@@ -1,11 +1,11 @@
 module Furnace
   class SSA::ReturnInsn < SSA::TerminatorInstruction
-    syntax do |s|
-      s.operand :value
+    def value_type
+      Type::Bottom.new
     end
 
     def exits?
       true
     end
   end
-end
+end

data/lib/furnace/ssa/instructions/return_value.rb

@@ -0,0 +1,11 @@
+module Furnace
+  class SSA::ReturnValueInsn < SSA::ReturnInsn
+    syntax do |s|
+      s.operand :value
+    end
+
+    def value_type
+      value.type
+    end
+  end
+end

data/lib/furnace/ssa/instrumentation.rb

@@ -0,0 +1,33 @@
+module Furnace
+  module SSA
+    @instrumentation = nil
+
+    def self.instrumentation
+      if block_given?
+        yield @instrumentation if @instrumentation
+      else
+        @instrumentation
+      end
+    end
+
+    def self.instrumentation=(instrumentation)
+      @instrumentation = instrumentation
+    end
+
+    def self.start_instrumentation
+      @instrumentation = SSA::EventStream.new
+    end
+
+    def self.dump_instrumentation(filename)
+      File.open(filename, 'w') do |io|
+        io.write JSON.dump(@instrumentation.data)
+      end
+    end
+
+    def self.instrument(what)
+      instrumentation do |i|
+        i.process(what)
+      end
+    end
+  end
+end

data/lib/furnace/ssa/module.rb

@@ -37,10 +37,14 @@ module Furnace
       end
 
       @functions[function.name] = function
+
+      SSA.instrument(self)
     end
 
     def remove(name)
       @functions.delete name
+
+      SSA.instrument(self)
     end
 
     protected
@@ -49,4 +53,4 @@ module Furnace
       @next_id += 1
     end
   end
-end
+end

data/lib/furnace/ssa/named_value.rb

@@ -1,25 +1,46 @@
 module Furnace
   class SSA::NamedValue < SSA::Value
-    attr_accessor :function
-    attr_reader   :name
+    attr_reader :function
+    attr_reader :name
 
-    def initialize(function, name)
+    def initialize(name=nil)
       super()
 
-      @function = function
-      self.name = name
+      @function = nil
+      @name     = name
     end
 
     def name=(name)
-      @name = @function.make_name(name)
+      if @function
+        @name = @function.make_name(name)
+      else
+        @name = name
+      end
+
+      SSA.instrument(self)
+    end
+
+    def function=(function)
+      if @function != function
+        @name     = function.make_name(@name)
+        @function = function
+      end
+
+      SSA.instrument(self)
+    end
+
+    def detach
+      @function = nil
+
+      SSA.instrument(self)
     end
 
-    def inspect_as_value(p=SSA::PrettyPrinter.new)
-      p.name name
+    def awesome_print_as_value(p=AwesomePrinter.new)
+      p.name(@name)
     end
 
     def inspect
-      pretty_print
+      awesome_print
     end
   end
-end
+end

data/lib/furnace/ssa/terminator_instruction.rb

@@ -1,24 +1,24 @@
 module Furnace
   class SSA::TerminatorInstruction < SSA::Instruction
-    def has_side_effects?
+    def terminator?
       true
     end
 
-    def terminator?
-      true
+    def has_side_effects?
+      exits?
     end
 
     def exits?
-      raise NotImplementedError, "reimplement SSA::TerminatorInstruction#exits? in a subclass"
+      raise NotImplementedError, "reimplement #{self.class}#exits?"
     end
 
     def successors
       operands.
         select do |value|
-          value.type == SSA::BasicBlockType.instance
+          value.type == SSA::BasicBlockType.new
         end.map do |value|
           value.name
         end
     end
   end
-end
+end

data/lib/furnace/ssa/types/basic_block.rb

@@ -1,11 +1,7 @@
 module Furnace
-  class SSA::BasicBlockType < SSA::Type
-    def self.instance
-      @instance ||= new
-    end
-
-    def inspect
-      "label"
+  class SSA::BasicBlockType < Type::Top
+    def to_s
+      'label'
     end
   end
-end
+end

data/lib/furnace/ssa/types/function.rb

@@ -1,11 +1,7 @@
 module Furnace
-  class SSA::FunctionType < SSA::Type
-    def self.instance
-      @instance ||= new
-    end
-
-    def inspect
-      "function"
+  class SSA::FunctionType < Type::Top
+    def to_s
+      'function'
     end
   end
-end
+end

data/lib/furnace/ssa/user.rb

@@ -2,12 +2,18 @@ module Furnace
   class SSA::User < SSA::NamedValue
     attr_reader :operands
 
-    def initialize(function, operands=[], name=nil)
-      super(function, name)
+    def initialize(operands=[], name=nil)
+      super(name)
 
       self.operands = operands
     end
 
+    def initialize_copy(original)
+      @operands = nil
+
+      super
+    end
+
     def each_operand(&block)
       @operands.each &block if @operands
     end
@@ -18,7 +24,7 @@ module Furnace
       end
     end
 
-    def detach
+    def drop_references
       update_use_lists do
         @operands = nil
       end
@@ -41,17 +47,6 @@ module Furnace
       self
     end
 
-    def valid?(*args)
-      verify!(*args)
-      true
-    rescue TypeError
-      false
-    end
-
-    def verify!
-      # do nothing
-    end
-
     protected
 
     def update_use_lists
@@ -65,6 +60,8 @@ module Furnace
         operand.add_use(self)
       end
 
+      SSA.instrument(self)
+
       value
     end
 
@@ -78,7 +75,9 @@ module Furnace
         end
       end
 
+      SSA.instrument(self)
+
       found
     end
   end
-end
+end

data/lib/furnace/ssa/value.rb

@@ -2,14 +2,18 @@ module Furnace
   class SSA::Value
     def initialize
       @uses = Set.new
+
+      SSA.instrument(self)
     end
 
     def initialize_copy(original)
       @uses = Set.new
+
+      SSA.instrument(self)
     end
 
     def type
-      SSA.void
+      Type::Bottom.new
     end
 
     def constant?
@@ -51,12 +55,12 @@ module Furnace
           equal?(other.to_value)
     end
 
-    def pretty_print(p=SSA::PrettyPrinter.new)
-      inspect_as_value(p)
+    def awesome_print(p=AwesomePrinter.new)
+      awesome_print_as_value(p)
     end
 
-    def inspect_as_value(p=SSA::PrettyPrinter.new)
+    def awesome_print_as_value(p=AwesomePrinter.new)
       p.text inspect
     end
   end
-end
+end

data/lib/furnace/transform/iterative.rb

@@ -1,25 +1,41 @@
+require 'set'
+
 module Furnace
   module Transform
     class Iterative
-      def initialize(stages)
+      LOOP_THRESHOLD = 100
+
+      def initialize(stages, options={})
         @stages = stages
+
+        @debug      = options[:debug]
+        @iterations = 0
       end
 
       def run(context)
         self_changed = false
 
         loop do
-          changed = false
+          changed = Set[]
 
           @stages.each do |stage|
+            # FIXME?
             return self_changed if stage.nil?
 
             if stage.run(context)
-              self_changed = changed = true
+              self_changed = true
+              changed.add stage
             end
           end
 
-          return self_changed unless changed
+          return self_changed if changed.empty?
+
+          if @debug
+            @iterations += 1
+            if @iterations > LOOP_THRESHOLD
+              raise "Transform::Iterative has detected infinite loop in: #{changed.to_a}"
+            end
+          end
         end
       end
     end

data/lib/furnace/type.rb

@@ -0,0 +1,9 @@
+module Furnace
+  module Type
+  end
+
+  require_relative 'type/top'
+  require_relative 'type/bottom'
+  require_relative 'type/value'
+  require_relative 'type/variable'
+end

data/lib/furnace/type/bottom.rb

@@ -0,0 +1,11 @@
+module Furnace
+  class Type::Bottom < Type::Top
+    def subtype_of?(other)
+      other.is_a?(Type::Top)
+    end
+
+    def to_s
+      'bottom'
+    end
+  end
+end

data/lib/furnace/type/top.rb

@@ -0,0 +1,72 @@
+module Furnace
+  class Type::Top
+    class << self
+      def normalize(*params)
+        params
+      end
+
+      def new(*params)
+        @instances[normalize(*params)]
+      end
+
+      protected
+
+      def setup_singleton
+        @instances = Hash.new do |hash, params|
+          inst = allocate
+          inst.send :initialize, *params
+          inst.freeze
+
+          hash[params] = inst
+        end
+      end
+
+      def inherited(klass)
+        klass.setup_singleton
+      end
+    end
+
+    setup_singleton
+
+    def to_type
+      self
+    end
+
+    def subtype_of?(other)
+      other.instance_of?(Type::Top) ||
+          self == other
+    end
+
+    def supertype_of?(other)
+      other.subtype_of?(self)
+    end
+
+    def variable?
+      false
+    end
+
+    def replace_type_with(type, replacement)
+      if self == type
+        replacement.to_type
+      else
+        self
+      end
+    end
+
+    def specialize(other)
+      if self == other
+        {}
+      else
+        raise ArgumentError, "cannot specialize #{self.to_s} with #{other.to_s}"
+      end
+    end
+
+    def to_s
+      'top'
+    end
+
+    def awesome_print(p=AwesomePrinter.new)
+      p.type(self)
+    end
+  end
+end