aarch64 1.0.1 → 2.0.0

data/lib/aarch64/instructions/cas.rb

@@ -10,30 +10,30 @@ module AArch64
     # CASA  <Xs>, <Xt>, [<Xn|SP>{,#0}]
     # CASAL  <Xs>, <Xt>, [<Xn|SP>{,#0}]
     # CASL  <Xs>, <Xt>, [<Xn|SP>{,#0}]
-    class CAS
+    class CAS < Instruction
       def initialize s, t, n, l, o0, sf
-        @s  = s
-        @t  = t
-        @n  = n
-        @l  = l
-        @o0 = o0
-        @sf = sf
+        @s  = check_mask(s, 0x1f)
+        @t  = check_mask(t, 0x1f)
+        @n  = check_mask(n, 0x1f)
+        @l  = check_mask(l, 0x01)
+        @o0 = check_mask(o0, 0x01)
+        @sf = check_mask(sf, 0x01)
       end
 
       def encode
-        CAS(@sf, @l, @s.to_i, @o0, @n.to_i, @t.to_i)
+        CAS(@sf, @l, @s, @o0, @n, @t)
       end
 
       private
 
       def CAS x, l, rs, o0, rn, rt
         insn = 0b10_0010001_0_1_00000_0_11111_00000_00000
-        insn |= ((x & 0x1) << 30)
-        insn |= ((l & 0x1) << 22)
-        insn |= ((rs & 0x1f) << 16)
-        insn |= ((o0 & 0x1) << 15)
-        insn |= ((rn & 0x1f) << 5)
-        insn |= (rt & 0x1f)
+        insn |= ((x) << 30)
+        insn |= ((l) << 22)
+        insn |= ((rs) << 16)
+        insn |= ((o0) << 15)
+        insn |= ((rn) << 5)
+        insn |= (rt)
         insn
       end
     end

data/lib/aarch64/instructions/casb.rb

@@ -6,28 +6,28 @@ module AArch64
     # CASALB  <Ws>, <Wt>, [<Xn|SP>{,#0}]
     # CASB  <Ws>, <Wt>, [<Xn|SP>{,#0}]
     # CASLB  <Ws>, <Wt>, [<Xn|SP>{,#0}]
-    class CASB
+    class CASB < Instruction
       def initialize rs, rt, rn, l, o0
-        @rs = rs
-        @rt = rt
-        @rn = rn
-        @l  = l
-        @o0 = o0
+        @rs = check_mask(rs, 0x1f)
+        @rt = check_mask(rt, 0x1f)
+        @rn = check_mask(rn, 0x1f)
+        @l  = check_mask(l, 0x01)
+        @o0 = check_mask(o0, 0x01)
       end
 
       def encode
-        CASB(@l, @rs.to_i, @o0, @rn.to_i, @rt.to_i)
+        CASB(@l, @rs, @o0, @rn, @rt)
       end
 
       private
 
       def CASB l, rs, o0, rn, rt
         insn = 0b00_0010001_0_1_00000_0_11111_00000_00000
-        insn |= ((l & 0x1) << 22)
-        insn |= ((rs & 0x1f) << 16)
-        insn |= ((o0 & 0x1) << 15)
-        insn |= ((rn & 0x1f) << 5)
-        insn |= (rt & 0x1f)
+        insn |= ((l) << 22)
+        insn |= ((rs) << 16)
+        insn |= ((o0) << 15)
+        insn |= ((rn) << 5)
+        insn |= (rt)
         insn
       end
     end

data/lib/aarch64/instructions/cash.rb

@@ -6,28 +6,28 @@ module AArch64
     # CASALH  <Ws>, <Wt>, [<Xn|SP>{,#0}]
     # CASH  <Ws>, <Wt>, [<Xn|SP>{,#0}]
     # CASLH  <Ws>, <Wt>, [<Xn|SP>{,#0}]
-    class CASH
+    class CASH < Instruction
       def initialize rs, rt, rn, l, o0
-        @rs = rs
-        @rt = rt
-        @rn = rn
-        @l  = l
-        @o0 = o0
+        @rs = check_mask(rs, 0x1f)
+        @rt = check_mask(rt, 0x1f)
+        @rn = check_mask(rn, 0x1f)
+        @l  = check_mask(l, 0x01)
+        @o0 = check_mask(o0, 0x01)
       end
 
       def encode
-        CASH(@l, @rs.to_i, @o0, @rn.to_i, @rt.to_i)
+        CASH(@l, @rs, @o0, @rn, @rt)
       end
 
       private
 
       def CASH l, rs, o0, rn, rt
         insn = 0b01_0010001_0_1_00000_0_11111_00000_00000
-        insn |= ((l & 0x1) << 22)
-        insn |= ((rs & 0x1f) << 16)
-        insn |= ((o0 & 0x1) << 15)
-        insn |= ((rn & 0x1f) << 5)
-        insn |= (rt & 0x1f)
+        insn |= ((l) << 22)
+        insn |= ((rs) << 16)
+        insn |= ((o0) << 15)
+        insn |= ((rn) << 5)
+        insn |= (rt)
         insn
       end
     end

data/lib/aarch64/instructions/casp.rb

@@ -10,30 +10,30 @@ module AArch64
     # CASPA  <Xs>, <X(s+1)>, <Xt>, <X(t+1)>, [<Xn|SP>{,#0}]
     # CASPAL  <Xs>, <X(s+1)>, <Xt>, <X(t+1)>, [<Xn|SP>{,#0}]
     # CASPL  <Xs>, <X(s+1)>, <Xt>, <X(t+1)>, [<Xn|SP>{,#0}]
-    class CASP
+    class CASP < Instruction
       def initialize rs, rt, rn, l, o0, sf
-        @rs = rs
-        @rt = rt
-        @rn = rn
-        @l  = l
-        @o0 = o0
-        @sf = sf
+        @rs = check_mask(rs, 0x1f)
+        @rt = check_mask(rt, 0x1f)
+        @rn = check_mask(rn, 0x1f)
+        @l  = check_mask(l, 0x01)
+        @o0 = check_mask(o0, 0x01)
+        @sf = check_mask(sf, 0x01)
       end
 
       def encode
-        CASP(@sf, @l, @rs.to_i, @o0, @rn.to_i, @rt.to_i)
+        CASP(@sf, @l, @rs, @o0, @rn, @rt)
       end
 
       private
 
       def CASP sz, l, rs, o0, rn, rt
         insn = 0b0_0_001000_0_0_1_00000_0_11111_00000_00000
-        insn |= ((sz & 0x1) << 30)
-        insn |= ((l & 0x1) << 22)
-        insn |= ((rs & 0x1f) << 16)
-        insn |= ((o0 & 0x1) << 15)
-        insn |= ((rn & 0x1f) << 5)
-        insn |= (rt & 0x1f)
+        insn |= ((sz) << 30)
+        insn |= ((l) << 22)
+        insn |= ((rs) << 16)
+        insn |= ((o0) << 15)
+        insn |= ((rn) << 5)
+        insn |= (rt)
         insn
       end
     end

data/lib/aarch64/instructions/cbnz.rb

@@ -4,24 +4,24 @@ module AArch64
     # Compare and Branch on Nonzero
     # CBNZ  <Wt>, <label>
     # CBNZ  <Xt>, <label>
-    class CBNZ
+    class CBNZ < Instruction
       def initialize rt, label, sf
-        @rt    = rt
+        @rt    = check_mask(rt, 0x1f)
         @label = label
-        @sf    = sf
+        @sf    = check_mask(sf, 0x1)
       end
 
       def encode
-        CBNZ(@sf, @label.to_i / 4, @rt.to_i)
+        CBNZ(@sf, check_mask(unwrap_label(@label), 0x7ffff), @rt)
       end
 
       private
 
       def CBNZ sf, imm19, rt
         insn = 0b0_011010_1_0000000000000000000_00000
-        insn |= ((sf & 0x1) << 31)
-        insn |= ((imm19 & 0x7ffff) << 5)
-        insn |= (rt & 0x1f)
+        insn |= (sf << 31)
+        insn |= (imm19 << 5)
+        insn |= rt
         insn
       end
     end

data/lib/aarch64/instructions/cbz.rb

@@ -4,24 +4,24 @@ module AArch64
     # Compare and Branch on Zero
     # CBZ  <Wt>, <label>
     # CBZ  <Xt>, <label>
-    class CBZ
+    class CBZ < Instruction
       def initialize rt, label, sf
-        @rt    = rt
+        @rt    = check_mask(rt, 0x1f)
         @label = label
-        @sf    = sf
+        @sf    = check_mask(sf, 0x1)
       end
 
       def encode
-        CBZ(@sf, @label.to_i / 4, @rt.to_i)
+        CBZ(@sf, check_mask(unwrap_label(@label), 0x7ffff), @rt)
       end
 
       private
 
       def CBZ sf, imm19, rt
         insn = 0b0_011010_0_0000000000000000000_00000
-        insn |= ((sf & 0x1) << 31)
-        insn |= ((imm19 & 0x7ffff) << 5)
-        insn |= (rt & 0x1f)
+        insn |= (sf << 31)
+        insn |= (imm19 << 5)
+        insn |= rt
         insn
       end
     end

data/lib/aarch64/instructions/ccmn_imm.rb

@@ -4,28 +4,28 @@ module AArch64
     # Conditional Compare Negative (immediate)
     # CCMN  <Wn>, #<imm>, #<nzcv>, <cond>
     # CCMN  <Xn>, #<imm>, #<nzcv>, <cond>
-    class CCMN_imm
+    class CCMN_imm < Instruction
       def initialize rn, imm, nzcv, cond, sf
-        @rn   = rn
-        @imm  = imm
-        @nzcv = nzcv
-        @cond = cond
-        @sf   = sf
+        @rn   = check_mask(rn, 0x1f)
+        @imm  = check_mask(imm, 0x1f)
+        @nzcv = check_mask(nzcv, 0x0f)
+        @cond = check_mask(cond, 0x0f)
+        @sf   = check_mask(sf, 0x01)
       end
 
       def encode
-        CCMN_imm(@sf, @imm, @cond, @rn.to_i, @nzcv)
+        CCMN_imm(@sf, @imm, @cond, @rn, @nzcv)
       end
 
       private
 
       def CCMN_imm sf, imm5, cond, rn, nzcv
         insn = 0b0_0_1_11010010_00000_0000_1_0_00000_0_0000
-        insn |= ((sf & 0x1) << 31)
-        insn |= ((imm5 & 0x1f) << 16)
-        insn |= ((cond & 0xf) << 12)
-        insn |= ((rn & 0x1f) << 5)
-        insn |= (nzcv & 0xf)
+        insn |= ((sf) << 31)
+        insn |= ((imm5) << 16)
+        insn |= ((cond) << 12)
+        insn |= ((rn) << 5)
+        insn |= (nzcv)
         insn
       end
     end

data/lib/aarch64/instructions/ccmn_reg.rb

@@ -4,28 +4,28 @@ module AArch64
     # Conditional Compare Negative (register)
     # CCMN  <Wn>, <Wm>, #<nzcv>, <cond>
     # CCMN  <Xn>, <Xm>, #<nzcv>, <cond>
-    class CCMN_reg
+    class CCMN_reg < Instruction
       def initialize rn, rm, nzcv, cond, sf
-        @rn   = rn
-        @rm   = rm
-        @nzcv = nzcv
-        @cond = cond
-        @sf   = sf
+        @rn   = check_mask(rn, 0x1f)
+        @rm   = check_mask(rm, 0x1f)
+        @nzcv = check_mask(nzcv, 0x0f)
+        @cond = check_mask(cond, 0x0f)
+        @sf   = check_mask(sf, 0x01)
       end
 
       def encode
-        CCMN_reg(@sf, @rm.to_i, @cond, @rn.to_i, @nzcv)
+        CCMN_reg(@sf, @rm, @cond, @rn, @nzcv)
       end
 
       private
 
       def CCMN_reg sf, rm, cond, rn, nzcv
         insn = 0b0_0_1_11010010_00000_0000_0_0_00000_0_0000
-        insn |= ((sf & 0x1) << 31)
-        insn |= ((rm & 0x1f) << 16)
-        insn |= ((cond & 0xf) << 12)
-        insn |= ((rn & 0x1f) << 5)
-        insn |= (nzcv & 0xf)
+        insn |= ((sf) << 31)
+        insn |= ((rm) << 16)
+        insn |= ((cond) << 12)
+        insn |= ((rn) << 5)
+        insn |= (nzcv)
         insn
       end
     end

data/lib/aarch64/instructions/ccmp_imm.rb

@@ -4,28 +4,28 @@ module AArch64
     # Conditional Compare (immediate)
     # CCMP  <Wn>, #<imm>, #<nzcv>, <cond>
     # CCMP  <Xn>, #<imm>, #<nzcv>, <cond>
-    class CCMP_imm
+    class CCMP_imm < Instruction
       def initialize rn, imm, nzcv, cond, sf
-        @rn   = rn
-        @imm  = imm
-        @nzcv = nzcv
-        @cond = cond
-        @sf   = sf
+        @rn   = check_mask(rn, 0x1f)
+        @imm  = check_mask(imm, 0x1f)
+        @nzcv = check_mask(nzcv, 0x0f)
+        @cond = check_mask(cond, 0x0f)
+        @sf   = check_mask(sf, 0x01)
       end
 
       def encode
-        CCMP_imm(@sf, @imm, @cond, @rn.to_i, @nzcv)
+        CCMP_imm(@sf, @imm, @cond, @rn, @nzcv)
       end
 
       private
 
       def CCMP_imm sf, imm5, cond, rn, nzcv
         insn = 0b0_1_1_11010010_00000_0000_1_0_00000_0_0000
-        insn |= ((sf & 0x1) << 31)
-        insn |= ((imm5 & 0x1f) << 16)
-        insn |= ((cond & 0xf) << 12)
-        insn |= ((rn & 0x1f) << 5)
-        insn |= (nzcv & 0xf)
+        insn |= ((sf) << 31)
+        insn |= ((imm5) << 16)
+        insn |= ((cond) << 12)
+        insn |= ((rn) << 5)
+        insn |= (nzcv)
         insn
       end
     end

data/lib/aarch64/instructions/ccmp_reg.rb

@@ -4,28 +4,28 @@ module AArch64
     # Conditional Compare (register)
     # CCMP  <Wn>, <Wm>, #<nzcv>, <cond>
     # CCMP  <Xn>, <Xm>, #<nzcv>, <cond>
-    class CCMP_reg
+    class CCMP_reg < Instruction
       def initialize rn, rm, nzcv, cond, sf
-        @rn   = rn
-        @rm   = rm
-        @nzcv = nzcv
-        @cond = cond
-        @sf   = sf
+        @rn   = check_mask(rn, 0x1f)
+        @rm   = check_mask(rm, 0x1f)
+        @nzcv = check_mask(nzcv, 0x0f)
+        @cond = check_mask(cond, 0x0f)
+        @sf   = check_mask(sf, 0x01)
       end
 
       def encode
-        CCMP_reg(@sf, @rm.to_i, @cond, @rn.to_i, @nzcv)
+        CCMP_reg(@sf, @rm, @cond, @rn, @nzcv)
       end
 
       private
 
       def CCMP_reg sf, rm, cond, rn, nzcv
         insn = 0b0_1_1_11010010_00000_0000_0_0_00000_0_0000
-        insn |= ((sf & 0x1) << 31)
-        insn |= ((rm & 0x1f) << 16)
-        insn |= ((cond & 0xf) << 12)
-        insn |= ((rn & 0x1f) << 5)
-        insn |= (nzcv & 0xf)
+        insn |= ((sf) << 31)
+        insn |= ((rm) << 16)
+        insn |= ((cond) << 12)
+        insn |= ((rn) << 5)
+        insn |= (nzcv)
         insn
       end
     end

data/lib/aarch64/instructions/cfinv.rb

@@ -3,16 +3,9 @@ module AArch64
     # CFINV -- A64
     # Invert Carry Flag
     # CFINV
-    class CFINV
+    class CFINV < Instruction
       def encode
-        CFINV()
-      end
-
-      private
-
-      def CFINV
-        insn = 0b1101010100_0_0_0_000_0100_0000_000_11111
-        insn
+        0b1101010100_0_0_0_000_0100_0000_000_11111
       end
     end
   end

data/lib/aarch64/instructions/clrex.rb

@@ -3,9 +3,9 @@ module AArch64
     # CLREX -- A64
     # Clear Exclusive
     # CLREX  {#<imm>}
-    class CLREX
+    class CLREX < Instruction
       def initialize imm
-        @imm = imm
+        @imm = check_mask(imm, 0x0f)
       end
 
       def encode
@@ -16,7 +16,7 @@ module AArch64
 
       def CLREX crm
         insn = 0b1101010100_0_00_011_0011_0000_010_11111
-        insn |= ((crm & 0xf) << 8)
+        insn |= ((crm) << 8)
         insn
       end
     end

data/lib/aarch64/instructions/cls_int.rb

@@ -4,24 +4,24 @@ module AArch64
     # Count Leading Sign bits
     # CLS  <Wd>, <Wn>
     # CLS  <Xd>, <Xn>
-    class CLS_int
+    class CLS_int < Instruction
       def initialize rd, rn, sf
-        @rd = rd
-        @rn = rn
-        @sf = sf
+        @rd = check_mask(rd, 0x1f)
+        @rn = check_mask(rn, 0x1f)
+        @sf = check_mask(sf, 0x01)
       end
 
       def encode
-        CLS_int(@sf, @rn.to_i, @rd.to_i)
+        CLS_int(@sf, @rn, @rd)
       end
 
       private
 
       def CLS_int sf, rn, rd
         insn = 0b0_1_0_11010110_00000_00010_1_00000_00000
-        insn |= ((sf & 0x1) << 31)
-        insn |= ((rn & 0x1f) << 5)
-        insn |= (rd & 0x1f)
+        insn |= ((sf) << 31)
+        insn |= ((rn) << 5)
+        insn |= (rd)
         insn
       end
     end

data/lib/aarch64/instructions/clz_int.rb

@@ -4,24 +4,24 @@ module AArch64
     # Count Leading Zeros
     # CLZ  <Wd>, <Wn>
     # CLZ  <Xd>, <Xn>
-    class CLZ_int
+    class CLZ_int < Instruction
       def initialize rd, rn, sf
-        @rd = rd
-        @rn = rn
-        @sf = sf
+        @rd = check_mask(rd, 0x1f)
+        @rn = check_mask(rn, 0x1f)
+        @sf = check_mask(sf, 0x01)
       end
 
       def encode
-        CLZ_int(@sf, @rn.to_i, @rd.to_i)
+        CLZ_int(@sf, @rn, @rd)
       end
 
       private
 
       def CLZ_int sf, rn, rd
         insn = 0b0_1_0_11010110_00000_00010_0_00000_00000
-        insn |= ((sf & 0x1) << 31)
-        insn |= ((rn & 0x1f) << 5)
-        insn |= (rd & 0x1f)
+        insn |= ((sf) << 31)
+        insn |= ((rn) << 5)
+        insn |= (rd)
         insn
       end
     end

data/lib/aarch64/instructions/crc32.rb

@@ -6,28 +6,28 @@ module AArch64
     # CRC32H  <Wd>, <Wn>, <Wm>
     # CRC32W  <Wd>, <Wn>, <Wm>
     # CRC32X  <Wd>, <Wn>, <Xm>
-    class CRC32
+    class CRC32 < Instruction
       def initialize rd, rn, rm, sz, sf
-        @rd = rd
-        @rn = rn
-        @rm = rm
-        @sz = sz
-        @sf = sf
+        @rd = check_mask(rd, 0x1f)
+        @rn = check_mask(rn, 0x1f)
+        @rm = check_mask(rm, 0x1f)
+        @sz = check_mask(sz, 0x03)
+        @sf = check_mask(sf, 0x01)
       end
 
       def encode
-        CRC32(@sf, @rm.to_i, @sz, @rn.to_i, @rd.to_i)
+        CRC32(@sf, @rm, @sz, @rn, @rd)
       end
 
       private
 
       def CRC32 sf, rm, sz, rn, rd
         insn = 0b0_0_0_11010110_00000_010_0_00_00000_00000
-        insn |= ((sf & 0x1) << 31)
-        insn |= ((rm & 0x1f) << 16)
-        insn |= ((sz & 0x3) << 10)
-        insn |= ((rn & 0x1f) << 5)
-        insn |= (rd & 0x1f)
+        insn |= ((sf) << 31)
+        insn |= ((rm) << 16)
+        insn |= ((sz) << 10)
+        insn |= ((rn) << 5)
+        insn |= (rd)
         insn
       end
     end

data/lib/aarch64/instructions/crc32c.rb

@@ -6,28 +6,28 @@ module AArch64
     # CRC32CH  <Wd>, <Wn>, <Wm>
     # CRC32CW  <Wd>, <Wn>, <Wm>
     # CRC32CX  <Wd>, <Wn>, <Xm>
-    class CRC32C
+    class CRC32C < Instruction
       def initialize rd, rn, rm, sz, sf
-        @rd = rd
-        @rn = rn
-        @rm = rm
-        @sz = sz
-        @sf = sf
+        @rd = check_mask(rd, 0x1f)
+        @rn = check_mask(rn, 0x1f)
+        @rm = check_mask(rm, 0x1f)
+        @sz = check_mask(sz, 0x03)
+        @sf = check_mask(sf, 0x01)
       end
 
       def encode
-        CRC32C(@sf, @rm.to_i, @sz, @rn.to_i, @rd.to_i)
+        CRC32C(@sf, @rm, @sz, @rn, @rd)
       end
 
       private
 
       def CRC32C sf, rm, sz, rn, rd
         insn = 0b0_0_0_11010110_00000_010_1_00_00000_00000
-        insn |= ((sf & 0x1) << 31)
-        insn |= ((rm & 0x1f) << 16)
-        insn |= ((sz & 0x3) << 10)
-        insn |= ((rn & 0x1f) << 5)
-        insn |= (rd & 0x1f)
+        insn |= ((sf) << 31)
+        insn |= ((rm) << 16)
+        insn |= ((sz) << 10)
+        insn |= ((rn) << 5)
+        insn |= (rd)
         insn
       end
     end

data/lib/aarch64/instructions/csdb.rb

@@ -3,7 +3,7 @@ module AArch64
     # CSDB -- A64
     # Consumption of Speculative Data Barrier
     # CSDB
-    class CSDB
+    class CSDB < Instruction
       def encode
         0b1101010100_0_00_011_0010_0010_100_11111
       end

data/lib/aarch64/instructions/csel.rb

@@ -4,28 +4,28 @@ module AArch64
     # Conditional Select
     # CSEL  <Wd>, <Wn>, <Wm>, <cond>
     # CSEL  <Xd>, <Xn>, <Xm>, <cond>
-    class CSEL
+    class CSEL < Instruction
       def initialize rd, rn, rm, cond, sf
-        @rd   = rd
-        @rn   = rn
-        @rm   = rm
-        @cond = cond
-        @sf   = sf
+        @rd   = check_mask(rd, 0x1f)
+        @rn   = check_mask(rn, 0x1f)
+        @rm   = check_mask(rm, 0x1f)
+        @cond = check_mask(cond, 0x0f)
+        @sf   = check_mask(sf, 0x01)
       end
 
       def encode
-        CSEL @sf, @rm.to_i, @cond, @rn.to_i, @rd.to_i
+        CSEL @sf, @rm, @cond, @rn, @rd
       end
 
       private
 
       def CSEL sf, rm, cond, rn, rd
         insn = 0b0_0_0_11010100_00000_0000_0_0_00000_00000
-        insn |= ((sf & 0x1) << 31)
-        insn |= ((rm & 0x1f) << 16)
-        insn |= ((cond & 0xf) << 12)
-        insn |= ((rn & 0x1f) << 5)
-        insn |= (rd & 0x1f)
+        insn |= ((sf) << 31)
+        insn |= ((rm) << 16)
+        insn |= ((cond) << 12)
+        insn |= ((rn) << 5)
+        insn |= (rd)
         insn
       end
     end