bitescript 0.0.8 → 0.0.9

data/History.txt

@@ -1,3 +1,23 @@
+=== 0.0.9 / 2011-07-11
+
+62a10d2 Update time format in gemspec
+0d37ff9 Update hello_world_macro.bs example
+3b24a1d Fix TypeError in bytecode.rb with --1.9
+96dfbef Merge pull request #5 from baroquebobcat/fixing_test_method_insns_deltas
+2b06833 Merge pull request #4 from baroquebobcat/fix_bytecode_version_test
+501863d Merge pull request #6 from baroquebobcat/continue_to_work_when_asm_4.0_is_unavailable
+a4b82aa only define mh_* if those opcodes are present
+a556514 rescue + note around MethodHandle java import
+11472c7 copy and paste of sig_stack_net had a small bug. This fixes it
+d5a7e4d default is now dynamic depending on java version used
+7beeb5a Ask ASM to compute frames too.
+a9e1c61 Fix ASM package juggling for proper pre-1.6.0.RC2 package.
+c840664 Get invokedynamic support working.
+801bea4 Add args length checking to fib script, since it's always confusing to get ArrayIndexOutOfBounds.
+b537df1 Replace Label#set! calls with forward-referencing symbols.
+3bf6f98 Replace confusing load_time macro with current_time
+130bda6 Add .redcar to .gitignore.
+
 === 0.0.8 / 2011-03-05
 
 * Support parsing of generic signatures

data/bitescript.gemspec

@@ -2,9 +2,9 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bitescript}
-  s.version = "0.0.8"
+  s.version = "0.0.9"
   s.authors = ["Charles Oliver Nutter", "Ryan Brown"]
-  s.date = Time.now.strftime('YYYY-MM-DD')
+  s.date = Time.now.strftime('%Y-%m-%d')
   s.description = %q{BiteScript is a Ruby DSL for generating Java bytecode and classes.}
   s.email = ["headius@headius.com", "ribrdb@gmail.com"]
   s.executables = ["bite", "bitec"]

data/examples/fib.bs

@@ -7,23 +7,34 @@ macro :lprintln do |i|
   invokevirtual java.io.PrintStream, "println", [void, long]
 end
 
-macro :load_time do
+macro :current_time do
   invokestatic System, "currentTimeMillis", long
 end
 
 macro :start_timing do |i|
-  load_time
+  current_time
   lstore i
 end
 
 macro :end_timing do |i|
-  load_time
+  current_time
   lload i
   lsub
   lstore i
 end
 
-macro :load_times do
+macro :load_iters do
+  # check args length
+  aload 0
+  arraylength
+  ifne :ok_iters
+  ldc "Usage: bite fib.bs <iters>"
+  aprintln
+  ldc 1
+  invokestatic System, 'exit', [void, int]
+  
+  # args length ok
+  label :ok_iters
   aload 0
   ldc 0
   aaload # number of times
@@ -31,7 +42,7 @@ macro :load_times do
 end
 
 main do
-  load_times
+  load_iters
   istore 1
 
   ldc "Raw bytecode fib(45) performance:"
@@ -39,8 +50,7 @@ main do
 
   label :top
   iload 1
-  done = label
-  ifeq done
+  ifeq :done
   iinc 1, -1
 
   start_timing 2
@@ -54,18 +64,17 @@ main do
   lprintln 2
   goto :top
 
-  done.set!
+  label :done
   returnvoid
 end
 
 public_static_method "fib", [], int, int do
   iload 0
   ldc 2
-  recurse = label
-  if_icmpge recurse
+  if_icmpge :recurse
   iload 0
   ireturn
-  recurse.set!
+  label :recurse
   iload 0
   ldc 1
   isub

data/examples/hello_world_macro.bs

@@ -4,20 +4,24 @@ import java.io.PrintStream
 macro :aprintln do
   getstatic System, :out, PrintStream
   swap
-  invokevirtual PrintStream, println, [Object]
+  invokevirtual PrintStream, "println", [void, object]
 end
 
 macro :aprint do
   getstatic System, :out, PrintStream
   swap
-  invokevirtual PrintStream, print, [Object]
+  invokevirtual PrintStream, "print", [void, object]
 end
 
 main do
   ldc "Hello, "
   aprint
+
+  # Get first argument from command line
   aload 0
-  aaload 0
+  ldc 0
+  aaload
+
   aprintln
   returnvoid
 end

data/examples/invokedynamic.bs

@@ -0,0 +1,41 @@
+import java.lang.invoke.MethodHandle
+import java.lang.invoke.MethodType
+import java.lang.invoke.CallSite
+import java.lang.invoke.ConstantCallSite
+import java.lang.invoke.MethodHandles::Lookup
+JClass = java.lang.Class
+
+# Our main method, which does one invokedynamic
+main do
+  # handle for our bootstrap, which binds invokedynamic to a CallSite
+  bootstrap = mh_invokestatic this, 'bootstrap', CallSite, Lookup, string, MethodType
+
+  ldc 'Hello, invokedynamic!'
+  invokedynamic 'print', [void, string], bootstrap
+  returnvoid
+end
+
+# The method we want to invoke, prints given string
+public_static_method :print, [], void, string do
+  aload 0
+  aprintln
+  returnvoid
+end
+
+# The bootstrap method, which binds our dynamic call
+public_static_method :bootstrap, [], CallSite, Lookup, string, MethodType do
+  # Constant since we bind just once directly
+  new ConstantCallSite
+  dup
+
+  # Locate the method indicated by name + type on current class
+  aload 0   # Lookup
+  ldc this  # this class
+  aload 1   # String
+  aload 2   # MethodType
+  invokevirtual Lookup, 'findStatic', [MethodHandle, JClass, string, MethodType]
+
+  # finish constructing call site and return
+  invokespecial ConstantCallSite, '<init>', [void, MethodHandle]
+  areturn
+end

data/lib/bitescript.rb

@@ -15,6 +15,8 @@ module BiteScript
   class << self
     attr_accessor :bytecode_version
 
-    BiteScript.bytecode_version = JAVA1_4
+    # Default to JVM version we're running on
+    spec_version = ENV_JAVA['java.specification.version']
+    BiteScript.bytecode_version = BiteScript.const_get("JAVA#{spec_version.gsub('.', '_')}")
   end
 end

data/lib/bitescript/asm.rb

@@ -17,7 +17,7 @@ module BiteScript
         # no error, proceed with mangled name
         asm_package = Java::org.jruby.org.objectweb.asm
         java_import asm_package.Opcodes
-      rescue
+      rescue Exception
         # fall back on standard names
         asm_package = org.objectweb.asm
         java_import asm_package.Opcodes
@@ -35,5 +35,12 @@ module BiteScript
     java_import asm_package.signature.SignatureReader
     java_import asm_package.signature.SignatureVisitor
     java_import asm_package.signature.SignatureWriter
+    
+    # MethodHandle was introduced in ASM 4.0, and is only available to
+    # JRuby > 1.6.1
+    begin
+      java_import asm_package.MethodHandle 
+    rescue
+    end
   end
 end

data/lib/bitescript/builder.rb

@@ -232,7 +232,7 @@ module BiteScript
         flags = Opcodes::ACC_INTERFACE | Opcodes::ACC_ABSTRACT
       end
 
-      @class_writer = ClassWriter.new(ClassWriter::COMPUTE_MAXS)
+      @class_writer = ClassWriter.new(ClassWriter::COMPUTE_FRAMES | ClassWriter::COMPUTE_MAXS)
       
       interface_paths = []
       (@interfaces).each {|interface| interface_paths << path(interface)}

data/lib/bitescript/bytecode.rb

@@ -39,7 +39,7 @@ module BiteScript
     
     OpcodeInstructions = {}
 
-    Opcodes.constants.each do |const_name|
+    Opcodes.constants.map(&:to_s).each do |const_name|
       const_down = const_name.downcase
       
       case const_name
@@ -78,7 +78,7 @@ module BiteScript
                 size = push_int value
               when Float
                 ldc_double(value)
-              when Module
+              when Module, ClassBuilder
                 ldc_class(value)
               else
                 method_visitor.visit_ldc_insn(value)
@@ -98,40 +98,24 @@ module BiteScript
           ", b, __FILE__, line
         OpcodeInstructions[const_name] = const_down
           
-      when "INVOKESTATIC", "INVOKEVIRTUAL", "INVOKEINTERFACE", "INVOKESPECIAL", "INVOKEDYNAMIC"
+      when "INVOKESTATIC", "INVOKEVIRTUAL", "INVOKEINTERFACE", "INVOKESPECIAL"
         # method instructions
         line = __LINE__; eval "
             def #{const_down}(type, name, call_sig)
               method_visitor.visit_method_insn(Opcodes::#{const_name}, path(type), name.to_s, sig(*call_sig))
 
-              case call_sig[0]
-              when nil, Java::void, java.lang.Void
-                added = 0
-              when Java::boolean, Java::short, Java::char, Java::int, Java::float
-                added = 1
-              when Java::long, Java::double
-                added = 2
-              else
-                added = 1
-              end
-
-              this_subtracted = #{const_name == 'INVOKESTATIC' ? 0 : 1}
-
-              args_subtracted = 0
-              [*call_sig][1..-1].each do |param|
-                case param
-                when nil, Java::void, java.lang.Void
-                  args_subtracted += 0
-                when Java::boolean, Java::short, Java::char, Java::int, Java::float
-                  args_subtracted += 1
-                when Java::long, Java::double
-                  args_subtracted += 2
-                else
-                  args_subtracted += 1
-                end
-              end
+              sig_stack_net(call_sig, #{const_name == 'INVOKESTATIC' ? 0 : 1})
+            end
+          ", b, __FILE__, line
+        OpcodeInstructions[const_name] = const_down
+        
+      when "INVOKEDYNAMIC"
+        # invokedynamic instruction
+        line = __LINE__; eval "
+            def #{const_down}(name, call_sig, handle, *args)
+              method_visitor.visit_invoke_dynamic_insn(name.to_s, sig(*call_sig), handle, args.to_java)
 
-              added - (this_subtracted + args_subtracted)
+              sig_stack_net(call_sig, 0)
             end
           ", b, __FILE__, line
         OpcodeInstructions[const_name] = const_down
@@ -298,6 +282,15 @@ module BiteScript
         end
         OpcodeInstructions['TABLESWITCH'] = 'tableswitch'
 
+      when "MH_INVOKESPECIAL", "MH_INVOKESTATIC", "MH_PUTSTATIC", "MH_GETSTATIC", "MH_PUTFIELD",
+          "MH_GETFIELD", "MH_INVOKEVIRTUAL", "MH_INVOKEINTERFACE",
+          "MH_NEWINVOKESPECIAL"
+        line = __LINE__; eval "
+            def #{const_down}(cls, name, *call_sig)
+              MethodHandle.new(Opcodes::#{const_name}, path(cls), name, sig(*call_sig))
+            end
+          ", b, __FILE__, line
+        OpcodeInstructions[const_name] = const_down
       when "F_FULL", "ACC_ENUM", "ACC_SYNTHETIC", "ACC_INTERFACE", "ACC_PUBLIC",
           "ACC_PRIVATE", "ACC_PROTECTED", "ACC_DEPRECATED", "ACC_BRIDGE",
           "ACC_VARARGS", "ACC_SUPER", "F_CHOP", "F_APPEND", "FLOAT", "F_SAME",
@@ -307,6 +300,7 @@ module BiteScript
           "F_SAME1", "ACC_NATIVE", "F_NEW", "T_CHAR", "T_INT", "ACC_VOLATILE",
           "V1_6", "V1_5", "V1_4", "V1_3", "V1_2", "V1_1", "UNINITIALIZED_THIS",
           "TOP", "T_SHORT", "INVOKEDYNAMIC_OWNER", "V1_7"
+          
         # non-instructions
 
       else
@@ -429,6 +423,36 @@ module BiteScript
       else
         ldc_long(num)
       end
+    end  
+    
+    def sig_stack_net(call_sig, this_subtracted)
+      case call_sig[0]
+      when nil, Java::void, java.lang.Void
+        added = 0
+      when Java::boolean, Java::short, Java::char, Java::int, Java::float
+        added = 1
+      when Java::long, Java::double
+        added = 2
+      else
+        added = 1
+      end
+
+      args_subtracted = 0
+      [*call_sig][1..-1].each do |param|
+        case param
+        when nil, Java::void, java.lang.Void
+          args_subtracted += 0
+        when Java::boolean, Java::short, Java::char, Java::int, Java::float
+          args_subtracted += 1
+        when Java::long, Java::double
+          args_subtracted += 2
+        else
+          args_subtracted += 1
+        end
+      end
+
+      added - (this_subtracted + args_subtracted)
     end
+    private :sig_stack_net
   end
 end

data/test/test_bitescript.rb

@@ -4,8 +4,15 @@ require 'test/unit'
 require 'bitescript'
 
 class TestBitescript < Test::Unit::TestCase
+  def test_bytecode_defaults_to_current_version
+    spec_version = ENV_JAVA['java.specification.version']
+    expected_version = BiteScript.const_get("JAVA#{spec_version.gsub('.', '_')}")
+
+    assert_equal expected_version, BiteScript.bytecode_version
+  end
+
   def test_bytecode_version
-    assert_equal BiteScript::JAVA1_4, BiteScript.bytecode_version
+    
     [BiteScript::JAVA1_4, BiteScript::JAVA1_5, BiteScript::JAVA1_6].each do |ver|
       BiteScript.bytecode_version = ver
       assert_equal(ver, BiteScript.bytecode_version)

metadata

@@ -2,7 +2,7 @@
 name: bitescript
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
   - Charles Oliver Nutter
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-07 10:38:26.957000 -06:00
+date: 2011-07-11 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -34,10 +34,10 @@ files:
   - bin/bitep
   - examples/fib.bs
   - examples/hello_world.bs
-  - examples/hello_world.class
   - examples/hello_world_macro.bs
   - examples/indy.bs
   - examples/instanceof.bs
+  - examples/invokedynamic.bs
   - examples/mixed_bag.rb
   - examples/simple_loop.rb
   - examples/using_ruby.bs
@@ -49,8 +49,6 @@ files:
   - lib/bitescript/signature.rb
   - nbproject/project.properties
   - nbproject/project.xml
-  - nbproject/private/private.xml
-  - nbproject/private/rake-d.txt
   - test/test_bitescript.rb
   - test/test_builder.rb
   - test/test_bytecode.rb

data/nbproject/private/private.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
-    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
-</project-private>

data/nbproject/private/rake-d.txt

@@ -1,2 +0,0 @@
-default=
-test=Run tests