rubinius-compiler 3.25 → 3.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42b3c05bfee442800bfcacc8019395d34f00ab1f
-  data.tar.gz: fdab2f69bbd52b8430c51a6f66d9fe5518fd2375
+  metadata.gz: 4a6beb07321b5fa2a724d03f66d8626ffc7fe694
+  data.tar.gz: e98a2577a4d11d718f4c3e10cec1e9a1e7ef292a
 SHA512:
-  metadata.gz: 5f2c4eeebecdf4c6b771e1038c283121326b59f67f4abe0757d4af5ded0fd64b7027a378ca1903ad1d7713670055d449bb7aeb3d54036a3c4b375619b356ec04
-  data.tar.gz: 951af355701f6a144aaebe161b358e894774a3488e37fe51d3b4c288d87200d966d3cc6eb0b23f70946eba9800b786f4b4a74c4d2f0e1ea96a99124573c3065b
+  metadata.gz: 41ce3227f9f7a0045f2d426e73ee7ac088f769fcfaf618720ffce29ceaf20fc69ec8d823b97502a2dc58663bb1474f47b045a0cdad2dc72547ae87fd4492e4e4
+  data.tar.gz: 247b4d7696a7777fa484a55e286ce6ed75660ee164cf37eb83b38c1575c1c372c1cb502d575bbc76839abf3e6963586977daa2a904a3522db259f29fb9e8c1cf

data/lib/rubinius/code/compiler/generator.rb

@@ -274,6 +274,7 @@ module CodeTools
       @keywords = nil
       @kwrest_index = nil
       @local_count = 0
+      @registers = 0
 
       @state = []
       @generators = []
@@ -452,6 +453,10 @@ module CodeTools
       Label.new(self)
     end
 
+    def new_register
+      (@registers += 1) - 1
+    end
+
     # Helpers
 
     def new_basic_block

data/lib/rubinius/code/compiler/generator_methods.rb

@@ -810,6 +810,7 @@ module CodeTools
         @instruction = 98
       end
 
+      # Parsing Expression Grammar instructions
       def p_any(arg1)
         @stream << 99 << arg1
         @ip += 2
@@ -918,6 +919,7 @@ module CodeTools
         @instruction = 116
       end
 
+      # Instrumentation instructions
       def m_bytes(arg1, arg2)
         @stream << 117 << arg1 << arg2
         @ip += 3
@@ -959,5 +961,178 @@ module CodeTools
         @ip += 3
         @instruction = 123
       end
+
+      # Branching instructions
+      def b_if_serial(arg1, arg2, arg3)
+        @stream << 124 << arg1 << arg2 << arg3
+        @ip += 4
+        @instruction = 124
+      end
+
+      def b_if_int(arg1, arg2, arg3)
+        @stream << 125 << arg1 << arg2 << arg3
+        @ip += 4
+        @instruction = 125
+      end
+
+      def b_if(arg1, arg2)
+        @stream << 126 << arg1 << arg2
+        @ip += 3
+        @instruction = 126
+      end
+
+      # Register movement instructions
+      def r_load_local(arg1, arg2)
+        @stream << 127 << arg1 << arg2
+        @ip += 3
+        @instructions = 127
+      end
+
+      def r_store_local(arg1, arg2)
+        @stream << 128 << arg1 << arg2
+        @ip += 3
+        @instructions = 128
+      end
+
+      def r_load_local_depth(arg1, arg2, arg3)
+        @stream << 129 << arg1 << arg2 << arg3
+        @ip += 4
+        @instructions = 129
+      end
+
+      def r_store_local_depth(arg1, arg2, arg3)
+        @stream << 130 << arg1 << arg2 << arg3
+        @ip += 4
+        @instructions = 130
+      end
+
+      def r_load_stack(arg1)
+        @stream << 131 << arg1
+        @ip += 2
+        @instructions = 131
+      end
+
+      def r_store_stack(arg1)
+        @stream << 132 << arg1
+        @ip += 2
+        @current_block.add_stack(0, 1)
+        @instructions = 132
+      end
+
+      def r_load_literal(arg1, arg2)
+        @stream << 133 << arg1 << arg2
+        @ip += 3
+        @instruction = 133
+      end
+
+      def r_load_int(arg1, arg2)
+        @stream << 134 << arg1 << arg2
+        @ip += 3
+        @instruction = 134
+      end
+
+      def r_store_int(arg1, arg2)
+        @stream << 135 << arg1 << arg2
+        @ip += 3
+        @instruction = 135
+      end
+
+      def r_copy(arg1, arg2)
+        @stream << 136 << arg1 << arg2
+        @ip += 3
+        @instruction = 136
+      end
+
+      # Native signed integer instructions
+      def n_iadd(arg1, arg2, arg3)
+        @stream << 137 << arg1 << arg2 << arg3
+        @ip += 4
+        @instruction = 137
+      end
+
+      def n_isub(arg1, arg2, arg3)
+        @stream << 138 << arg1 << arg2 << arg3
+        @ip += 4
+        @instruction = 138
+      end
+
+      def n_imul(arg1, arg2, arg3)
+        @stream << 139 << arg1 << arg2 << arg3
+        @ip += 4
+        @instruction = 139
+      end
+
+      def n_idiv(arg1, arg2, arg3)
+        @stream << 140 << arg1 << arg2 << arg3
+        @ip += 4
+        @instruction = 140
+      end
+
+      def n_iadd_o(arg1, arg2, arg3)
+        @stream << 141 << arg1 << arg2 << arg3
+        @ip += 4
+        @instruction = 141
+      end
+
+      def n_isub_o(arg1, arg2, arg3)
+        @stream << 142 << arg1 << arg2 << arg3
+        @ip += 4
+        @instruction = 142
+      end
+
+      def n_imul_o(arg1, arg2, arg3)
+        @stream << 143 << arg1 << arg2 << arg3
+        @ip += 4
+        @instruction = 143
+      end
+
+      def n_idiv_o(arg1, arg2, arg3)
+        @stream << 144 << arg1 << arg2 << arg3
+        @ip += 4
+        @instruction = 144
+      end
+
+      def n_ieq(arg1, arg2, arg3)
+        @stream << 145 << arg1 << arg2 << arg3
+        @ip += 4
+        @instruction = 145
+      end
+
+      def n_ine(arg1, arg2, arg3)
+        @stream << 146 << arg1 << arg2 << arg3
+        @ip += 4
+        @instruction = 146
+      end
+
+      def n_ilt(arg1, arg2, arg3)
+        @stream << 147 << arg1 << arg2 << arg3
+        @ip += 4
+        @instruction = 147
+      end
+
+      def n_ile(arg1, arg2, arg3)
+        @stream << 148 << arg1 << arg2 << arg3
+        @ip += 4
+        @instruction = 148
+      end
+
+      def n_igt(arg1, arg2, arg3)
+        @stream << 149 << arg1 << arg2 << arg3
+        @ip += 4
+        @instruction = 149
+      end
+
+      def n_ige(arg1, arg2, arg3)
+        @stream << 150 << arg1 << arg2 << arg3
+        @ip += 4
+        @instruction = 150
+      end
+
+      def n_ipopcnt(arg1, arg2)
+        @stream << 151 << arg1 << arg2
+        @ip += 3
+        @instruction = 151
+      end
+
   end
 end

data/lib/rubinius/code/compiler/opcodes.rb

@@ -104,6 +104,8 @@ module Rubinius
     opcode 96, :yield_stack,                 :stack => [[0,1], 1], :args => [:count],                         :control_flow => :yield
     opcode 97, :zsuper,                      :stack => [1, 1],     :args => [:literal],                       :control_flow => :next
     opcode 98, :push_file,                   :stack => [0, 1],     :args => [],                               :control_flow => :next
+
+    # Parsing Expression Grammar instructions
     opcode 99, :p_any,                       :stack => [0, 0],     :args => [:r0],                            :control_flow => :next
     opcode 100, :p_call,                     :stack => [0, 0],     :args => [:ip],                            :control_flow => :next
     opcode 101, :p_char,                     :stack => [0, 0],     :args => [:chr],                           :control_flow => :next
@@ -122,6 +124,8 @@ module Rubinius
     opcode 114, :p_test_char,                :stack => [0, 0],     :args => [:chr, :ip],                      :control_flow => :next
     opcode 115, :p_test_char_set,            :stack => [0, 0],     :args => [:chr_set, :ip],                  :control_flow => :next
     opcode 116, :p_init,                     :stack => [0, 0],     :args => [:r0, :r1],                       :control_flow => :next
+
+    # Instrumentation instructions
     opcode 117, :m_bytes,                    :stack => [0, 0],     :args => [:value, :r0],                    :control_flow => :next
     opcode 118, :m_counter,                  :stack => [0, 0],     :args => [:value],                         :control_flow => :next
     opcode 119, :m_sum,                      :stack => [0, 0],     :args => [:value, :r0],                    :control_flow => :next
@@ -129,5 +133,40 @@ module Rubinius
     opcode 121, :m_time_stamp,               :stack => [0, 0],     :args => [:value, :flag],                  :control_flow => :next
     opcode 122, :m_timer_start,              :stack => [0, 0],     :args => [:timer],                         :control_flow => :next
     opcode 123, :m_timer_stop,               :stack => [0, 0],     :args => [:ip, :flag],                     :control_flow => :next
+
+    # Branching instructions
+    opcode 124, :b_if_serial,                :stack => [0, 0],     :args => [:r0, :r1, :ip],                 :control_flow => :branch
+    opcode 125, :b_if_int,                   :stack => [0, 0],     :args => [:r0, :r1, :ip],                    :control_flow => :branch
+    opcode 126, :b_if,                       :stack => [0, 0],     :args => [:r0, :ip],                    :control_flow => :branch
+
+    # Register movement instructions
+    opcode 127, :r_load_local,               :stack => [0, 0],     :args => [:r0, :local],                    :control_flow => :next
+    opcode 128, :r_store_local,              :stack => [0, 0],     :args => [:r0, :local],                    :control_flow => :next
+    opcode 129, :r_load_local_depth,         :stack => [0, 0],     :args => [:r0, :local, :depth],            :control_flow => :next
+    opcode 130, :r_store_local_depth,        :stack => [0, 0],     :args => [:r0, :local, :depth],            :control_flow => :next
+    opcode 131, :r_load_stack,               :stack => [0, 0],     :args => [:r0],                            :control_flow => :next
+    opcode 132, :r_store_stack,              :stack => [0, 1],     :args => [:r0],                            :control_flow => :next
+    opcode 133, :r_load_literal,             :stack => [0, 0],     :args => [:r0, :literal],                  :control_flow => :next
+    opcode 134, :r_load_int,                 :stack => [0, 0],     :args => [:r0, :r1],                       :control_flow => :next
+    opcode 135, :r_store_int,                :stack => [0, 0],     :args => [:r0, :r1],                       :control_flow => :next
+    opcode 136, :r_copy,                     :stack => [0, 0],     :args => [:r0, :r1],                       :control_flow => :next
+
+    # Native signed integer instructions
+    opcode 137, :n_iadd,                     :stack => [0, 0],     :args => [:r0, :r1, :r2],                  :control_flow => :next
+    opcode 138, :n_isub,                     :stack => [0, 0],     :args => [:r0, :r1, :r2],                  :control_flow => :next
+    opcode 139, :n_imul,                     :stack => [0, 0],     :args => [:r0, :r1, :r2],                  :control_flow => :next
+    opcode 140, :n_idiv,                     :stack => [0, 0],     :args => [:r0, :r1, :r2],                  :control_flow => :next
+    opcode 141, :n_iadd_o,                   :stack => [0, 0],     :args => [:r0, :r1, :r2],                  :control_flow => :next
+    opcode 142, :n_isub_o,                   :stack => [0, 0],     :args => [:r0, :r1, :r2],                  :control_flow => :next
+    opcode 143, :n_imul_o,                   :stack => [0, 0],     :args => [:r0, :r1, :r2],                  :control_flow => :next
+    opcode 144, :n_idiv_o,                   :stack => [0, 0],     :args => [:r0, :r1, :r2],                  :control_flow => :next
+    opcode 145, :n_ieq,                      :stack => [0, 0],     :args => [:r0, :r1, :r2],                  :control_flow => :next
+    opcode 146, :n_ine,                      :stack => [0, 0],     :args => [:r0, :r1, :r2],                  :control_flow => :next
+    opcode 147, :n_ilt,                      :stack => [0, 0],     :args => [:r0, :r1, :r2],                  :control_flow => :next
+    opcode 148, :n_ile,                      :stack => [0, 0],     :args => [:r0, :r1, :r2],                  :control_flow => :next
+    opcode 149, :n_igt,                      :stack => [0, 0],     :args => [:r0, :r1, :r2],                  :control_flow => :next
+    opcode 150, :n_ige,                      :stack => [0, 0],     :args => [:r0, :r1, :r2],                  :control_flow => :next
+    opcode 151, :n_ipopcnt,                  :stack => [0, 0],     :args => [:r0, :r1],                       :control_flow => :next
+
   end
 end

data/lib/rubinius/code/compiler/version.rb

@@ -1,5 +1,5 @@
 module CodeTools
   class Compiler
-    VERSION = "3.25"
+    VERSION = "3.26"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubinius-compiler
 version: !ruby/object:Gem::Version
-  version: '3.25'
+  version: '3.26'
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-05 00:00:00.000000000 Z
+date: 2018-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler