ronin-asm 0.1.0 → 0.2.0

data/lib/ronin/asm/asm.rb

@@ -1,7 +1,7 @@
 #
 # Ronin ASM - A Ruby DSL for crafting Assembly programs and Shellcode.
 #
-# Copyright (c) 2007-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2007-2013 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin ASM.
 #

data/lib/ronin/asm/config.rb

@@ -1,7 +1,7 @@
 #
 # Ronin ASM - A Ruby DSL for crafting Assembly programs and Shellcode.
 #
-# Copyright (c) 2007-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2007-2013 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin ASM.
 #

data/lib/ronin/asm/immediate_operand.rb

@@ -1,7 +1,7 @@
 #
 # Ronin ASM - A Ruby DSL for crafting Assembly programs and Shellcode.
 #
-# Copyright (c) 2007-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2007-2013 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin ASM.
 #
@@ -38,17 +38,24 @@ module Ronin
       #   The size in bytes of the value.
       #
       def initialize(value,width=nil)
-        value   = value.to_i
-        width ||= case value
-                  when (0x100000000..0xffffffffffffffff),
-                       (-0x7fffffffffffffff..-0x800000000) then 8
-                  when (0x10000..0xffffffff),
-                       (-0x7fffffff..-0x80000)             then 4
-                  when (0x100..0xffff), (-0x7fff..-0x80)   then 2
-                  when (0..0xff), (-0x7f..0)               then 1
-                  end
+        super(value.to_i,width)
+      end
 
-        super(value,width)
+      #
+      # The width of the immediate operand.
+      #
+      # @return [8, 4, 2, 1]
+      #   The width.
+      #
+      def width
+        super || case value
+                 when (0x100000000..0xffffffffffffffff),
+                      (-0x7fffffffffffffff..-0x800000000) then 8
+                 when (0x10000..0xffffffff),
+                      (-0x7fffffff..-0x80000)             then 4
+                 when (0x100..0xffff), (-0x7fff..-0x80)   then 2
+                 when (0..0xff), (-0x7f..0)               then 1
+                 end
       end
 
       #

data/lib/ronin/asm/instruction.rb

@@ -1,7 +1,7 @@
 #
 # Ronin ASM - A Ruby DSL for crafting Assembly programs and Shellcode.
 #
-# Copyright (c) 2007-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2007-2013 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin ASM.
 #

data/lib/ronin/asm/memory_operand.rb

@@ -1,7 +1,7 @@
 #
 # Ronin ASM - A Ruby DSL for crafting Assembly programs and Shellcode.
 #
-# Copyright (c) 2007-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2007-2013 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin ASM.
 #
@@ -28,7 +28,7 @@ module Ronin
     #
     # @see http://asm.sourceforge.net/articles/linasm.html#Memory
     #
-    class MemoryOperand < Struct.new(:base, :offset, :index, :scale)
+    class MemoryOperand < Struct.new(:base, :offset, :index, :scale, :width)
 
       #
       # Creates a new Memory Operand.
@@ -48,7 +48,7 @@ module Ronin
       # @raise [TypeError]
       #   `base` or `index` was not a {Register} or `nil`.
       #
-      def initialize(base=nil,offset=0,index=nil,scale=1)
+      def initialize(base=nil,offset=0,index=nil,scale=1,width=nil)
         unless (base.nil? || base.kind_of?(Register))
           raise(TypeError,"base must be a Register or nil")
         end
@@ -65,7 +65,11 @@ module Ronin
           raise(TypeError,"scale must be an Integer")
         end
 
-        super(base,offset,index,scale)
+        if base
+          width ||= base.width
+        end
+
+        super(base,offset,index,scale,width)
       end
 
       #
@@ -78,7 +82,13 @@ module Ronin
       #   The new Memory Operand.
       #
       def +(offset)
-        MemoryOperand.new(self.base,self.offset+offset,self.index,self.scale)
+        MemoryOperand.new(
+          self.base,
+          self.offset + offset,
+          self.index,
+          self.scale,
+          self.width
+        )
       end
 
       #
@@ -91,17 +101,13 @@ module Ronin
       #   The new Memory Operand.
       #
       def -(offset)
-        MemoryOperand.new(self.base,self.offset-offset,self.index,self.scale)
-      end
-
-      #
-      # The width of the Memory Operand.
-      #
-      # @return [Integer]
-      #   The width taken from the base {Register}.
-      #
-      def width
-        base.width
+        MemoryOperand.new(
+          self.base,
+          self.offset - offset,
+          self.index,
+          self.scale,
+          self.width
+        )
       end
 
     end

data/lib/ronin/asm/os.rb

@@ -1,7 +1,7 @@
 #
 # Ronin ASM - A Ruby DSL for crafting Assembly programs and Shellcode.
 #
-# Copyright (c) 2007-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2007-2013 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin ASM.
 #

data/lib/ronin/asm/os/freebsd.rb

@@ -1,7 +1,7 @@
 #
 # Ronin ASM - A Ruby DSL for crafting Assembly programs and Shellcode.
 #
-# Copyright (c) 2007-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2007-2013 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin ASM.
 #

data/lib/ronin/asm/os/linux.rb

@@ -1,7 +1,7 @@
 #
 # Ronin ASM - A Ruby DSL for crafting Assembly programs and Shellcode.
 #
-# Copyright (c) 2007-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2007-2013 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin ASM.
 #

data/lib/ronin/asm/os/os.rb

@@ -1,7 +1,7 @@
 #
 # Ronin ASM - A Ruby DSL for crafting Assembly programs and Shellcode.
 #
-# Copyright (c) 2007-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2007-2013 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin ASM.
 #

data/lib/ronin/asm/program.rb

@@ -1,7 +1,7 @@
 #
 # Ronin ASM - A Ruby DSL for crafting Assembly programs and Shellcode.
 #
-# Copyright (c) 2007-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2007-2013 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin ASM.
 #
@@ -38,14 +38,14 @@ module Ronin
 
       # Supported Assembly Syntaxs
       SYNTAX = {
-        :att   => Syntax::ATT,
-        :intel => Syntax::Intel
+        att:   Syntax::ATT,
+        intel: Syntax::Intel
       }
 
       # The Assembly Parsers
       PARSERS = {
-        :att   => :gas,
-        :intel => :nasm
+        att:   :gas,
+        intel: :nasm
       }
 
       # The targeted architecture
@@ -94,7 +94,7 @@ module Ronin
       #   The given block will be evaluated within the program.
       #
       # @example
-      #   Program.new(:arch => :amd64) do
+      #   Program.new(arch: :amd64) do
       #     push  rax
       #     push  rbx
       #
@@ -193,53 +193,73 @@ module Ronin
       #
       # Creates an operand of size 1 (byte).
       #
-      # @param [Integer] number
+      # @param [MemoryOperand, Integer] op 
       #   The value of the operand.
       #
-      # @return [ImmediateOperand]
+      # @return [MemoryOperand, ImmediateOperand]
       #   The new operand value.
       #
-      def byte(number)
-        ImmediateOperand.new(number,1)
+      def byte(op)
+        case op
+        when MemoryOperand
+          MemoryOperand.new(op.base,op.offset,op.index,op.scale,1)
+        else
+          ImmediateOperand.new(op,1)
+        end
       end
 
       #
       # Creates a operand of size 2 (bytes).
       #
-      # @param [Integer] number
+      # @param [MemoryOperand, Integer] op
       #   The value of the operand.
       #
-      # @return [ImmediateOperand]
+      # @return [MemoryOperand, ImmediateOperand]
       #   The new operand value.
       #
-      def word(number)
-        ImmediateOperand.new(number,2)
+      def word(op)
+        case op
+        when MemoryOperand
+          MemoryOperand.new(op.base,op.offset,op.index,op.scale,2)
+        else
+          ImmediateOperand.new(op,2)
+        end
       end
 
       #
       # Creates a operand of size 4 (bytes).
       #
-      # @param [Integer] number
+      # @param [MemoryOperand, Integer] op
       #   The value of the operand.
       #
       # @return [ImmediateOperand]
       #   The new operand value.
       #
-      def dword(number)
-        ImmediateOperand.new(number,4)
+      def dword(op)
+        case op
+        when MemoryOperand
+          MemoryOperand.new(op.base,op.offset,op.index,op.scale,4)
+        else
+          ImmediateOperand.new(op,4)
+        end
       end
 
       #
       # Creates a operand of size 8 (bytes).
       #
-      # @param [Integer] number
+      # @param [MemoryOperand, Integer] op
       #   The value of the operand.
       #
-      # @return [ImmediateOperand]
+      # @return [MemoryOperand, ImmediateOperand]
       #   The new operand.
       #
-      def qword(number)
-        ImmediateOperand.new(number,8)
+      def qword(op)
+        case op
+        when MemoryOperand
+          MemoryOperand.new(op.base,op.offset,op.index,op.scale,8)
+        else
+          ImmediateOperand.new(op,8)
+        end
       end
 
       #
@@ -318,15 +338,15 @@ module Ronin
       #
       # Generic method for setting a register.
       #
-      # @param [Register, Immediate, Integer] value
-      #   The new value for the register.
-      #
       # @param [Symbol] name
       #   The name of the reigster.
       #
+      # @param [Register, Immediate, Integer] value
+      #   The new value for the register.
+      #
       # @abstract
       #
-      def register_set(value,name)
+      def register_set(name,value)
       end
 
       #
@@ -386,10 +406,17 @@ module Ronin
       # @param [Symbol] syntax
       #   The syntax to compile the program to.
       #
-      def to_asm(syntax=:att)
+      def to_asm(syntax=:intel)
         SYNTAX[syntax].emit_program(self)
       end
 
+      #
+      # @see #to_s
+      #
+      def to_s
+        to_asm
+      end
+
       #
       # Assembles the program.
       #
@@ -399,7 +426,7 @@ module Ronin
       # @param [Hash] options
       #   Additional options.
       #
-      # @option options [Symbol, String] :syntax (:att)
+      # @option options [Symbol, String] :syntax (:intel)
       #   The syntax to compile the program to.
       #
       # @option options [Symbol] :format (:bin)
@@ -424,7 +451,7 @@ module Ronin
       #   The path to the assembled program.
       #
       def assemble(output,options={})
-        syntax  = options.fetch(:syntax,:att)
+        syntax  = options.fetch(:syntax,:intel)
         format  = options.fetch(:format,:bin)
         parser  = PARSERS[syntax]
 
@@ -433,11 +460,11 @@ module Ronin
         source.close
 
         YASM::Program.assemble(
-          :file          => source.path,
-          :parser        => PARSERS[syntax],
-          :target        => @arch,
-          :output_format => format,
-          :output        => output
+          file:          source.path,
+          parser:        PARSERS[syntax],
+          target:        @arch,
+          output_format: format,
+          output:        output
         )
 
         return output

data/lib/ronin/asm/register.rb

@@ -1,7 +1,7 @@
 #
 # Ronin ASM - A Ruby DSL for crafting Assembly programs and Shellcode.
 #
-# Copyright (c) 2007-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2007-2013 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin ASM.
 #

data/lib/ronin/asm/shellcode.rb

@@ -1,7 +1,7 @@
 #
 # Ronin ASM - A Ruby DSL for crafting Assembly programs and Shellcode.
 #
-# Copyright (c) 2007-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2007-2013 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin ASM.
 #
@@ -60,7 +60,7 @@ module Ronin
       def assemble(options={})
         output = Tempfile.new(['ronin-shellcode', '.bin']).path
 
-        super(output,options.merge(:format => :bin))
+        super(output,options.merge(format: :bin))
 
         return File.new(output,'rb').read
       end

data/lib/ronin/asm/syntax.rb

@@ -1,7 +1,7 @@
 #
 # Ronin ASM - A Ruby DSL for crafting Assembly programs and Shellcode.
 #
-# Copyright (c) 2007-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2007-2013 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin ASM.
 #

data/lib/ronin/asm/syntax/att.rb

@@ -1,7 +1,7 @@
 #
 # Ronin ASM - A Ruby DSL for crafting Assembly programs and Shellcode.
 #
-# Copyright (c) 2007-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2007-2013 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin ASM.
 #
@@ -87,6 +87,23 @@ module Ronin
           return asm
         end
 
+        #
+        # Emits multiple operands.
+        #
+        # @param [Array<ImmediateOperand, MemoryOperand, Register, Symbol>] ops
+        #   The Array of operands.
+        #
+        # @return [String]
+        #   The formatted operands.
+        #
+        def self.emit_operands(ops)
+          if ops.length > 1
+            [*ops[1..-1], ops[0]].map { |op| emit_operand(op) }.join(",\t")
+          else
+            super(ops)
+          end
+        end
+
         #
         # Emits an instruction.
         #
@@ -111,23 +128,33 @@ module Ronin
         end
 
         #
-        # Emits a program.
+        # Emits a section name.
+        #
+        # @param [Symbol] name
+        #   The section name.
+        #
+        # @return [String]
+        #   The formatted section name.
+        #
+        # @since 0.2.0
+        #
+        def self.emit_section(name)
+          ".#{name}"
+        end
+
+        #
+        # Emits the program's prologue.
         #
         # @param [Program] program
         #   The program.
         #
         # @return [String]
-        #   The formatted program.
+        #   The formatted prologue.
         #
-        def self.emit_program(program)
-          asm = super(program)
-
-          # prepend the `.code64` directive for YASM
-          if program.arch == :amd64
-            asm = [".code64", '', asm].join($/)
-          end
-
-          return asm
+        # @since 0.2.0
+        #
+        def self.emit_prologue(program)
+          ".code#{BITS[program.arch]}"
         end
 
       end