aarch64 2.0.0 → 2.0.1

data/lib/aarch64/parser.y

@@ -532,11 +532,11 @@ rule
     ;
 
   load_to_w
-    : Wd COMMA read_reg RSQ { result = TwoArg.new(val[0], val[2]) }
+    : Wd COMMA read_reg RSQ { result = TwoArg.new(val[0], [val[2]]) }
     ;
 
   load_to_x
-    : Xd COMMA read_reg RSQ { result = TwoArg.new(val[0], val[2]) }
+    : Xd COMMA read_reg RSQ { result = TwoArg.new(val[0], [val[2]]) }
     ;
 
   w_load_insns
@@ -579,8 +579,14 @@ rule
     ;
 
   reg_reg_load
-    : x_x_load RSQ { result = ThreeArg.new(*val[0]) }
-    | w_w_load RSQ { result = ThreeArg.new(*val[0]) }
+    : x_x_load RSQ {
+        reg, reg1, l = *val[0]
+        result = ThreeArg.new(reg, reg1, [l])
+      }
+    | w_w_load RSQ {
+        reg, reg1, l = *val[0]
+        result = ThreeArg.new(reg, reg1, [l])
+      }
     ;
 
   ldaxp
@@ -617,11 +623,11 @@ rule
     | ldp_signed_offset BANG { result = FourArg.new(*val[0], :!) }
     | reg_reg_load COMMA imm {
         rt1, rt2, rn = *val[0].to_a
-        result = FourArg.new(rt1, rt2, [rn], val[2])
+        result = FourArg.new(rt1, rt2, rn, val[2])
       }
     | reg_reg_load {
         rt1, rt2, rn = *val[0].to_a
-        result = ThreeArg.new(rt1, rt2, [rn])
+        result = ThreeArg.new(rt1, rt2, rn)
       }
     ;
 
@@ -690,12 +696,12 @@ rule
 
   ldtr_32
     : Wd COMMA read_reg_imm RSQ { result = TwoArg.new(val[0], val[2]) }
-    | Wd COMMA read_reg RSQ { result = TwoArg.new(val[0], val[2]) }
+    | Wd COMMA read_reg RSQ { result = TwoArg.new(val[0], [val[2]]) }
     ;
 
   ldtr_64
     : Xd COMMA read_reg_imm RSQ { result = TwoArg.new(val[0], val[2]) }
-    | Xd COMMA read_reg RSQ { result = TwoArg.new(val[0], val[2]) }
+    | Xd COMMA read_reg RSQ { result = TwoArg.new(val[0], [val[2]]) }
     ;
 
   ldtr_32s
@@ -728,21 +734,21 @@ rule
     ;
 
   ldxp
-    : LDXP Wd COMMA Wd COMMA read_reg RSQ { @asm.ldxp(val[1], val[3], val[5]) }
-    | LDXP Xd COMMA Xd COMMA read_reg RSQ { @asm.ldxp(val[1], val[3], val[5]) }
+    : LDXP Wd COMMA Wd COMMA read_reg RSQ { @asm.ldxp(val[1], val[3], [val[5]]) }
+    | LDXP Xd COMMA Xd COMMA read_reg RSQ { @asm.ldxp(val[1], val[3], [val[5]]) }
     ;
 
   ldxr
-    : LDXR Wd COMMA read_reg RSQ { @asm.ldxr(val[1], val[3]) }
-    | LDXR Xd COMMA read_reg RSQ { @asm.ldxr(val[1], val[3]) }
+    : LDXR Wd COMMA read_reg RSQ { @asm.ldxr(val[1], [val[3]]) }
+    | LDXR Xd COMMA read_reg RSQ { @asm.ldxr(val[1], [val[3]]) }
     ;
 
   ldxrb
-    : LDXRB Wd COMMA read_reg RSQ { @asm.ldxrb(val[1], val[3]) }
+    : LDXRB Wd COMMA read_reg RSQ { @asm.ldxrb(val[1], [val[3]]) }
     ;
 
   ldxrh
-    : LDXRH Wd COMMA read_reg RSQ { @asm.ldxrh(val[1], val[3]) }
+    : LDXRH Wd COMMA read_reg RSQ { @asm.ldxrh(val[1], [val[3]]) }
     ;
 
   lsl
@@ -852,16 +858,16 @@ rule
     ;
 
   stlr
-    : STLR Wd COMMA read_reg RSQ { @asm.stlr(val[1], val[3]) }
-    | STLR Xd COMMA read_reg RSQ { @asm.stlr(val[1], val[3]) }
+    : STLR Wd COMMA read_reg RSQ { @asm.stlr(val[1], [val[3]]) }
+    | STLR Xd COMMA read_reg RSQ { @asm.stlr(val[1], [val[3]]) }
     ;
 
   stlrb
-    : STLRB Wd COMMA read_reg RSQ { @asm.stlrb(val[1], val[3]) }
+    : STLRB Wd COMMA read_reg RSQ { @asm.stlrb(val[1], [val[3]]) }
     ;
 
   stlrh
-    : STLRH Wd COMMA read_reg RSQ { @asm.stlrh(val[1], val[3]) }
+    : STLRH Wd COMMA read_reg RSQ { @asm.stlrh(val[1], [val[3]]) }
     ;
 
   smaddl_params
@@ -872,17 +878,20 @@ rule
 
   stlxp_body
     : Wd COMMA Xd COMMA Xd COMMA read_reg RSQ {
-        result = FourArg.new(*val.values_at(0, 2, 4, 6))
+        wd, xd1, xd2, r = *val.values_at(0, 2, 4, 6)
+        result = FourArg.new(wd, xd1, xd2, [r])
       }
     | Wd COMMA Wd COMMA Wd COMMA read_reg RSQ {
-        result = FourArg.new(*val.values_at(0, 2, 4, 6))
+        wd, wd1, wd2, r = *val.values_at(0, 2, 4, 6)
+        result = FourArg.new(wd, wd1, wd2, [r])
       }
     ;
 
   stlxr_body
     : wd_wd_read_reg
     | Wd COMMA Xd COMMA read_reg RSQ {
-        result = ThreeArg.new(*val.values_at(0, 2, 4))
+        wd, xd, rd = *val.values_at(0, 2, 4)
+        result = ThreeArg.new(wd, xd, [rd])
       }
     ;
 
@@ -898,7 +907,8 @@ rule
         FourArg.new(*val[1].to_a, :!).apply(@asm, val[0])
       }
     | STP reg_reg_read_reg RSQ COMMA imm {
-        FourArg.new(*val[1].to_a, val[4]).apply(@asm, val[0])
+        rt, rt2, rn = *val[1].to_a
+        FourArg.new(rt, rt2, [rn], val[4]).apply(@asm, val[0])
       }
     | STP reg_reg_read_reg RSQ {
         a, b, c = *val[1].to_a
@@ -917,7 +927,7 @@ rule
         result = ThreeArg.new(val[0], val[2], :!)
       }
     | register COMMA read_reg RSQ COMMA imm {
-        result = ThreeArg.new(val[0], val[2], val[5])
+        result = ThreeArg.new(val[0], [val[2]], val[5])
       }
     | register COMMA read_reg RSQ {
         result = TwoArg.new(val[0], [val[2]])
@@ -951,7 +961,7 @@ rule
         result = TwoArg.new(val[0], [val[2]])
       }
     | Wd COMMA read_reg RSQ COMMA imm {
-        result = ThreeArg.new(val[0], val[2], val[5])
+        result = ThreeArg.new(val[0], [val[2]], val[5])
       }
     ;
 
@@ -991,31 +1001,31 @@ rule
 
   stxp
     : STXP wd_wd_wd COMMA read_reg RSQ {
-        FourArg.new(*val[1].to_a, val[3]).apply(@asm, val[0])
+        FourArg.new(*val[1].to_a, [val[3]]).apply(@asm, val[0])
       }
     | STXP wd_xd_xd COMMA read_reg RSQ {
-        FourArg.new(*val[1].to_a, val[3]).apply(@asm, val[0])
+        FourArg.new(*val[1].to_a, [val[3]]).apply(@asm, val[0])
       }
     ;
 
   stxr
     : STXR wd_wd COMMA read_reg RSQ {
-        ThreeArg.new(*val[1].to_a, val[3]).apply(@asm, val[0])
+        ThreeArg.new(*val[1].to_a, [val[3]]).apply(@asm, val[0])
       }
     | STXR wd_xd COMMA read_reg RSQ {
-        ThreeArg.new(*val[1].to_a, val[3]).apply(@asm, val[0])
+        ThreeArg.new(*val[1].to_a, [val[3]]).apply(@asm, val[0])
       }
     ;
 
   stxrb
     : STXRB wd_wd COMMA read_reg RSQ {
-        ThreeArg.new(*val[1].to_a, val[3]).apply(@asm, val[0])
+        ThreeArg.new(*val[1].to_a, [val[3]]).apply(@asm, val[0])
       }
     ;
 
   stxrh
     : STXRH wd_wd COMMA read_reg RSQ {
-        ThreeArg.new(*val[1].to_a, val[3]).apply(@asm, val[0])
+        ThreeArg.new(*val[1].to_a, [val[3]]).apply(@asm, val[0])
       }
     ;
 
@@ -1075,7 +1085,7 @@ rule
 
   wd_wd_read_reg
     : Wd COMMA Wd COMMA read_reg RSQ {
-        result = ThreeArg.new(*val.values_at(0, 2, 4))
+        result = ThreeArg.new(val[0], val[2], [val[4]])
       }
     ;
 

data/lib/aarch64/utils.rb

@@ -1,8 +1,19 @@
 # frozen_string_literal: true
 
 module AArch64
+  module ClassGen
+    def self.pos *names
+      Class.new do
+        attr_reader(*names)
+        sig = names.map { "#{_1}" }.join(", ")
+        init = names.map { "@#{_1} = #{_1}" }.join(";")
+        class_eval("def initialize #{sig}; #{init}; end")
+      end
+    end
+  end
+
   module Utils
-    EncodedMask = Struct.new(:n, :immr, :imms)
+    EncodedMask = ClassGen.pos(:n, :immr, :imms)
 
     MAX_INT_64 = 0xFFFFFFFFFFFFFFFF
 

data/lib/aarch64/version.rb

@@ -1,3 +1,3 @@
 module AArch64
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/lib/aarch64.rb

@@ -6,7 +6,9 @@ require "aarch64/utils"
 
 module AArch64
   module Registers
-    class Register < Struct.new(:to_i, :sp?, :zr?)
+    class Register < ClassGen.pos(:to_i, :sp, :zr)
+      alias sp? sp
+      alias zr? zr
       def integer?; false; end
     end
 
@@ -78,7 +80,7 @@ module AArch64
   end
 
   module Extends
-    class Extend < Struct.new(:amount, :type, :name)
+    class Extend < ClassGen.pos(:amount, :type, :name)
       def extend?; true; end
       def shift?; false; end
     end
@@ -99,7 +101,7 @@ module AArch64
   end
 
   module Shifts
-    class Shift < Struct.new(:amount, :type, :name)
+    class Shift < ClassGen.pos(:amount, :type, :name)
       def extend?; false; end
       def shift?; true; end
     end
@@ -125,6 +127,18 @@ module AArch64
     include Instructions
     include Registers
 
+    class Immediate
+      def initialize offset
+        @offset = offset
+        freeze
+      end
+
+      def unwrap_label
+        @offset
+      end
+      def immediate?; true; end
+    end
+
     class Label
       attr_reader :offset
 
@@ -146,6 +160,7 @@ module AArch64
         @offset
       end
 
+      def immediate?; false; end
       def integer?; false; end
     end
 
@@ -172,7 +187,7 @@ module AArch64
 
     # Puts the label at the current position.  Labels can only be placed once.
     def put_label label
-      label.set_offset(@insns.length * 4)
+      label.set_offset(@insns.length)
       self
     end
 
@@ -265,9 +280,7 @@ module AArch64
     end
 
     def adr xd, label
-      if label.integer?
-        label = wrap_offset_with_label label
-      end
+      label = Immediate.new(label) if label.integer?
       a ADR.new(xd, label)
     end
 
@@ -2819,7 +2832,7 @@ module AArch64
     end
 
     def to_binary
-      @insns.map(&:encode).pack("L<*")
+      @insns.map.with_index { _1.encode(_2) }.pack("L<*")
     end
 
     private
@@ -2830,9 +2843,7 @@ module AArch64
     end
 
     def wrap_offset_with_label offset
-      label = Label.new :none
-      label.set_offset offset
-      label
+      Immediate.new(offset / 4)
     end
   end
 end

data/test/base_instructions_test.rb

@@ -387,6 +387,64 @@ class BaseInstructionsTest < AArch64::Test
     assert_one_insn "b #8"
   end
 
+  def test_b_first
+    label = asm.make_label :foo
+    asm.b label
+    asm.put_label label
+    asm.ret
+
+    jit_buffer = StringIO.new
+    asm.write_to jit_buffer
+
+    b = disasm(jit_buffer.string)[0]
+    ret = disasm(jit_buffer.string).last
+    expected = ret.address - b.address
+    assert_equal "b", b.mnemonic
+    assert_equal expected, b.op_str[/[^#]+$/].to_i(16)
+  end
+
+  def test_b_first_with_others
+    label = asm.make_label :foo
+    asm.b label
+    asm.mov x0, 2
+    asm.mov x0, 3
+    asm.put_label label
+    asm.ret
+
+    jit_buffer = StringIO.new
+    asm.write_to jit_buffer
+
+    b = disasm(jit_buffer.string)[0]
+    ret = disasm(jit_buffer.string).last
+    expected = ret.address - b.address
+    assert_equal "b", b.mnemonic
+    assert_equal 12, b.op_str[/[^#]+$/].to_i(16)
+    assert_equal expected, b.op_str[/[^#]+$/].to_i(16)
+  end
+
+  def test_b_not_first
+    label = asm.make_label :foo
+    asm.mov x0, 1
+    asm.mov x0, 1
+    asm.mov x0, 1
+    asm.mov x0, 1
+    asm.b label
+    asm.mov x0, 2
+    asm.mov x0, 3
+    asm.put_label label
+    asm.ret
+
+    jit_buffer = StringIO.new
+    asm.write_to jit_buffer
+
+    # capstone turns the jump targets in to absolute targets,
+    # so to test the target is correct we need to compare the address
+    # of the target against the address from the branch instruction
+    b = disasm(jit_buffer.string).find { |insn| insn.mnemonic == "b" }
+    ret = disasm(jit_buffer.string).last
+    assert_equal ret.address, b.op_str[/[^#]+$/].to_i(16)
+  end
+
   def test_b_with_label
     label = asm.make_label :foo
     asm.b label

data/test/helper.rb

@@ -1,3 +1,5 @@
+ENV["MT_NO_PLUGINS"] = "1"
+
 require "aarch64"
 require "aarch64/parser"
 require "minitest/autorun"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aarch64
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Aaron Patterson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-29 00:00:00.000000000 Z
+date: 2023-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hatstone
@@ -380,7 +380,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.5.0.dev
 signing_key:
 specification_version: 4
 summary: Write ARM64 assembly in Ruby!