wilson 1.0.0 → 1.0.1

data.tar.gz.sig

@@ -0,0 +1,2 @@
+c:�gfL���nr��U5�!
+�����7�-�g*�[����"���Wg���m�]�F�����/���v��]O6�%;�+���Σ=�HD��Dh`I��SA#�6�ҥBA�ѧ|R��_I6�sr��P�S���:�v�ϕi�K".�P2|2��xҪ���<�]��e�9�������P��n���SQw9�-S����w�~7�_�!R]sK.�#��ۭ��\��KK�$�3�X��7E:����%.B��`

data/History.txt

@@ -1,3 +1,14 @@
+=== 1.0.1 / 2009-04-22
+
+* 3 minor enhancements:
+
+  * Added bench.rb to demonstrate timings.
+  * Added example.rb.
+
+* 1 bug fix:
+
+  * Fixed defasm to work much better.
+
 === 1.0.0 / 2009-01-20
 
 * 1 major enhancement

data/Manifest.txt

@@ -2,5 +2,7 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
+bench.rb
+example.rb
 lib/wilson.rb
 test/test_wilson.rb

data/Rakefile

@@ -4,68 +4,16 @@ require 'rubygems'
 require 'hoe'
 require './lib/wilson.rb'
 
-h=Hoe.new('wilson', Wilson::VERSION) do |p|
+Hoe.new('wilson', Wilson::VERSION) do |p|
   p.rubyforge_name = 'seattlerb'
   p.developer('Ryan Davis', 'ryand-ruby@zenspider.com')
 end
 
-class Hoe
-  def test_cmd flavor = nil
-    msg = flavor ? :sh : :ruby
-    tests = ["rubygems", self.testlib] +
-      test_globs.map { |g| Dir.glob(g) }.flatten
-    tests.map! {|f| %Q(require "#{f}")}
-    cmd = "#{RUBY_FLAGS} -e '#{tests.join("; ")}' #{FILTER}"
-
-    ENV['EXCLUDED_VERSIONS'] = multiruby_skip.join(":")
-
-    cmd = "#{flavor} #{cmd}" if flavor
-
-    return msg, cmd
-  end
-end
-
-# def run_tests(multi=false) # :nodoc:
-#   msg = multi ? :sh : :ruby
-#   cmd = if test ?f, 'test/test_all.rb' then
-#           "#{RUBY_FLAGS} test/test_all.rb #{FILTER}"
-#         else
-#           tests = ["rubygems", self.testlib] +
-#             test_globs.map { |g| Dir.glob(g) }.flatten
-#           tests.map! {|f| %Q(require "#{f}")}
-#           "#{RUBY_FLAGS} -e '#{tests.join("; ")}' #{FILTER}"
-#         end
-#
-#   excludes = multiruby_skip.join(":")
-#   ENV['EXCLUDED_VERSIONS'] = excludes
-#   cmd = "multiruby #{cmd}" if multi
-#
-#   send msg, cmd
-# end
-
 namespace :test do
   desc "profiles your tests"
   task :prof do
     send(*h.test_cmd(:zenprofile))
   end
-
-  desc "rcov your tests"
-  task :rcov do
-    raise "not yet"
-  end
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |t|
-    pattern = ENV['PATTERN'] || 'test/test_*.rb'
-
-    t.test_files = FileList[pattern]
-    t.verbose = true
-    t.rcov_opts << "--threshold 80"
-    t.rcov_opts << "--no-color"
-  end
-rescue LoadError
-  # skip
-end
 # vim: syntax=Ruby

data/bench.rb

@@ -0,0 +1,128 @@
+#!/usr/bin/ruby -w
+
+# % rm -r ~/.ruby_inline; ./bench.rb 1_000_000 1_000
+# # of iterations = 1000000
+#                           user     system      total        real
+# null_time             0.130000   0.000000   0.130000 (  0.123534)
+# c-nil                 0.280000   0.000000   0.280000 (  0.284030)
+# asm-nil               0.270000   0.000000   0.270000 (  0.278700)
+# c                     0.830000   0.010000   0.840000 (  0.841285)
+# asm2                  0.840000   0.000000   0.840000 (  0.842834)
+# asm                   3.510000   0.010000   3.520000 (  3.543986)
+# ruby                 89.790000   0.200000  89.990000 ( 90.653678)
+
+$: << 'lib'
+require 'wilson'
+require 'rubygems'
+require 'inline'
+require 'benchmark'
+
+max = (ARGV.shift || 10_000_000).to_i
+$n  = (ARGV.shift || 10).to_i
+
+class Counter
+  inline do |builder|
+    builder.c "VALUE cee_nil() { return Qnil;}"
+    builder.c "long cee() { long i; for (i = 0;i<#{$n};i++) {}; return i;}"
+  end
+
+  # 00000f7a  pushl %ebp
+  # 00000f7b  xorl  %eax,%eax
+  # 00000f7d  movl  %esp,%ebp
+  # 00000f7f  incl  %eax
+  # 00000f80  cmpl  $0x000003e8,%eax
+  # 00000f85  jne 0x00000f7f
+  # 00000f87  leave
+  # 00000f88  movw  $0x07d1,%ax
+  # 00000f8c  ret
+
+  defasm :asm_nil do
+    eax.mov 4
+  end
+
+  defasm :asm do
+    eax.mov 0
+    ecx.mov $n
+    count = self.label
+    eax.add 1
+    count.loop
+
+    eax.add eax # fixnum: n + n + 1
+    eax.inc
+  end
+
+  # 00000000  55                push ebp
+  # 00000001  89E5              mov ebp,esp
+  # 00000003  56                push esi
+  # 00000004  57                push edi
+  # 00000005  B800000000        mov eax,0x0
+  # 0000000A  B910270000        mov ecx,0x2710
+  # 0000000F  83C001            add eax,byte +0x1
+  # 00000012  E2FB              loop 0xf
+  # 00000014  01C0              add eax,eax
+  # 00000016  40                inc eax
+  # 00000017  5F                pop edi
+  # 00000018  5E                pop esi
+  # 00000019  C9                leave
+  # 0000001A  C3                ret
+
+  defasm :asm2 do
+    eax.mov 0
+    count = self.label
+    eax.inc
+    eax.cmp $n
+    jne count
+
+    eax.add eax # fixnum: n + n + 1
+    eax.inc
+  end
+
+  # 00000000  55                push ebp
+  # 00000001  89E5              mov ebp,esp
+  # 00000003  B800000000        mov eax,0x0
+  # 00000008  40                inc eax
+  # 00000009  3DE8030000        cmp eax,0x3e8
+  # 0000000E  75F8              jnz 0x8
+  # 00000010  01C0              add eax,eax
+  # 00000012  40                inc eax
+  # 00000013  C9                leave
+  # 00000014  C3                ret
+
+  def ruby_nil
+    nil
+  end
+
+  def ruby
+    $n.times do; end
+  end
+end
+
+counter = Counter.new
+
+raise "bad c_nil"   unless counter.cee_nil.nil?
+raise "bad asm_nil" unless counter.asm_nil.nil?
+raise "bad c"       unless counter.cee  == $n
+raise "bad asm2"    unless counter.asm2 == $n
+raise "bad asm"     unless counter.asm  == $n
+raise "bad ruby"    unless counter.ruby == $n
+
+puts "# of iterations = #{max}"
+puts "$n = #{$n}"
+puts
+Benchmark::bm(20) do |x|
+  x.report("null_time") do
+    for i in 0..max do
+      # do nothing
+    end
+  end
+
+  %w(cee_nil asm_nil ruby_nil cee asm2 asm ruby).each do |name|
+    eval "
+      x.report(#{name.inspect}) do
+        for i in 0..max do
+          counter.#{name}
+        end
+      end
+    "
+  end
+end

data/example.rb

@@ -0,0 +1,216 @@
+#!/usr/bin/ruby -w
+
+require 'test/unit'
+$: << 'lib'
+require 'wilson'
+
+class Examples
+  defasm :count_to_ten do
+    eax.mov 0
+    ecx.mov 10
+    count = self.label
+    eax.add 1
+    count.loop
+
+    to_ruby eax
+  end
+
+  defasm :three_plus_four do
+    eax.mov 3
+    eax.add 4
+
+    # convert machine fixnum to ruby fixnum. aka: ((x << 1) + 1)
+    to_ruby eax
+  end
+
+  defasm :jump_forward do
+    future = self.future_label
+    eax.xor eax
+    future.jmp
+    eax.inc
+    future.plant
+  end
+
+  defasm :first_in_array, :array do
+    # edx.mov array
+    # eax.xor eax
+    # al.mov edx
+  end
+
+  defasm :add, :a, :b do
+    # eax.mov a
+    # eax.add b
+  end
+
+  defasm :sum, :array, :len do
+    # edx.mov array
+    # ecx.mov len
+    # ecx.dec
+    # eax.xor eax
+    # al.add edx
+
+    # repeat = self.label
+    #   al.add edx + ecx
+    # repeat.loop
+  end
+end
+
+class TestExamples < Test::Unit::TestCase
+  def setup
+    warn name
+    @x = Examples.new
+  end
+
+  def test_three_plus_four
+    assert_equal 7, @x.three_plus_four
+  end
+
+  def test_three_plus_four_again
+    assert_equal 7, @x.three_plus_four
+  end
+
+  def test_jump_forward
+    assert_equal false, @x.jump_forward
+  end
+
+  def test_three_plus_four_again_again
+    assert_equal 7, @x.three_plus_four
+  end
+
+  def test_jump_forward_again
+    assert_equal false, @x.jump_forward
+  end
+
+  def test_count_to_ten
+    expect = 10
+    actual = @x.count_to_ten
+    assert_equal expect, actual #
+  end
+
+  def test_add
+    # assert_equal 7, @x.add(3, 4)
+  end
+
+  def test_first_in_array
+    # array = [5, 6, 7, 8, 9, 100]
+    # assert_equal 5, @x.first_in_array(array)
+  end
+
+  def test_sum
+    # | array |
+    # array = #[ 5 6 7 8 9 100 ] gc_copy_to_heap
+    # self assert: (Sum call_with: array with: 5) = 35
+  end
+end
+
+class ARC4
+  # ARC4 API
+
+  # encryptInPlace: byteArray length: length
+  #     | array |
+  #     array = byteArray gcCopyToHeap
+  #     self encryptArrayOnHeap: array length: length
+  #     array copyAt: 0 to: byteArray size: length startingAt: 1
+
+  # encrypt: string
+  #     | array result |
+  #     array = string gcCopyToHeap
+  #     self encryptArrayOnHeap: array length: string size
+  #     result = ByteArray new: string size
+  #     array copyAt: 0 to: result size: string size startingAt: 1
+  #     ^result
+
+  # setKey: key
+  #     self s: (Security.ARC4 new setKey: key asByteArray) s i: 0 j: 0
+
+  # encryptArrayOnHeap: array length: length
+  #     | args |
+  #     args = Array new: 5
+  #     args at: 1 put: array
+  #     args at: 2 put: length
+  #     args at: 3 put: s
+  #     args at: 4 put: i
+  #     args at: 5 put: j
+  #     ARC4Encrypt type baseType call: ARC4Encrypt withArguments: args
+
+  # ARC4 assembler
+
+  # repeat: times do: aBlock
+  #     | repeat |
+  #     ecx mov: times
+  #     repeat = self label
+  #         ecx push
+  #         aBlock value
+  #         ecx pop
+  #     repeat loop
+
+  # arc4_encrypt: pArray len: len s: pS i: pI j: pJ
+  #     <asm: void ARC4Encrypt( unsigned char* array, unsigned int len, unsigned char* s, unsigned int* i, unsigned int* j)>
+  # "   edi = current character of @array that we're encrypting
+  #     esi = address of @s keystream
+  #     ecx = @len counting down
+  #     eax = current math
+  #     ebx = @i
+  #     edx = @j
+  #     current character to be encoded = [edi]
+  #     current character at s[i] = [esi+ebx]
+  #     current character at s[j] = [esi+edx]
+  # "
+  #     ebx get: pI
+  #     edx get: pJ
+  #     esi mov: pS
+  #     edi mov: pArray
+  #     self repeat: len do: [
+  #         bl inc. "i = (i + 1) mod: 255"
+  #         al mov: [esi+ebx]. "si = s[i]"
+  #         dl add: [esi+ebx]. "j = (j + s[i]) mod 256"
+  #         cl mov: [esi+edx]. "sj = s[j]"
+  #         "swap S[i] and S[j]"
+  #         [esi+edx] mov: al. "s[j] = si"
+  #         [esi+ebx] mov: cl. "s[i] = sj"
+  #         al add: cl. "s[i] + s[j]"
+  #         al mov: [esi+eax]. "s[s] mod 256"
+  #         "array ^ s[s]"
+  #         al xor: [edi]
+  #         [edi] mov: al
+  #         edi add: 1
+  #     ]
+  #     eax mov: pI
+  #     [eax] mov: ebx
+  #     eax mov: pJ
+  #     [eax] mov: edx
+
+  # ARC4 initialize-release
+
+  # s: anS i: aI j: aJ
+  #     s = anS gcCopyToHeap
+  #     i = aI gcCopyToHeap
+  #     j = aJ gcCopyToHeap
+end
+
+class TestARC4 < Test::Unit::TestCase
+  # ARC4Test testing
+
+  def testAttackAtDawn
+    #     | encrypted |
+    #     encrypted = ARC4 new setKey: 'Secret'; encrypt: 'Attack at dawn'
+    #     self assert: (self decrypt: encrypted key: 'Secret') = 'Attack at dawn'
+
+    # decrypt: array key: key
+    #     | arc4 |
+    #     (arc4 = Security.ARC4 new) setKey: key asByteArray
+    #     ^(array collect: [:e | arc4 decryptByte: e]) asString
+  end
+
+  def testPlaintext
+    #     | encrypted |
+    #     encrypted = ARC4 new setKey: 'Key'; encrypt: 'Plaintext'
+    #     self assert: (self decrypt: encrypted key: 'Key') = 'Plaintext'
+  end
+
+  def testWikipedia
+    #     | encrypted |
+    #     encrypted = ARC4 new setKey: 'Wiki'; encrypt: 'pedia'
+    #     self assert: (self decrypt: encrypted key: 'Wiki') = 'pedia'
+  end
+end

data/lib/wilson.rb

@@ -29,17 +29,18 @@ class Integer
   end
 end
 
-class Module
-  @@asm = []
+ASM = []
 
+class Module
   def defasm name, *args, &block
     asm = Wilson::MachineCodeX86.new
 
     asm.ebp.push
-    # asm.esi.push # TODO?
-    # asm.edi.push
     asm.ebp.mov asm.esp
 
+    asm.esi.push
+    asm.edi.push
+
     size = asm.stream.size
 
     asm.instance_eval(&block)
@@ -49,17 +50,30 @@ class Module
       asm.eax.mov 4
     end
 
-    # asm.edi.pop
-    # asm.esi.pop
-    # asm.ebp.pop
+    asm.edi.pop
+    asm.esi.pop
 
     asm.leave
     asm.ret
 
     code = asm.stream.pack("C*")
-    @@asm << code
 
-    Ruby.rb_define_method self, name.to_s, code, 0
+    if $DEBUG then
+      path = "#{name}.obj"
+      File.open path, "wb" do |f|
+        f.write code
+      end
+
+      p name
+      puts code.unpack("C*").map { |n| "%02X" % n }.join(' ')
+      system "ndisasm -u #{path}"
+
+      File.unlink path
+    end
+
+    ptr  = code.to_ptr
+    ASM << ptr
+    Ruby.rb_define_method self, name.to_s, ptr, 0
   end
 end
 
@@ -109,7 +123,7 @@ class Array
 end
 
 module Wilson
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 
   ##
   # Assembler parses the NASM documentation and creates Command
@@ -581,7 +595,7 @@ module Wilson
   ##
   # MachineCode is an abstract machine that has subclasses for each
   # concrete machine type that you can write assembly language for.
-  # Right now this library only supports X86, so loko at
+  # Right now this library only supports X86, so look at
   # MachineCodeX86 for more details on how to use it.
 
   class MachineCode
@@ -848,6 +862,11 @@ module Wilson
       self.esi = Register.on_id_bits self, 6, 32
       self.edi = Register.on_id_bits self, 7, 32
     end
+
+    def to_ruby reg
+      reg.add reg
+      reg.inc
+    end
   end
 
   ##

metadata

@@ -1,15 +1,36 @@
 --- !ruby/object:Gem::Specification 
 name: wilson
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Ryan Davis
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDPjCCAiagAwIBAgIBADANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
+  GRYDY29tMB4XDTA5MDMwNjE4NTMxNVoXDTEwMDMwNjE4NTMxNVowRTETMBEGA1UE
+  AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
+  JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
+  b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
+  taCPaLmfYIaFcHHCSY4hYDJijRQkLxPeB3xbOfzfLoBDbjvx5JxgJxUjmGa7xhcT
+  oOvjtt5P8+GSK9zLzxQP0gVLS/D0FmoE44XuDr3iQkVS2ujU5zZL84mMNqNB1znh
+  GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
+  qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
+  gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
+  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
+  AQAY59gYvDxqSqgC92nAP9P8dnGgfZgLxP237xS6XxFGJSghdz/nI6pusfCWKM8m
+  vzjjH2wUMSSf3tNudQ3rCGLf2epkcU13/rguI88wO6MrE0wi4ZqLQX+eZQFskJb/
+  w6x9W1ur8eR01s397LSMexySDBrJOh34cm2AlfKr/jokKCTwcM0OvVZnAutaovC0
+  l1SVZ0ecg88bsWHA0Yhh7NFxK1utWoIhtB6AFC/+trM0FQEB/jZkIS8SaNzn96Rl
+  n0sZEf77FLf5peR8TP/PtmIg7Cyqz23sLM4mCOoTGIy5OcZ8TdyiyINUHtb5ej/T
+  FBHgymkyj/AOSqKRIpXPhjC6
+  -----END CERTIFICATE-----
 
-date: 2009-01-20 00:00:00 -08:00
+date: 2009-04-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,9 +41,15 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.3
+        version: 1.12.2
     version: 
-description: Wilson is a pure ruby x86 assembler. No, really. Worst Idea Evar.  Why "wilson"? I wanted to name it "metal", but there is an existing project with that name... So I'm naming it after Wilson Bilkovich, who is about as metal as you can get (and it is easier to spell than "bilkovich", even tho that sounds more metal).
+description: |-
+  Wilson is a pure ruby x86 assembler. No, really. Worst Idea Evar.
+  
+  Why "wilson"? I wanted to name it "metal", but there is an existing
+  project with that name... So I'm naming it after Wilson Bilkovich, who
+  is about as metal as you can get (and it is easier to spell than
+  "bilkovich", even tho that sounds more metal).
 email: 
 - ryand-ruby@zenspider.com
 executables: []
@@ -38,10 +65,14 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
+- bench.rb
+- example.rb
 - lib/wilson.rb
 - test/test_wilson.rb
 has_rdoc: true
 homepage: http://rubyforge.org/projects/seattlerb
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -63,9 +94,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Wilson is a pure ruby x86 assembler
 test_files: 
 - test/test_wilson.rb

metadata.gz.sig

@@ -0,0 +1 @@
+�����GXo�����������Ut������{t=�b��_C>H>�Q�ݘ�w��;�5+��°Ut^�{��"}��<���k���h0���$j�G4g��&��͒u�[�j�$]r@׵8g
�#)V�!� �ԧ�D��Bf}c�Fv-�5���?(;p�9s�g����^��f~r�~�<����'_$�*�E�՞��h�Y�3����T43�8og����CNh7R��t柨�Iy�d
*c�*O��9�