Added SUBS support

Author: RealA10N

immediates/set_flags.go

@@ -9,7 +9,7 @@ const (
 
 func (s SetFlags) Binary() uint32 {
 	if s {
-		return 1 << 29
+		return 1
 	} else {
 		return 0
 	}

instructions/add.go

@@ -19,7 +19,7 @@ func ADD(
 ) Add {
 	return Add(
 		0x8B000000 |
-			(setFlags.Binary()) |
+			(setFlags.Binary() << 29) |
 			(Xm.Binary() << 16) |
 			(Xn.Binary() << 5) |
 			(Xd.Binary()),

instructions/sub.go

@@ -14,9 +14,11 @@ func SUB(
 	Xd registers.GPRegister,
 	Xn registers.GPRegister,
 	Xm registers.GPRegister,
+	setFlags immediates.SetFlags,
 ) Sub {
 	return Sub(
 		0xCB000000 |
+			(setFlags.Binary() << 29) |
 			(Xm.Binary() << 16) |
 			(Xn.Binary() << 5) |
 			(Xd.Binary()),
@@ -39,8 +41,12 @@ func (i Sub) Xm() registers.GPRegister {
 	return registers.GPRegister((i >> 16) & 0x1F)
 }
 
+func (i Sub) SetFlags() immediates.SetFlags {
+	return immediates.SetFlagsFromBinary(uint32(i))
+}
+
 func (i Sub) String() string {
-	return fmt.Sprintf("sub %s, %s, %s", i.Xd(), i.Xn(), i.Xm())
+	return fmt.Sprintf("sub%s %s, %s, %s", i.SetFlags(), i.Xd(), i.Xn(), i.Xm())
 }
 
 // SUBI instruction (SUB with immediate)

instructions/sub_test.go

@@ -14,13 +14,15 @@ func TestSub(t *testing.T) {
 		registers.GPRegisterX3,
 		registers.GPRegisterX4,
 		registers.GPRegisterX5,
+		immediates.DoNotSetFlags,
 	))
 
 	// SUB X27, X26, X25
 	AssertExpectedInstruction(t, "sub x27, x26, x25", instructions.SUB(
 		registers.GPRegisterX27,
 		registers.GPRegisterX26,
 		registers.GPRegisterX25,
+		immediates.DoNotSetFlags,
 	))
 }
 
@@ -30,27 +32,31 @@ func TestSubWithXZR(t *testing.T) {
 		registers.GPRegisterXZR,
 		registers.GPRegisterX4,
 		registers.GPRegisterX5,
+		immediates.DoNotSetFlags,
 	))
 
 	// Test SUB with XZR as first source
 	AssertExpectedInstruction(t, "sub x3, xzr, x5", instructions.SUB(
 		registers.GPRegisterX3,
 		registers.GPRegisterXZR,
 		registers.GPRegisterX5,
+		immediates.DoNotSetFlags,
 	))
 
 	// Test SUB with XZR as second source
 	AssertExpectedInstruction(t, "sub x3, x4, xzr", instructions.SUB(
 		registers.GPRegisterX3,
 		registers.GPRegisterX4,
 		registers.GPRegisterXZR,
+		immediates.DoNotSetFlags,
 	))
 
 	// Multiple XZR registers
 	AssertExpectedInstruction(t, "sub xzr, xzr, xzr", instructions.SUB(
 		registers.GPRegisterXZR,
 		registers.GPRegisterXZR,
 		registers.GPRegisterXZR,
+		immediates.DoNotSetFlags,
 	))
 }
 
@@ -69,3 +75,19 @@ func TestSubImm(t *testing.T) {
 		immediates.Immediate12(1000),
 	))
 }
+
+func TestSubDoSetFlags(t *testing.T) {
+	AssertExpectedInstruction(t, "subs x0, x1, x2", instructions.SUB(
+		registers.GPRegisterX0,
+		registers.GPRegisterX1,
+		registers.GPRegisterX2,
+		immediates.DoSetFlags,
+	))
+
+	AssertExpectedInstruction(t, "subs xzr, x30, x29", instructions.SUB(
+		registers.GPRegisterXZR,
+		registers.GPRegisterX30,
+		registers.GPRegisterX29,
+		immediates.DoSetFlags,
+	))
+}