From eade7e9a85f592ea340988a4f929b5fc04556a1d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 30 Sep 2024 19:17:56 +0900
Subject: [PATCH] [qfcc] Add anti-commutative flags for cross and fp sub

They're still not set, but the commutativity can be adjusted
individually.
---
 tools/qfcc/include/options.h    |  2 ++
 tools/qfcc/source/expr_binary.c | 30 ++++++++++++++++++++----------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/tools/qfcc/include/options.h b/tools/qfcc/include/options.h
index 3c8adf194..13154649f 100644
--- a/tools/qfcc/include/options.h
+++ b/tools/qfcc/include/options.h
@@ -51,6 +51,8 @@ typedef struct {
 	bool        commute_float_add;	// allow fp addition to commute
 	bool        commute_float_mul;	// allow fp multiplication to commute
 	bool        commute_float_dot;	// allow fp dot product to commute
+	bool        anticom_float_cross;// allow fp cross product to anti-commute
+	bool        anticom_float_sub;	// allow fp subtraction to anti-commute
 	bool        assoc_float_add;	// allow fp addition to be associative
 	bool        assoc_float_mul;	// allow fp multiplication to be associative
 	bool        no_double;			// double fp type is not supported
diff --git a/tools/qfcc/source/expr_binary.c b/tools/qfcc/source/expr_binary.c
index 73d767630..5c1114ea6 100644
--- a/tools/qfcc/source/expr_binary.c
+++ b/tools/qfcc/source/expr_binary.c
@@ -88,6 +88,16 @@ static bool fp_com_dot (void)
 	return options.code.commute_float_dot;
 }
 
+static bool fp_anti_cross (void)
+{
+	return options.code.anticom_float_cross;
+}
+
+static bool fp_anti_sub (void)
+{
+	return options.code.anticom_float_sub;
+}
+
 static bool fp_ass_add (void)
 {
 	return options.code.assoc_float_add;
@@ -113,7 +123,7 @@ static expr_type_t float_float[] = {
 	{'+',	&type_float,
 		.commutative = fp_com_add, .associative = fp_ass_add},
 	{'-',	&type_float,
-		.anticommute = fp_com_add},
+		.anticommute = fp_anti_sub},
 	{'*',	&type_float,
 		.commutative = fp_com_mul, .associative = fp_ass_mul},
 	{'/',	&type_float},
@@ -152,7 +162,7 @@ static expr_type_t float_int[] = {
 	{'+',	&type_float, 0, &type_float,
 		.commutative = fp_com_add, .associative = fp_ass_add},
 	{'-',	&type_float, 0, &type_float,
-		.anticommute = fp_com_add},
+		.anticommute = fp_anti_sub},
 	{'*',	&type_float, 0, &type_float,
 		.commutative = fp_com_mul, .associative = fp_ass_mul},
 	{'/',	&type_float, 0, &type_float},
@@ -181,7 +191,7 @@ static expr_type_t float_double[] = {
 	{'+',	&type_double, &type_double, 0,
 		.commutative = fp_com_add, .associative = fp_ass_add},
 	{'-',	&type_double, &type_double, 0,
-		.anticommute = fp_com_add},
+		.anticommute = fp_anti_sub},
 	{'*',	&type_double, &type_double, 0,
 		.commutative = fp_com_mul, .associative = fp_ass_mul},
 	{'/',	&type_double, &type_double, 0},
@@ -206,11 +216,11 @@ static expr_type_t vector_vector[] = {
 	{'+',	&type_vector,
 		.commutative = fp_com_add, .associative = fp_ass_add},
 	{'-',	&type_vector,
-		.anticommute = fp_com_add},
+		.anticommute = fp_anti_sub},
 	{QC_DOT,	.process = vector_dot,
 		.commutative = fp_com_dot},
 	{QC_CROSS,	&type_vector,
-		.anticommute = fp_com_add},
+		.anticommute = fp_anti_cross},
 	{QC_HADAMARD,	&type_vector,
 		.commutative = fp_com_mul, .associative = fp_ass_mul},
 	{'*',	.process = vector_multiply},
@@ -286,7 +296,7 @@ static expr_type_t quat_quat[] = {
 	{'+',	&type_quaternion,
 		.commutative = fp_com_add, .associative = fp_ass_add},
 	{'-',	&type_quaternion,
-		.anticommute = fp_com_add},
+		.anticommute = fp_anti_sub},
 	{'*',	&type_quaternion, .associative = always, .true_op = QC_QMUL},
 	{QC_EQ,	.process = quat_compare},
 	{QC_NE,	.process = quat_compare},
@@ -311,7 +321,7 @@ static expr_type_t int_float[] = {
 	{'+',	&type_float, &type_float, 0,
 		.commutative = fp_com_add, .associative = fp_ass_add},
 	{'-',	&type_float, &type_float, 0,
-		.anticommute = fp_com_add},
+		.anticommute = fp_anti_sub},
 	{'*',	&type_float, &type_float, 0,
 		.commutative = fp_com_mul, .associative = fp_ass_mul},
 	{'/',	&type_float, &type_float, 0},
@@ -597,7 +607,7 @@ static expr_type_t double_float[] = {
 	{'+',	&type_double, 0, &type_double,
 		.commutative = fp_com_add, .associative = fp_ass_add},
 	{'-',	&type_double, 0, &type_double,
-		.anticommute = fp_com_add},
+		.anticommute = fp_anti_sub},
 	{'*',	&type_double, 0, &type_double,
 		.commutative = fp_com_mul, .associative = fp_ass_mul},
 	{'/',	&type_double, 0, &type_double},
@@ -626,7 +636,7 @@ static expr_type_t double_int[] = {
 	{'+',	&type_double, 0, &type_double,
 		.commutative = fp_com_add, .associative = fp_ass_add},
 	{'-',	&type_double, 0, &type_double,
-		.anticommute = fp_com_add},
+		.anticommute = fp_anti_sub},
 	{'*',	&type_double, 0, &type_double,
 		.commutative = fp_com_mul, .associative = fp_ass_mul},
 	{'/',	&type_double, 0, &type_double},
@@ -647,7 +657,7 @@ static expr_type_t double_double[] = {
 	{'+',	&type_double,
 		.commutative = fp_com_add, .associative = fp_ass_add},
 	{'-',	&type_double,
-		.anticommute = fp_com_add},
+		.anticommute = fp_anti_sub},
 	{'*',	&type_double,
 		.commutative = fp_com_mul, .associative = fp_ass_mul},
 	{'/',	&type_double},