-#define UINT8_MAX 0xff\r
-\r
-//\r
-// Scalable macro to set the most significant bit in a natural number\r
-//\r
-#define MAX_BIT (1ULL << (sizeof (INTN) * 8 - 1)) \r
-#define MAX_2_BITS (3ULL << (sizeof (INTN) * 8 - 2))\r
-\r
-//\r
-// Maximum legal EBC address\r
-//\r
-#define MAX_ADDRESS ((UINTN) ~0)\r
-\r
-//\r
-// The stack alignment required for EBC\r
-//\r
+///\r
+/// A value of native width with the highest bit set.\r
+/// Scalable macro to set the most significant bit in a natural number.\r
+///\r
+#define MAX_BIT ((UINTN)((1ULL << (sizeof (INTN) * 8 - 1))))\r
+///\r
+/// A value of native width with the two highest bits set.\r
+/// Scalable macro to set the most 2 significant bits in a natural number.\r
+///\r
+#define MAX_2_BITS ((UINTN)(3ULL << (sizeof (INTN) * 8 - 2)))\r
+\r
+///\r
+/// Maximum legal EBC address\r
+///\r
+#define MAX_ADDRESS ((UINTN)(~0ULL >> (64 - sizeof (INTN) * 8)))\r
+\r
+///\r
+/// Maximum legal EBC INTN and UINTN values.\r
+///\r
+#define MAX_UINTN ((UINTN)(~0ULL >> (64 - sizeof (INTN) * 8)))\r
+#define MAX_INTN ((INTN)(~0ULL >> (65 - sizeof (INTN) * 8)))\r
+\r
+///\r
+/// Minimum legal EBC INTN value.\r
+///\r
+#define MIN_INTN (((INTN)-MAX_INTN) - 1)\r
+\r
+///\r
+/// The stack alignment required for EBC\r
+///\r