[avr-libc-commit] [2156] Remove the old AT90S2313 simulator bug workaround, as the workaround

[Joerg Wunsch]

Revision: 2156
          http://svn.sv.gnu.org/viewvc/?view=rev&root=avr-libc&revision=2156
Author:   joerg_wunsch
Date:     2010-06-10 04:20:33 +0000 (Thu, 10 Jun 2010)
Log Message:
-----------
Remove the old AT90S2313 simulator bug workaround, as the workaround
doesn't work anymore now while the original code does.

Modified Paths:
--------------
    trunk/avr-libc/ChangeLog
    trunk/avr-libc/tests/simulate/avr/eeprom-1.c

Modified: trunk/avr-libc/ChangeLog
===================================================================
--- trunk/avr-libc/ChangeLog    2010-06-10 03:59:26 UTC (rev 2155)
+++ trunk/avr-libc/ChangeLog    2010-06-10 04:20:33 UTC (rev 2156)
@@ -1,3 +1,9 @@
+2010-06-10  Joerg Wunsch <address@hidden>
+
+       * tests/simulate/avr/eeprom-1.c: Remove the old AT90S2313 simulator
+       bug workaround, as the workaround doesn't work anymore now while the
+       original code does.
+
 2010-06-09  Eric B. Weddington  <address@hidden>
 
        Fix for bug #26767.

Modified: trunk/avr-libc/tests/simulate/avr/eeprom-1.c
===================================================================
--- trunk/avr-libc/tests/simulate/avr/eeprom-1.c        2010-06-10 03:59:26 UTC 
(rev 2155)
+++ trunk/avr-libc/tests/simulate/avr/eeprom-1.c        2010-06-10 04:20:33 UTC 
(rev 2156)
@@ -60,13 +60,6 @@
     }
 
     /* Read double words.      */
-#if 0
-    /* This variant exits with error for AT90S2313 simulation.  Seems,
-       the reason is in Simulavr bug: it is incorrect when the XH register
-       in 'ST X+,r' operation is not clearned.  The code below uses the
-       XH register for temporary value 0xFF (avr-gcc 4.1.2).  This is
-       actaul for new EEPROM library (2009), which does not set the XH
-       for SRAM operation if it is possible.   */
     for (p = 0; p <= (void *)E2END - 3; p += 4) {
        if (eeprom_read_dword (p)
            != ((~(unsigned)p & 0xFF)
@@ -77,20 +70,6 @@
            exit (__LINE__);
        }
     }
-#else
-    /* With avr-gcc 4.1.2 the code below does not use XH register with
-       AT90S2313 mcu.  */
-    for (p = 0; p <= (void *)E2END - 3; ) {
-       long dword = eeprom_read_dword (p);
-       if ((dword ^ ~(unsigned)p++) & 0xFF) exit (__LINE__);
-       dword >>= 8;
-       if ((dword ^ ~(unsigned)p++) & 0xFF) exit (__LINE__);
-       dword >>= 8;
-       if ((dword ^ ~(unsigned)p++) & 0xFF) exit (__LINE__);
-       dword >>= 8;
-       if ((dword ^ ~(unsigned)p++) & 0xFF) exit (__LINE__);
-    }
-#endif
 
     /* Read blocks.    */
     for (p = 0; p <= (void *)E2END; ) {