Bignum test: move archsplit to superclass
We need arch split tests in different modules, moving it to the common
module makes it reusable.
No intended changes in the generated tests. (The position of the
core_add_if tests changed, but they are still all there.)
Signed-off-by: Janos Follath <janos.follath@arm.com>
diff --git a/scripts/mbedtls_dev/bignum_common.py b/scripts/mbedtls_dev/bignum_common.py
index 0224114..7ab788b 100644
--- a/scripts/mbedtls_dev/bignum_common.py
+++ b/scripts/mbedtls_dev/bignum_common.py
@@ -97,6 +97,19 @@
quote_str(self.arg_a), quote_str(self.arg_b)
] + self.result()
+ def description(self) -> str:
+ """Generate a description for the test case.
+
+ If not set, case_description uses the form A `symbol` B, where symbol
+ is used to represent the operation. Descriptions of each value are
+ generated to provide some context to the test case.
+ """
+ if not self.case_description:
+ self.case_description = "{:x} {} {:x}".format(
+ self.int_a, self.symbol, self.int_b
+ )
+ return super().description()
+
@abstractmethod
def result(self) -> List[str]:
"""Get the result of the operation.
@@ -128,6 +141,39 @@
for a_value, b_value in cls.get_value_pairs():
yield cls(a_value, b_value).create_test_case()
+
+class OperationCommonArchSplit(OperationCommon):
+ #pylint: disable=abstract-method
+ """Common features for operations where the result depends on
+ the limb size."""
+
+ def __init__(self, val_a: str, val_b: str, bits_in_limb: int) -> None:
+ super().__init__(val_a, val_b)
+ bound_val = max(self.int_a, self.int_b)
+ self.bits_in_limb = bits_in_limb
+ self.bound = bound_mpi(bound_val, self.bits_in_limb)
+ limbs = limbs_mpi(bound_val, self.bits_in_limb)
+ byte_len = limbs * self.bits_in_limb // 8
+ self.hex_digits = 2 * byte_len
+ if self.bits_in_limb == 32:
+ self.dependencies = ["MBEDTLS_HAVE_INT32"]
+ elif self.bits_in_limb == 64:
+ self.dependencies = ["MBEDTLS_HAVE_INT64"]
+ else:
+ raise ValueError("Invalid number of bits in limb!")
+ self.arg_a = self.arg_a.zfill(self.hex_digits)
+ self.arg_b = self.arg_b.zfill(self.hex_digits)
+
+ def pad_to_limbs(self, val) -> str:
+ return "{:x}".format(val).zfill(self.hex_digits)
+
+ @classmethod
+ def generate_function_tests(cls) -> Iterator[test_case.TestCase]:
+ for a_value, b_value in cls.get_value_pairs():
+ yield cls(a_value, b_value, 32).create_test_case()
+ yield cls(a_value, b_value, 64).create_test_case()
+
+
# BEGIN MERGE SLOT 1
# END MERGE SLOT 1