* device/lib/printf_large.c (_print_format): fixed bug 1073386,

[fw/sdcc] / device / lib / printf_large.c

diff --git a/device/lib/printf_large.c b/device/lib/printf_large.c
index cad0a0476f93a0b0d7e63b5d4a8a1680535ee3de..1aa50e1e65232ddd1f68cd4c1acde26d98b6a53b 100644 (file)
--- a/device/lib/printf_large.c
+++ b/device/lib/printf_large.c
@@ -141,6 +141,18 @@ static const char memory_id[] = "IXCP-";
 #if defined ASM_ALLOWED
 static void calculate_digit( unsigned char radix )
 {
+  if (radix == 8)
+  {
+    value.byte[4] = value.ul & 0x07;
+    value.ul >>= 3;
+  }
+  else if (radix == 16)
+  {
+    value.byte[4] = value.ul & 0x0F;
+    value.ul >>= 4;
+  }
+  else
+  {
   unsigned char i;
 
   for( i = 32; i != 0; i-- )
@@ -170,9 +182,22 @@ _endasm;
     }
   }
 }
+}
 #elif defined SDCC_STACK_AUTO
 static void calculate_digit( value_t* value, unsigned char radix )
 {
+  if (radix == 8)
+  {
+    value->byte[4] = value->ul & 0x07;
+    value->ul >>= 3;
+  }
+  else if (radix == 16)
+  {
+    value->byte[4] = value->ul & 0x0F;
+    value->ul >>= 4;
+  }
+  else
+  {
   unsigned char i;
 
   for( i = 32; i != 0; i-- )
@@ -187,9 +212,22 @@ static void calculate_digit( value_t* value, unsigned char radix )
     }
   }
 }
+}
 #else
 static void calculate_digit( unsigned char radix )
 {
+  if (radix == 8)
+  {
+    value.byte[4] = value.ul & 0x07;
+    value.ul >>= 3;
+  }
+  else if (radix == 16)
+  {
+    value.byte[4] = value.ul & 0x0F;
+    value.ul >>= 4;
+  }
+  else
+  {
   unsigned char i;
 
   for( i = 32; i != 0; i-- )
@@ -204,6 +242,7 @@ static void calculate_digit( unsigned char radix )
     }
   }
 }
+}
 #endif
 
 #if USE_FLOATS
@@ -648,6 +687,10 @@ get_conversion_spec:
         if (char_argument)
         {
           value.l = va_arg(ap,char);
+          if (!signed_argument)
+          {
+               value.l &= 0xFF;
+          }
         }
         else if (long_argument)
         {
@@ -656,6 +699,10 @@ get_conversion_spec:
         else // must be int
         {
           value.l = va_arg(ap,int);
+          if (!signed_argument)
+          {
+            value.l &= 0xFFFF;
+          }
         }
 
         if ( signed_argument )