Feeding the correct types now

Author: czurnieden

demo/shared.c

@@ -36,7 +36,7 @@ void print_header(void)
 #ifdef MP_16BIT
    printf("Digit size 16 Bit \n");
 #endif
-#ifdef MP_32BIT
+#if ((defined MP_32BIT) || (defined MP_31BIT))
    printf("Digit size 32 Bit \n");
 #endif
 #ifdef MP_64BIT

demo/test.c

@@ -398,7 +398,7 @@ static int test_mp_printf_extension(void)
       "Left aligned  AAA +0@JTpzuD8E+6OxDD6VWf/T                            BBB\n",         /* 55 */
       "Right aligned AAA                             0@JTpzuD8E+6OxDD6VWf/T BBB\n",
       "Left aligned  AAA  0@JTpzuD8E+6OxDD6VWf/T                            BBB\n",
-#if ((MP_DIGIT_BIT == 60) && (UINT_MAX > 0xffffffffU) )
+#if (MP_DIGIT_BIT == 60)
       "Right aligned AAA                                  449010662782443485 BBB\n",
       "Left aligned  AAA 449010662782443485                                  BBB\n",
       "Right aligned AAA                                 +449010662782443485 BBB\n",        /* 60 */
@@ -496,7 +496,7 @@ static int test_mp_printf_extension(void)
       "Left aligned  AAA 0011111100000101001111111011101,1001100011101100110100110100011,0000011010010000011101111100001,0000010011011101110011111101111, BBB\n",
       "Right aligned AAA 0011111100000101001111111011101,1001100011101100110100110100011,0000011010010000011101111100001,0000010011011101110011111101111, BBB\n",
       "Left aligned  AAA 0011111100000101001111111011101,1001100011101100110100110100011,0000011010010000011101111100001,0000010011011101110011111101111, BBB\n"
-#elif ((MP_DIGIT_BIT == 28) || ( (MP_DIGIT_BIT == 60) && (UINT_MAX == 0xffffffffU) ) )
+#elif ( MP_DIGIT_BIT == 28 )
       "Right aligned AAA                                           260218845 BBB\n",
       "Left aligned  AAA 260218845                                           BBB\n",
       "Right aligned AAA                                          +260218845 BBB\n",

mp_printf_extension_init.c

@@ -238,10 +238,27 @@ static int s_mp_print_mp_int_arginfo(const struct printf_info *info, size_t n,
     */
    (void)(info);
 
-   if (n > 0) {
+   if ((n > 0) && (info->user & modZ)) {
       argtypes[0] = PA_POINTER;
       size[0] = sizeof(mp_int *);
    }
+   if ((n > 0) && (info->user & modM)) {
+#if (MP_DIGIT_BIT > 32)
+      argtypes[0] = PA_INT | PA_FLAG_LONG_LONG;
+#else
+      argtypes[0] = PA_INT | PA_FLAG_LONG;
+#endif
+      size[0] = sizeof(mp_digit);
+   }
+
+   if ((n > 0) && (info->user & modN)) {
+#if (MP_DIGIT_BIT > 32)
+      argtypes[0] = PA_INT | PA_FLAG_LONG_LONG;
+#else
+      argtypes[0] = PA_INT | PA_FLAG_LONG;
+#endif
+      size[0] = sizeof(mp_digit);
+   }
    return 1;
 }
 /* Register printf extensions */