ronin-asm 0.1.0 → 0.2.0

data/spec/{syntax → asm/syntax}/att_spec.rb

@@ -93,7 +93,7 @@ describe ASM::Syntax::ATT do
     context "with multiple operands" do
       let(:register)    { Register.new(:eax, 4) }
       let(:immediate)   { ImmediateOperand.new(0xff, 1)  }
-      let(:instruction) { Instruction.new(:mov, [immediate, register]) }
+      let(:instruction) { Instruction.new(:mov, [register, immediate]) }
 
       it "should add a size specifier to the instruction name" do
         subject.emit_instruction(instruction).should =~ /^movl/
@@ -105,10 +105,16 @@ describe ASM::Syntax::ATT do
     end
   end
 
+  describe "emit_section" do
+    it "should emit the section name" do
+      subject.emit_section(:text).should == ".text"
+    end
+  end
+
   describe "emit_program" do
     let(:program) do
       Program.new do
-        mov 0xff, eax
+        mov eax, 0xff
         ret
       end
     end
@@ -117,6 +123,8 @@ describe ASM::Syntax::ATT do
       asm = subject.emit_program(program)
 
       asm.should == [
+        ".code32",
+        ".text",
         "_start:",
         "\tmovl\t$0xff,\t%eax",
         "\tret",
@@ -127,7 +135,7 @@ describe ASM::Syntax::ATT do
     context "when emitting labels" do
       let(:program) do
         Program.new do
-          mov 0, eax
+          mov eax, 0
 
           _loop do
             inc eax
@@ -141,11 +149,13 @@ describe ASM::Syntax::ATT do
 
       it "should emit both labels and instructions" do
         subject.emit_program(program).should == [
+          ".code32",
+          ".text",
           "_start:",
           "\tmovl\t$0x0,\t%eax",
           "_loop:",
           "\tincl\t%eax",
-          "\tcmpl\t%eax,\t$0xa",
+          "\tcmpl\t$0xa,\t%eax",
           "\tjl\t_loop",
           "\tret",
           ""
@@ -155,7 +165,7 @@ describe ASM::Syntax::ATT do
 
     context "when the program arch is :amd64" do
       let(:program) do
-        Program.new(:arch => :amd64) do
+        Program.new(arch: :amd64) do
           push rax
           push rbx
           mov 0xff, rax

data/spec/{syntax → asm/syntax}/intel_spec.rb

@@ -34,6 +34,14 @@ describe ASM::Syntax::Intel do
       subject.emit_memory_operand(operand).should == "[eax]"
     end
 
+    context "when operand width does not match the base width" do
+      before { operand.width = 2 }
+
+      it "should specify the width" do
+        subject.emit_memory_operand(operand).should == "WORD [eax]"
+      end
+    end
+
     context "with an offset" do
       let(:offset)  { 255 }
       let(:operand) { MemoryOperand.new(register,offset) }
@@ -82,7 +90,7 @@ describe ASM::Syntax::Intel do
     context "with multiple operands" do
       let(:register)    { Register.new(:eax, 4) }
       let(:immediate)   { ImmediateOperand.new(0xff, 1)  }
-      let(:instruction) { Instruction.new(:mov, [immediate, register]) }
+      let(:instruction) { Instruction.new(:mov, [register, immediate]) }
 
       it "should emit the operands" do
         subject.emit_instruction(instruction).should == "mov\teax,\tBYTE 0xff"
@@ -90,10 +98,16 @@ describe ASM::Syntax::Intel do
     end
   end
 
+  describe "emit_section" do
+    it "should emit the section name" do
+      subject.emit_section(:text).should == "section .text"
+    end
+  end
+
   describe "emit_program" do
     let(:program) do
       Program.new do
-        mov 0xff, eax
+        mov eax, 0xff
         ret
       end
     end
@@ -102,6 +116,8 @@ describe ASM::Syntax::Intel do
       asm = subject.emit_program(program)
 
       asm.should == [
+        "BITS 32",
+        "section .text",
         "_start:",
         "\tmov\teax,\tBYTE 0xff",
         "\tret",
@@ -112,7 +128,7 @@ describe ASM::Syntax::Intel do
     context "when emitting labels" do
       let(:program) do
         Program.new do
-          mov 0, eax
+          mov eax, 0
 
           _loop do
             inc eax
@@ -126,11 +142,13 @@ describe ASM::Syntax::Intel do
 
       it "should emit both labels and instructions" do
         subject.emit_program(program).should == [
+          "BITS 32",
+          "section .text",
           "_start:",
           "\tmov\teax,\tBYTE 0x0",
           "_loop:",
           "\tinc\teax",
-          "\tcmp\tBYTE 0xa,\teax",
+          "\tcmp\teax,\tBYTE 0xa",
           "\tjl\t_loop",
           "\tret",
           ""
@@ -140,10 +158,10 @@ describe ASM::Syntax::Intel do
 
     context "when the program arch is :amd64" do
       let(:program) do
-        Program.new(:arch => :amd64) do
+        Program.new(arch: :amd64) do
           push rax
           push rbx
-          mov 0xff, rax
+          mov  rax, 0xff
           ret
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ronin-asm
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-27 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: data_paths
@@ -85,9 +85,10 @@ extra_rdoc_files:
 - README.md
 files:
 - .document
-- .gemtest
 - .gitignore
 - .rspec
+- .ruby-version
+- .travis.yml
 - .yardopts
 - COPYING.txt
 - ChangeLog.md
@@ -122,18 +123,17 @@ files:
 - lib/ronin/asm/syntax/intel.rb
 - lib/ronin/asm/version.rb
 - ronin-asm.gemspec
-- spec/asm_spec.rb
-- spec/helpers/database.rb
-- spec/immediate_operand_spec.rb
-- spec/instruction_spec.rb
-- spec/memory_operand_spec.rb
-- spec/program_spec.rb
-- spec/register_spec.rb
-- spec/shellcode_spec.rb
+- spec/asm/asm_spec.rb
+- spec/asm/immediate_operand_spec.rb
+- spec/asm/instruction_spec.rb
+- spec/asm/memory_operand_spec.rb
+- spec/asm/program_spec.rb
+- spec/asm/register_spec.rb
+- spec/asm/shellcode_spec.rb
+- spec/asm/syntax/att_spec.rb
+- spec/asm/syntax/common_spec.rb
+- spec/asm/syntax/intel_spec.rb
 - spec/spec_helper.rb
-- spec/syntax/att_spec.rb
-- spec/syntax/common_spec.rb
-- spec/syntax/intel_spec.rb
 homepage: https://github.com/ronin-ruby/ronin-asm#readme
 licenses:
 - GPL-3
@@ -146,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - yasm >= 0.6.0
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A Ruby DSL for crafting Assembly programs and Shellcode.

data/spec/helpers/database.rb

@@ -1,7 +0,0 @@
-require 'ronin/database'
-
-require 'spec_helper'
-
-module Helpers
-  Database.setup(ENV['DATABASE'] || 'sqlite3::memory:')
-end