aarch64 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df38bc865f977ddb5498fa1616a56829303b3b6d34230b02cd9edf9af4a3c70e
-  data.tar.gz: 6161450d59e1e419f3e5935a2f213029e7fe68866bfaf0911520ae43465d7e6d
+  metadata.gz: d4148547f29912a9cea29d06ba88ebafff8ffd701b187ab9aa3a0b4ee1d309b0
+  data.tar.gz: dc7b08ee7be2e57acfb2d5181d374a9baf6806be65dee0318cd95417349a2cfc
 SHA512:
-  metadata.gz: 61bdd48efacc2d2425833351baf51c47f8170494857c8579e5cdd15d0763991fcbf2e277bef9819ae578e89c1535042411fc03304cb35f79c43741c066aa3144
-  data.tar.gz: 59a47c392685565777aadc2d970bb3dbfed4e3b5c70394e4f2116b9dd1410192fdf4917d9495472dca9b4ed3c300aed832648e760b745fc0d25bf3f46843ca78
+  metadata.gz: f215a62f40c5ad36e81ec7d1d1110e21639ab0b19950283f4b5dbde46e5b26c17081a527d41dca600c4a8e8aa07eb0fc5f1f21a68d4425084c5eaf94de8baaef
+  data.tar.gz: 4d0027eeb4a45b5d77e409b2fc343d59ec19548b4874f1c2e61bfeabcecb991ee2527a0969133f1029aa13e2623361bef3e6637ed65f9617001f5709ab31b99a

data/lib/aarch64/version.rb

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

data/lib/aarch64.rb

@@ -10,6 +10,7 @@ module AArch64
       alias sp? sp
       alias zr? zr
       def integer?; false; end
+      def register?; true; end
     end
 
     class XRegister < Register
@@ -22,6 +23,7 @@ module AArch64
       def opc; 0b10; end
       def opc2; 0b11; end
       def opc3; 0b10; end
+      def name; "X#{to_i}"; end
     end
 
     class WRegister < Register
@@ -34,6 +36,7 @@ module AArch64
       def opc; 0b11; end
       def opc2; 0b10; end
       def opc3; 0b00; end
+      def name; "W#{to_i}"; end
     end
 
     31.times { |i|
@@ -2715,14 +2718,26 @@ module AArch64
       if label.integer?
         label = wrap_offset_with_label label
       end
-      a TBNZ.new(rt, imm, label, rt.sf)
+
+      sf = 0
+      if imm > 31
+        sf = 1
+        imm -= 32
+      end
+      a TBNZ.new(rt, imm, label, 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)
+
+      sf = 0
+      if imm > 31
+        sf = 1
+        imm -= 32
+      end
+      a TBZ.new(rt, imm, label, sf)
     end
 
     def tlbi tlbi_op, xt = XZR
@@ -2827,6 +2842,12 @@ module AArch64
       a YIELD.new
     end
 
+    ##
+    # Yields the offset in the instructions
+    def patch_location
+      yield @insns.length * 4
+    end
+
     def write_to io
       io.write to_binary
     end

data/test/base_instructions_test.rb

@@ -2774,6 +2774,12 @@ class BaseInstructionsTest < AArch64::Test
     end
   end
 
+  def test_ldb_x30
+    assert_bytes [0xfe,0x7b,0xc1,0xa8] do |asm|
+      asm.ldp  x30, x30, [sp], 16
+    end
+  end
+
   def test_LDP_gen
     # LDP  <Wt1>, <Wt2>, [<Xn|SP>], #<imm>
     # LDP  <Xt1>, <Xt2>, [<Xn|SP>], #<imm>
@@ -8866,6 +8872,18 @@ class BaseInstructionsTest < AArch64::Test
       asm.tbnz w3, 5, label
       asm.put_label label
     end
+
+    assert_one_insn "tbnz x0, #0x20, #4" do |asm|
+      label = asm.make_label :foo
+      asm.tbnz x0, 32, label
+      asm.put_label label
+    end
+
+    assert_one_insn "tbnz w0, #0, #4" do |asm|
+      label = asm.make_label :foo
+      asm.tbnz x0, 0, label
+      asm.put_label label
+    end
   end
 
   def test_TBZ
@@ -8878,6 +8896,12 @@ class BaseInstructionsTest < AArch64::Test
       asm.tbz w3, 5, label
       asm.put_label label
     end
+
+    assert_one_insn "tbz x0, #0x20, #4" do |asm|
+      label = asm.make_label :foo
+      asm.tbz x0, 32, label
+      asm.put_label label
+    end
   end
 
   def test_TLBI_SYS

data/test/dsl_test.rb

@@ -1,6 +1,20 @@
 require "helper"
 
 class DSLTest < AArch64::Test
+  def test_patch_location
+    asm = AArch64::Assembler.new
+    found = nil
+    asm.pretty do
+      asm.mov x0, x1
+      asm.patch_location { |loc| found = loc }
+      asm.movz x2, 5
+    end
+
+    bytes = asm.to_binary
+    assert_equal 8, bytes.bytesize
+    assert_equal 4, found
+  end
+
   def test_dsl_has_methods
     assert_bytes [0x9f,0x08,0x25,0xab] do |asm|
       asm.pretty do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aarch64
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Aaron Patterson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-19 00:00:00.000000000 Z
+date: 2023-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hatstone