orgasm 0.0.1a2 → 0.0.1a3

data/lib/orgasm/assembler.rb

@@ -19,25 +19,14 @@
 
 module Orgasm
 
-class Assembler
-  @@archs = {}
-
-  def self.for (arch, &block)
-    if block
-      @@archs[arch] = self.new(arch, &block)
-    else
-      @@archs[arch]
-    end
+class Assembler < Piece
+  def initialize (*)
+    super
   end
 
-  attr_reader :architecture, :features
-
-  alias arch architecture
+  def assemble (instructions)
 
-  def initialize (architecture, features=[])
-    @architecture = architecture
-    @features     = features
-  end
+  end; alias do assemble
 end
 
 end

data/lib/orgasm/base.rb

@@ -0,0 +1,50 @@
+#--
+# Copyleft meh. [http://meh.paranoid.pk | meh@paranoici.org]
+#
+# This file is part of orgasm.
+#
+# orgasm is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# orgasm is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with orgasm. If not, see <http://www.gnu.org/licenses/>.
+#++
+
+require 'orgasm/extensions'
+
+module Orgasm
+
+def self.object? (value)
+  value.is_a?(Base) ? value : false
+end
+
+class Base
+  def initialize
+    yield self if block_given?
+  end
+
+  def to_s
+    begin
+      raise LoadError unless respond_to? :arch
+
+      Architecture[arch].style.apply(self)
+    rescue LoadError
+      super
+    end
+  end
+end
+
+end
+
+require 'orgasm/base/unknown'
+require 'orgasm/base/instruction'
+require 'orgasm/base/address'
+require 'orgasm/base/register'
+require 'orgasm/base/constant'

data/lib/orgasm/{common/constant.rb → base/address.rb}

@@ -19,19 +19,20 @@
 
 module Orgasm
 
-class Constant
-  attr_reader :size
-
-  def initialize (value, size)
+class Address < Base
+  def initialize (value=nil)
     @value = value.to_i
-    @size  = size
 
-    yield self if block_given?
+    super()
   end
 
   def to_i
     @value
   end
+
+  def inspect
+    "#<Address: #{to_i}>"
+  end
 end
 
 end

data/lib/orgasm/{common/register.rb → base/constant.rb}

@@ -19,18 +19,21 @@
 
 module Orgasm
 
-class Register
-  attr_reader :name, :size
+class Constant < Base
+  attr_accessor :value
 
-  def initialize (name, size)
-    @name = name.to_sym
-    @size = size.to_i
+  def initialize (value=nil)
+    @value = value.to_i if value
 
-    yield self if block_given?
+    super()
   end
 
-  def to_s
-    name.to_s.upcase
+  def to_i
+    @value
+  end
+
+  def inspect
+    "#<Constant: #{to_i}>"
   end
 end
 

data/lib/orgasm/base/instruction.rb

@@ -0,0 +1,41 @@
+#--
+# Copyleft meh. [http://meh.paranoid.pk | meh@paranoici.org]
+#
+# This file is part of orgasm.
+#
+# orgasm is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# orgasm is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with orgasm. If not, see <http://www.gnu.org/licenses/>.
+#++
+
+module Orgasm
+
+class Instruction < Base
+  attr_reader :name, :parameters
+
+  def initialize (name=nil, *parameters)
+    self.name   = name if name
+    @parameters = parameters.to_a.flatten.compact
+
+    super()
+  end
+
+  def name= (value)
+    @name = value.downcase.to_sym
+  end
+
+  def inspect
+    "#<Instruction(#{name})#{": #{parameters.map {|p| p.inspect}.join(', ')}" unless parameters.empty?}>"
+  end
+end
+
+end

data/lib/orgasm/{common/instruction.rb → base/register.rb}

@@ -19,18 +19,18 @@
 
 module Orgasm
 
-class Instruction
-  attr_reader :name, :parameters
+class Register < Base
+  attr_accessor :name, :size
 
-  def initialize (name, *parameters)
-    @name       = name.to_sym
-    @parameters = parameters.to_a
+  def initialize (name=nil, size=nil)
+    @name = name.to_s.downcase.to_sym if name
+    @size = size.to_i                 if size
 
-    yield self if block_given?
+    super()
   end
 
-  def to_s
-    "#{name.to_s.upcase} #{parameters.join(', ')}"
+  def inspect
+    "#<Register: #{@name}, #{@size} bits>"
   end
 end
 

data/lib/orgasm/base/unknown.rb

@@ -0,0 +1,36 @@
+#--
+# Copyleft meh. [http://meh.paranoid.pk | meh@paranoici.org]
+#
+# This file is part of orgasm.
+#
+# orgasm is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# orgasm is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with orgasm. If not, see <http://www.gnu.org/licenses/>.
+#++
+
+module Orgasm
+
+class Unknown < Base
+  attr_accessor :data
+
+  def initialize (data=nil)
+    @data = data
+
+    super()
+  end
+
+  def inspect
+    "#<Unknown(#{data.length}): #{data.to_s.bytes.map {|x| '%02X' % x}.join(' ')}>"
+  end
+end
+
+end

data/lib/orgasm/disassembler.rb

@@ -17,31 +17,15 @@
 # along with orgasm. If not, see <http://www.gnu.org/licenses/>.
 #++
 
-require 'orgasm/common'
 require 'orgasm/disassembler/decoder'
 
 module Orgasm
 
-class Disassembler
-  @@archs = {}
+class Disassembler < Piece
+  def initialize (*)
+    @decoders = []
 
-  def self.for (arch, &block)
-    if block
-      @@archs[arch] = self.new(arch, &block)
-    else
-      @@archs[arch]
-    end
-  end
-
-  attr_reader :architecture
-
-  alias arch architecture
-
-  def initialize (architecture, &block)
-    @architecture = architecture
-    @decoders     = []
-
-    instance_eval(&block)
+    super
   end
 
   def disassemble (io)
@@ -52,28 +36,47 @@ class Disassembler
     end
 
     result = []
+    junk   = nil
 
     until io.eof?
       where = io.tell
 
       @decoders.each {|decoder|
         if tmp = Orgasm.object?(decoder.with(io).decode)
+          result << unknown(junk) and junk = nil if junk
           result << tmp
+
           break
         end
       }
 
       if where == io.tell
-        raise RuntimeError, 'No input was read, something is wrong with the decoders'
+        (junk ||= '') << io.read(1)
       end
     end
 
+    result << unknown(junk) if junk
+
     result.flatten.compact
-  end
+  end; alias do disassemble
 
   def on (*args, &block)
     @decoders << Decoder.new(*args, &block)
   end
+
+  def unknown (data=nil, &block)
+    if block
+      @unknown = block
+    elsif data
+      if @unknown
+        instance_exec data, &@unknown
+      else
+        instance_exec data do |data|
+          Unknown.new(data)
+        end
+      end
+    end
+  end
 end
 
 end

data/lib/orgasm/disassembler/decoder.rb

@@ -17,7 +17,7 @@
 # along with orgasm. If not, see <http://www.gnu.org/licenses/>.
 #++
 
-module Orgasm; class Disassembler
+module Orgasm; class Disassembler < Piece
 
 class Decoder
   def initialize (*args, &block)
@@ -33,12 +33,17 @@ class Decoder
   def decode
     return unless @io
 
-    return unless @args.any? {|arg|
+    return unless match = @args.find {|arg|
       matches(arg)
     }
 
     catch(:result) {
-      instance_eval &@block
+      start = @io.tell
+
+      @io.seek start if catch(:skip) {
+        _result(instance_exec @args, match, &@block)
+        false
+      }
     }
   end
 
@@ -60,15 +65,11 @@ class Decoder
   def on (*args, &block)
     return unless @io
 
-    return unless args.any? {|arg|
+    return unless match = args.find {|arg|
       matches(arg)
     }
 
-    result = instance_eval &block
-
-    if Orgasm.object?(result)
-      throw :result, result
-    end
+    result = _result(instance_exec args, match, &block)
 
     result
   end
@@ -79,11 +80,7 @@ class Decoder
     if block
       where, = @io.tell, @io.seek(amount, whence)
 
-      result = instance_eval &block
-
-      if Orgasm.object?(result)
-        throw :result, result
-      end
+      result = _result(instance_eval &block)
 
       @io.seek(where)
 
@@ -103,11 +100,7 @@ class Decoder
         raise RuntimeError, 'The stream has not enough data :('
       end
 
-      result = instance_exec data, &block
-
-      if Orgasm.object?(result)
-        throw :result, result
-      end
+      result = _result(instance_exec data, &block)
 
       seek -amount
 
@@ -120,8 +113,21 @@ class Decoder
   def lookahead (amount)
     read(amount) do |data|
       data
-    end
+    end rescue nil
+  end
+
+  def skip
+    throw :skip, true
   end
+
+  private
+    def _result (value)
+      if Orgasm.object?(value)
+        throw :result, value
+      end
+
+      value
+    end
 end
 
 end; end

data/lib/orgasm/{common/extensions.rb → extensions.rb}

@@ -17,6 +17,18 @@
 # along with orgasm. If not, see <http://www.gnu.org/licenses/>.
 #++
 
+require 'forwardable'
+require 'refining'
+require 'memoized'
+
 class String
   alias to_byte ord
 end
+
+class Array
+  def to_syms
+    map {|x|
+      x.to_sym
+    }
+  end
+end

data/lib/orgasm/generator.rb

@@ -0,0 +1,46 @@
+#--
+# Copyleft meh. [http://meh.paranoid.pk | meh@paranoici.org]
+#
+# This file is part of orgasm.
+#
+# orgasm is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# orgasm is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with orgasm. If not, see <http://www.gnu.org/licenses/>.
+#++
+
+require 'orgasm/generator/dsl'
+
+module Orgasm
+
+class Generator < Piece
+  def initialize (*)
+    @for = {}
+
+    super
+  end
+
+  def generate (&block)
+    DSL.new(&block).execute(self)
+  end; alias do generate
+
+  def for (klass, &block)
+    if block
+      @for[klass] = block
+    else
+      @for[klass] or @for.find {|(what, block)|
+        what.ancestors.member?(klass)
+      }.last
+    end
+  end
+end
+
+end