aarch64 1.0.1 → 2.0.0

data/lib/aarch64/utils.rb

@@ -321,5 +321,39 @@ module AArch64
       AT_TABLE.fetch at_op
     end
     module_function :at_op
+
+    def sub_decode_extend32 extend
+      case extend
+      when :uxtb then 0b000
+      when :uxth then 0b001
+      when :uxtw then 0b010
+      when :lsl  then 0b010
+      when :uxtx then 0b011
+      when :sxtb then 0b100
+      when :sxth then 0b101
+      when :sxtw then 0b110
+      when :sxtx then 0b111
+      else
+        raise "Unknown extend #{extend}"
+      end
+    end
+    module_function :sub_decode_extend32
+
+    def sub_decode_extend64 extend
+      case extend
+      when :uxtb then 0b000
+      when :uxth then 0b001
+      when :uxtw then 0b011
+      when :lsl  then 0b011
+      when :uxtx then 0b011
+      when :sxtb then 0b100
+      when :sxth then 0b101
+      when :sxtw then 0b110
+      when :sxtx then 0b111
+      else
+        raise "Unknown extend #{extend}"
+      end
+    end
+    module_function :sub_decode_extend64
   end
 end

data/lib/aarch64/version.rb

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

data/lib/aarch64.rb

@@ -16,6 +16,7 @@ module AArch64
       def size; 64; end
       def sf; 1; end
       def sizeb; 0b11; end
+      def sz; 0b1; end
       def opc; 0b10; end
       def opc2; 0b11; end
       def opc3; 0b10; end
@@ -27,6 +28,7 @@ module AArch64
       def size; 32; end
       def sf; 0; end
       def sizeb; 0b10; end
+      def sz; 0b0; end
       def opc; 0b11; end
       def opc2; 0b10; end
       def opc3; 0b00; end
@@ -124,6 +126,8 @@ module AArch64
     include Registers
 
     class Label
+      attr_reader :offset
+
       def initialize name
         @name   = name
         @offset = nil
@@ -134,9 +138,15 @@ module AArch64
         freeze
       end
 
+      def unwrap_label
+        to_i
+      end
+
       def to_i
-        @offset * 4
+        @offset
       end
+
+      def integer?; false; end
     end
 
     def initialize
@@ -162,7 +172,8 @@ module AArch64
 
     # Puts the label at the current position.  Labels can only be placed once.
     def put_label label
-      label.set_offset @insns.length
+      label.set_offset(@insns.length * 4)
+      self
     end
 
     def adc d, n, m
@@ -179,6 +190,7 @@ module AArch64
                  when :uxtb then 0b000
                  when :uxth then 0b001
                  when :uxtw then 0b010
+                 when :lsl  then 0b010
                  when :uxtx then 0b011
                  when :sxtb then 0b100
                  when :sxth then 0b101
@@ -188,21 +200,11 @@ module AArch64
                    raise "Unknown extend #{extend}"
                  end
 
-        if m.x?
-          if (extend & 0x3 != 0x3)
-            raise "Wrong extend"
-          end
-        else
-          if (extend & 0x3 == 0x3)
-            raise "Wrong extend"
-          end
-        end
-
         a ADD_addsub_ext.new(d, n, m, extend, amount, d.sf)
       else
         if m.integer?
           # add immediate
-          a ADD_addsub_imm.new(d, n, m, lsl / 12, d.sf)
+          a ADD_addsub_imm.new(d, n, m, (lsl || 0) / 12, d.sf)
         else
           shift = [:lsl, :lsr, :asr].index(shift) || raise(NotImplementedError)
           a ADD_addsub_shift.new(d, n, m, shift, amount, d.sf)
@@ -242,6 +244,7 @@ module AArch64
                  when :uxtb then 0b000
                  when :uxth then 0b001
                  when :uxtw then 0b010
+                 when :lsl then 0b010
                  when :uxtx then 0b011
                  when :sxtb then 0b100
                  when :sxth then 0b101
@@ -262,6 +265,9 @@ module AArch64
     end
 
     def adr xd, label
+      if label.integer?
+        label = wrap_offset_with_label label
+      end
       a ADR.new(xd, label)
     end
 
@@ -274,7 +280,7 @@ module AArch64
         enc = Utils.encode_mask(m, d.size) || raise("Can't encode mask #{m}")
         a AND_log_imm.new(d, n, enc.immr, enc.imms, enc.n, d.sf)
       else
-        shift = [:lsl, :lsr, :asr].index(shift) || raise(NotImplementedError)
+        shift = [:lsl, :lsr, :asr, :ror].index(shift) || raise(NotImplementedError)
         a AND_log_shift.new(d, n, m, shift, amount, d.sf)
       end
     end
@@ -284,7 +290,7 @@ module AArch64
         enc = Utils.encode_mask(m, d.size) || raise("Can't encode mask #{m}")
         a ANDS_log_imm.new(d, n, enc.immr, enc.imms, enc.n, d.sf)
       else
-        shift = [:lsl, :lsr, :asr].index(shift) || raise(NotImplementedError)
+        shift = [:lsl, :lsr, :asr, :ror].index(shift) || raise(NotImplementedError)
         a ANDS_log_shift.new(d, n, m, shift, amount, d.sf)
       end
     end
@@ -307,27 +313,39 @@ module AArch64
     end
 
     def autda d, n
-      a AUTDA.new(d, n)
+      if n.integer?
+        a AUTDA.new(1, d, n)
+      else
+        a AUTDA.new(0, d, n)
+      end
     end
 
     def autdza d
-      a AUTDA.new(d, 0b11111)
+      a AUTDA.new(1, d, 0b11111)
     end
 
     def autdb d, n
-      a AUTDB.new(d, n)
+      if n.integer?
+        a AUTDB.new(1, d, n)
+      else
+        a AUTDB.new(0, d, n)
+      end
     end
 
     def autdzb d
-      a AUTDB.new(d, 0b11111)
+      a AUTDB.new(1, d, 0b11111)
     end
 
     def autia d, n
-      a AUTIA.new(d, n)
+      if n.integer?
+        a AUTIA.new(1, d, n)
+      else
+        a AUTIA.new(0, d, n)
+      end
     end
 
     def autiza d
-      a AUTIA.new(d, 0b11111)
+      a AUTIA.new(1, d, 0b11111)
     end
 
     def autia1716
@@ -343,11 +361,15 @@ module AArch64
     end
 
     def autib d, n
-      a AUTIB.new(d, n)
+      if n.integer?
+        a AUTIB.new(1, d, n)
+      else
+        a AUTIB.new(0, d, n)
+      end
     end
 
     def autizb d
-      a AUTIB.new(d, 0b11111)
+      a AUTIB.new(1, d, 0b11111)
     end
 
     def autib1716
@@ -367,15 +389,22 @@ module AArch64
     end
 
     def b label, cond: nil
+      if label.integer?
+        label = wrap_offset_with_label label
+      end
+
       if cond
-        a B_cond.new(cond, label)
+        a B_cond.new(Utils.cond2bin(cond), label)
       else
         a B_uncond.new(label)
       end
     end
 
     def bc label, cond:
-      a BC_cond.new(cond, label)
+      if label.integer?
+        label = wrap_offset_with_label label
+      end
+      a BC_cond.new(Utils.cond2bin(cond), label)
     end
 
     def bfc rd, lsb, width
@@ -415,6 +444,10 @@ module AArch64
     end
 
     def bl label
+      if label.integer?
+        label = wrap_offset_with_label label
+      end
+
       a BL.new(label)
     end
 
@@ -528,10 +561,16 @@ module AArch64
     end
 
     def cbnz rt, label
+      if label.integer?
+        label = wrap_offset_with_label label
+      end
       a CBNZ.new(rt, label, rt.sf)
     end
 
     def cbz rt, label
+      if label.integer?
+        label = wrap_offset_with_label label
+      end
       a CBZ.new(rt, label, rt.sf)
     end
 
@@ -759,7 +798,7 @@ module AArch64
     end
 
     def hint imm
-      a HINT.new(31, imm)
+      a HINT.new(imm >> 3, imm & 0b111)
     end
 
     def hlt imm
@@ -1083,7 +1122,7 @@ module AArch64
                      when :sxtw then 0b110
                      when :sxtx then 0b111
                      else
-                       raise
+                       raise option.name
                      end
 
             amount = if rt.x?
@@ -1103,6 +1142,9 @@ module AArch64
             a LDR_reg_gen.new(rt, rn, rm, size, extend, amount)
           end
         else
+          if rn.integer?
+            rn = wrap_offset_with_label rn
+          end
           a LDR_lit_gen.new(rt, rn, rt.sf)
         end
       end
@@ -1144,7 +1186,12 @@ module AArch64
                   when :sxtx then 0b111
                   end
 
-            a LDRB_reg.new(wt, xn, imm, option.shift? ? 1 : 0, val)
+            s = if option.shift?
+              !!option.amount
+            else
+              false
+            end
+            a LDRB_reg.new(wt, xn, imm, s ? 1 : 0, val)
           else
             a LDRB_reg.new(wt, xn, imm, 0, 0b11)
           end
@@ -1176,7 +1223,12 @@ module AArch64
                   when :sxtx then 0b111
                   end
 
-            a LDRH_reg.new(wt, xn, imm, option.shift? ? 1 : 0, val)
+            s = if option.shift?
+              !!option.amount
+            else
+              false
+            end
+            a LDRH_reg.new(wt, xn, imm, s ? 1 : 0, val)
           else
             a LDRH_reg.new(wt, xn, imm, 0, 0b11)
           end
@@ -1273,12 +1325,15 @@ module AArch64
                     when :sxtx then 0b111
                     end
 
-              a LDRSW_reg.new(xt, xn, imm, option.amount / 2, val)
+              a LDRSW_reg.new(xt, xn, imm, (option.amount || 0) / 2, val)
             else
               a LDRSW_reg.new(xt, xn, imm, 0, 0b11)
             end
           end
         else
+          if xn.integer?
+            xn = wrap_offset_with_label xn
+          end
           a LDRSW_lit.new(xt, xn)
         end
       end
@@ -1673,14 +1728,27 @@ module AArch64
     end
 
     def mrs rt, reg
-      a MRS.new(reg.op0, reg.op1, reg.CRn, reg.CRm, reg.op2, rt)
+      o0 = case reg.op0
+           when 2 then 0
+           when 3 then 1
+           else
+             raise
+           end
+      a MRS.new(o0, reg.op1, reg.CRn, reg.CRm, reg.op2, rt)
     end
 
     def msr reg, rt
       if rt.integer?
         raise NotImplementedError
       else
-        a MSR_reg.new(reg.op0, reg.op1, reg.CRn, reg.CRm, reg.op2, rt)
+        o0 = case reg.op0
+             when 2 then 0
+             when 3 then 1
+             else
+               raise
+             end
+
+        a MSR_reg.new(o0, reg.op1, reg.CRn, reg.CRm, reg.op2, rt)
       end
     end
 
@@ -1820,11 +1888,15 @@ module AArch64
                   when :sxtw then 0b110
                   when :sxtx then 0b111
                   else
-                    raise
+                    raise option.name
                   end
-          a PRFM_reg.new(rt, xn, rm, shift, option.amount / 3)
+          a PRFM_reg.new(rt, xn, rm, shift, (option.amount || 0) / 3)
         end
       else
+        if xn.integer?
+          xn = wrap_offset_with_label xn
+        end
+
         a PRFM_lit.new(rt, xn)
       end
     end
@@ -2132,7 +2204,7 @@ module AArch64
     end
 
     def stlxp rs, rt, rt2, rn
-      a STLXP.new(rs, rt, rt2, rn.first, rt.sizeb)
+      a STLXP.new(rs, rt, rt2, rn.first, rt.sz)
     end
 
     def stlxr rs, rt, rn
@@ -2195,7 +2267,7 @@ module AArch64
                      raise "Unknown type #{opt.name}"
                    end
 
-          amount = opt.amount / (rt.x? ? 3 : 2)
+          amount = (opt.amount || 0) / (rt.x? ? 3 : 2)
           a STR_reg_gen.new(rt, rn, rm, extend, amount, rt.sizeb)
         end
       end
@@ -2260,7 +2332,7 @@ module AArch64
                      raise "Unknown type #{opt.name}"
                    end
 
-          amount = opt.amount > 0 ? 1 : 0
+          amount = (opt.amount || 0) > 0 ? 1 : 0
 
           a STRH_reg.new(rt, rn, rm, extend, amount)
         end
@@ -2483,17 +2555,10 @@ module AArch64
       end
 
       if extend
-        extend = case extend
-                 when :uxtb then 0b000
-                 when :uxth then 0b001
-                 when :uxtw then 0b010
-                 when :uxtx then 0b011
-                 when :sxtb then 0b100
-                 when :sxth then 0b101
-                 when :sxtw then 0b110
-                 when :sxtx then 0b111
+        extend = if m.x?
+                   Utils.sub_decode_extend64(extend)
                  else
-                   raise "Unknown extend #{extend}"
+                   Utils.sub_decode_extend32(extend)
                  end
         a SUBS_addsub_ext.new(d, n, m, extend, amount, d.sf)
       else
@@ -2530,22 +2595,15 @@ module AArch64
       end
 
       if extend
-        extend = case extend
-                 when :uxtb then 0b000
-                 when :uxth then 0b001
-                 when :uxtw then 0b010
-                 when :uxtx then 0b011
-                 when :sxtb then 0b100
-                 when :sxth then 0b101
-                 when :sxtw then 0b110
-                 when :sxtx then 0b111
+        extend = if m.x?
+                   Utils.sub_decode_extend64(extend)
                  else
-                   raise "Unknown extend #{extend}"
+                   Utils.sub_decode_extend32(extend)
                  end
         a SUB_addsub_ext.new(d, n, m, extend, amount, d.sf)
       else
         if m.integer?
-          a SUB_addsub_imm.new(d, n, m, lsl / 12, d.sf)
+          a SUB_addsub_imm.new(d, n, m, (lsl || 0) / 12, d.sf)
         else
           shift = [:lsl, :lsr, :asr].index(shift) || raise(NotImplementedError)
           a SUB_addsub_shift.new(d, n, m, shift, amount, d.sf)
@@ -2641,10 +2699,16 @@ module AArch64
     end
 
     def tbnz rt, imm, label
+      if label.integer?
+        label = wrap_offset_with_label label
+      end
       a TBNZ.new(rt, imm, label, rt.sf)
     end
 
     def tbz rt, imm, label
+      if label.integer?
+        label = wrap_offset_with_label label
+      end
       a TBZ.new(rt, imm, label, rt.sf)
     end
 
@@ -2764,5 +2828,11 @@ module AArch64
       @insns = @insns << insn
       self
     end
+
+    def wrap_offset_with_label offset
+      label = Label.new :none
+      label.set_offset offset
+      label
+    end
   end
 end

data/test/base_instructions_test.rb

@@ -134,9 +134,16 @@ class BaseInstructionsTest < AArch64::Test
     assert_one_insn "adr x3, #4"
   end
 
+  def test_ADR_off
+    asm.adr X3, 4
+    assert_one_insn "adr x3, #4"
+  end
+
   def test_ADRP
-    asm.adrp X3, 4000
-    assert_one_insn "adrp x3, #0x4000"
+    # adrp x3, #0x4000
+    assert_bytes [0x23, 00, 00, 0x90] do |asm|
+      asm.adrp x3, 0x4000
+    end
   end
 
   def test_AND_log_imm
@@ -334,6 +341,13 @@ class BaseInstructionsTest < AArch64::Test
     end
   end
 
+  def test_hint
+    # hint #0xc
+    assert_bytes [0x9f, 0x21, 0x3, 0xd5] do |asm|
+      asm.hint 0xc
+    end
+  end
+
   def test_AUTIB
     # AUTIB  <Xd>, <Xn|SP>
     assert_bytes [0x41, 0x14, 0xc1, 0xda] do |asm|
@@ -387,6 +401,10 @@ class BaseInstructionsTest < AArch64::Test
       asm.b label, cond: :pl
       asm.put_label label
     end
+
+    assert_one_insn "b.pl #4" do |asm|
+      asm.b 4, cond: :pl
+    end
   end
 
   def test_BC_cond
@@ -396,6 +414,10 @@ class BaseInstructionsTest < AArch64::Test
       asm.bc label, cond: :pl
       asm.put_label label
     end
+
+    assert_bytes [53, 0, 0, 84] do |asm|
+      asm.bc 4, cond: :pl
+    end
   end
 
   def test_BFC_BFM
@@ -2995,6 +3017,9 @@ class BaseInstructionsTest < AArch64::Test
       asm.ldr w1, label
       asm.put_label label
     end
+    assert_one_insn "ldr x1, #4" do |asm|
+      asm.ldr x1, 4
+    end
   end
 
   def test_LDRA
@@ -3075,7 +3100,8 @@ class BaseInstructionsTest < AArch64::Test
     assert_bytes [0x69,0x7b,0x66,0x38] do |asm|
       asm.ldrb     w9, [x27, x6, lsl(0)]
     end
-    assert_bytes [0xab,0xeb,0x63,0x38] do |asm|
+    # ldrb     w11, [x29, x3, sxtx]
+    assert_bytes [0xab, 0xeb, 0x63, 0x38] do |asm|
       asm.ldrb     w11, [x29, x3, sxtx]
     end
     assert_bytes [0x4e,0x4b,0x66,0x38] do |asm|
@@ -8299,6 +8325,10 @@ class BaseInstructionsTest < AArch64::Test
   end
 
   def test_SUB_all
+    # FIXME
+    #assert_bytes [0x7f,0x70,0x27,0xcb] do |asm|
+    #  asm.sub sp, x3, x7, extend: :uxtx, amount: 4
+    #end
     assert_bytes [0x82,0x08,0x25,0xcb] do |asm|
       asm.sub      x2, x4, w5, uxtb(2)
     end
@@ -8445,7 +8475,7 @@ class BaseInstructionsTest < AArch64::Test
 
   def test_SUBP
     # SUBP  <Xd>, <Xn|SP>, <Xm|SP>
-    assert_bytes [0x43, 0, 0xc3, 0x9a] do |asm|
+    assert_bytes [65, 0, 0xc3, 0x9a] do |asm|
       asm.subp x1, x2, x3
     end
   end

data/test/helper.rb

@@ -1,4 +1,5 @@
 require "aarch64"
+require "aarch64/parser"
 require "minitest/autorun"
 require "hatstone"
 require "stringio"
@@ -14,17 +15,56 @@ module AArch64
       str.split(" ").map { |x| x.to_i(16) }
     end
 
+    def color_diff expected, actual
+      len = expected.bytesize
+      raise unless actual.bytesize == len
+
+      exp_out = ''
+      act_out = ''
+      len.times do |i|
+        if expected[i] == actual[i]
+          exp_out << expected[i]
+          act_out << actual[i]
+        else
+          exp_out << "\e[32m"
+          exp_out << expected[i]
+          exp_out << "\e[30m"
+          act_out << "\e[31m"
+          act_out << actual[i]
+          act_out << "\e[30m"
+        end
+      end
+
+      [exp_out, act_out]
+    end
+
+    def try_parse asm_str, bytes
+      parser = AArch64::Parser.new
+      parser.parse asm_str
+    rescue Racc::ParseError, ArgumentError, NameError
+      bytes = "[" + bytes.map { |x| sprintf("%#04x", x) }.join(", ") + "]"
+      puts "assert_bytes #{asm_str.dump}, #{bytes}"
+    end
+
     def assert_bytes bytes
       asm = Assembler.new
       yield asm
-      jit_buffer = StringIO.new
-      asm.write_to jit_buffer
-      if false
-        actual_bin = sprintf("%032b", jit_buffer.string.unpack1("L<")).gsub(/([01]{4})/, '\1_').sub(/_$/, '')
-        expected_bin = sprintf("%032b", bytes.pack("C4").unpack1("L<")).gsub(/([01]{4})/, '\1_').sub(/_$/, '')
-        assert_equal expected_bin, actual_bin
-      end
-      assert_equal bytes, jit_buffer.string.bytes
+      io = StringIO.new
+      asm.write_to io
+      assert_equal bytes, io.string.bytes, ->() {
+        pos          = 32.times.map { |i| (i % 0x10).to_s(16) }.join.reverse
+        actual_bin   = sprintf("%032b", io.string.unpack1("L<"))
+        expected_bin = sprintf("%032b", bytes.pack("C4").unpack1("L<"))
+        broken = []
+        actual_bin.bytes.zip(expected_bin.bytes).each_with_index { |(a, b), i|
+          broken << (31 - i) unless a == b
+        }
+        input = nil
+        expected_bin, actual_bin = color_diff(expected_bin, actual_bin)
+        "idx: #{pos}\nexp: #{expected_bin}\nact: #{actual_bin}\n" +
+          broken.reverse.map { |idx| "Bit #{idx} differs" }.join("\n") +
+          "\n#{input}"
+      }
     end
 
     def assert_insn binary, asm: