[avr-libc-commit] [2148] Cut out some bits when compling for an AT90S8515 to avoid resource

[Joerg Wunsch]

Revision: 2148
          http://svn.sv.gnu.org/viewvc/?view=rev&root=avr-libc&revision=2148
Author:   joerg_wunsch
Date:     2010-06-09 14:24:29 +0000 (Wed, 09 Jun 2010)
Log Message:
-----------
Cut out some bits when compling for an AT90S8515 to avoid resource
exhaustion (the ATmega128 version still contains everything).

Modified Paths:
--------------
    trunk/avr-libc/ChangeLog
    trunk/avr-libc/tests/simulate/other/realloc-01.c
    trunk/avr-libc/tests/simulate/printf/sprintf-2.c
    trunk/avr-libc/tests/simulate/printf/sprintf-3.c
    trunk/avr-libc/tests/simulate/printf/sprintf-4.c
    trunk/avr-libc/tests/simulate/scanf/sscanf-l.c
    trunk/avr-libc/tests/simulate/scanf/sscanf_flt-fnn.c

Modified: trunk/avr-libc/ChangeLog
===================================================================
--- trunk/avr-libc/ChangeLog    2010-06-09 09:58:26 UTC (rev 2147)
+++ trunk/avr-libc/ChangeLog    2010-06-09 14:24:29 UTC (rev 2148)
@@ -1,5 +1,16 @@
 2010-06-09  Joerg Wunsch <address@hidden>
 
+       * tests/simulate/other/realloc-01.c: Cut out some bits when compling for
+       an AT90S8515 to avoid resource exhaustion (the ATmega128 version still
+       contains everything).
+       * tests/simulate/printf/sprintf-2.c: (Ditto.)
+       * tests/simulate/printf/sprintf-3.c: (Ditto.)
+       * tests/simulate/printf/sprintf-4.c: (Ditto.)
+       * tests/simulate/scanf/sscanf-l.c: (Ditto.)
+       * tests/simulate/scanf/sscanf_flt-fnn.c: (Ditto.)
+
+2010-06-09  Joerg Wunsch <address@hidden>
+
        bug #28921: pointer to function > 128k flash
        * doc/api/faq.dox (faq_funcptr_gt128kib): Add entry describing
        that -mrelax is needed for the trampolines to work as designed.

Modified: trunk/avr-libc/tests/simulate/other/realloc-01.c
===================================================================
--- trunk/avr-libc/tests/simulate/other/realloc-01.c    2010-06-09 09:58:26 UTC 
(rev 2147)
+++ trunk/avr-libc/tests/simulate/other/realloc-01.c    2010-06-09 14:24:29 UTC 
(rev 2148)
@@ -72,6 +72,12 @@
 
 struct list1 *l1head, *l1tail;
 
+#if defined(__AVR_AT90S8515__)
+#  define N 500
+#else
+#  define N 2000
+#endif
+
 bool l1append(char c)
 {
   struct list1 *ele = malloc(sizeof(struct list1) + 1);
@@ -233,7 +239,7 @@
   __malloc_margin = 50;
 
   srandom(RAND_START_VALUE);
-  for (i = 0; i < 2000; i++)
+  for (i = 0; i < N; i++)
     {
       r = random();
       if (r & 0x01)

Modified: trunk/avr-libc/tests/simulate/printf/sprintf-2.c
===================================================================
--- trunk/avr-libc/tests/simulate/printf/sprintf-2.c    2010-06-09 09:58:26 UTC 
(rev 2147)
+++ trunk/avr-libc/tests/simulate/printf/sprintf-2.c    2010-06-09 14:24:29 UTC 
(rev 2148)
@@ -123,6 +123,7 @@
           "%-8.4d.%-8.4d.%-8.4d.%-8.4d", 1, 123, 1234, 12345);
     CHECK ("-0001   .-0123   .-1234   .-12345  ",
           "%-8.4d.%-8.4d.%-8.4d.%-8.4d", -1, -123, -1234, -12345);
+#if !defined(__AVR_AT90S8515__) /* this does not fit */
 
     CHECK ("                                                                "
           "                                                                "
@@ -150,6 +151,7 @@
 
     /* '%i' specification      */
     CHECK ("-9", "%i", -9);
+#endif
 
     /* '%u' specification      */
     CHECK ("0 1 32767 32768 32769 65535",

Modified: trunk/avr-libc/tests/simulate/printf/sprintf-3.c
===================================================================
--- trunk/avr-libc/tests/simulate/printf/sprintf-3.c    2010-06-09 09:58:26 UTC 
(rev 2147)
+++ trunk/avr-libc/tests/simulate/printf/sprintf-3.c    2010-06-09 14:24:29 UTC 
(rev 2148)
@@ -126,6 +126,7 @@
     CHECK ("    0000.    0001.    0012.    0123.   01234",
            "%#8.4o.%#8.4o.%#8.4o.%#8.4o.%#8.4o", 0, 1, 012, 0123, 01234);
 
+#if !defined(__AVR_AT90S8515__) /* this does not fit */
     CHECK ("                                                                "
           "                                                                "
           "                                                                "
@@ -147,6 +148,7 @@
           "%lo %lo %lo %lo %lo %lo %lo",
           0L, 01234567L, 076543210L,
           0x7fffffffL, 0x80000000L, 0x80000001L, 0xffffffffL);
+#endif
 
     /* short arg       */
     CHECK ("0 2 177776", "%ho %ho %ho", 0, 2, 0xfffe);

Modified: trunk/avr-libc/tests/simulate/printf/sprintf-4.c
===================================================================
--- trunk/avr-libc/tests/simulate/printf/sprintf-4.c    2010-06-09 09:58:26 UTC 
(rev 2147)
+++ trunk/avr-libc/tests/simulate/printf/sprintf-4.c    2010-06-09 14:24:29 UTC 
(rev 2148)
@@ -127,6 +127,7 @@
            "%#8.4x.%#8.4x.%#8.4x.%#8.4x.%#8.4x",
           0, 1, 0x12, 0x123, 0x1234);
 
+#if !defined(__AVR_AT90S8515__) /* this does not fit */
     CHECK ("                                                                "
           "                                                                "
           "                                                                "
@@ -151,6 +152,6 @@
 
     /* short arg       */
     CHECK ("0 2 fffe", "%hx %hx %hx", 0, 2, 0xfffe);
-    
+#endif
     return 0;
 }

Modified: trunk/avr-libc/tests/simulate/scanf/sscanf-l.c
===================================================================
--- trunk/avr-libc/tests/simulate/scanf/sscanf-l.c      2010-06-09 09:58:26 UTC 
(rev 2147)
+++ trunk/avr-libc/tests/simulate/scanf/sscanf-l.c      2010-06-09 14:24:29 UTC 
(rev 2148)
@@ -129,6 +129,7 @@
     CHECK (0, (n == 1) && (*(char *)(v.i) == FILL),
           " ", " %ln", &n);
 
+#if !defined(__AVR_AT90S8515__) /* this does not fit */
     /* All possible conversions.       */
     CHECK (
        8,
@@ -140,6 +141,7 @@
        v.i + 0, v.i + 1, v.i + 2, v.i + 3,
        v.i + 4, v.i + 5, v.i + 6, v.i + 7,
        v.i + 8);
+#endif
 
     /* Width field.    */
     CHECK (

Modified: trunk/avr-libc/tests/simulate/scanf/sscanf_flt-fnn.c
===================================================================
--- trunk/avr-libc/tests/simulate/scanf/sscanf_flt-fnn.c        2010-06-09 
09:58:26 UTC (rev 2147)
+++ trunk/avr-libc/tests/simulate/scanf/sscanf_flt-fnn.c        2010-06-09 
14:24:29 UTC (rev 2148)
@@ -157,6 +157,7 @@
        "%e %E %f %F %g %G",
        & v.x[0], & v.x[1], & v.x[2], & v.x[3], & v.x[4], & v.x[5]);
 
+#if !defined(__AVR_AT90S8515__) /* this does not fit */
     /* Character after Inf.    */
     CHECK (
        9,
@@ -178,6 +179,7 @@
        & v.x[3], & v.c[2],
        & v.x[4],
        & v.x[5]);
+#endif
 
     return 0;
 }