[PATCH 02/26] sptests/sp37: Better cope with internal padding

[Sebastian Huber]

---
 testsuites/sptests/sp37/init.c | 65 ++++++++++++++++++++++++++----------------
 1 file changed, 40 insertions(+), 25 deletions(-)

diff --git a/testsuites/sptests/sp37/init.c b/testsuites/sptests/sp37/init.c
index 68b28a6..e87ad9f 100644
--- a/testsuites/sptests/sp37/init.c
+++ b/testsuites/sptests/sp37/init.c
@@ -159,29 +159,33 @@ static void test_isr_level( void )
   test_isr_level_for_new_threads( last_proper_level );
 }
 
-#if defined(RTEMS_SMP) && defined(RTEMS_PROFILING)
-static const size_t lock_size =
-  offsetof( ISR_lock_Control, Lock.Stats.name )
-    + sizeof( ((ISR_lock_Control *) 0)->Lock.Stats.name );
-#else
-static const size_t lock_size = sizeof( ISR_lock_Control );
-#endif
-
 static void test_isr_locks( void )
 {
   ISR_Level normal_interrupt_level = _ISR_Get_level();
   ISR_lock_Control initialized = ISR_LOCK_INITIALIZER("test");
-  ISR_lock_Control lock;
+  union {
+    ISR_lock_Control lock;
+    uint8_t bytes[ sizeof( ISR_lock_Control ) ];
+  } container;
   ISR_lock_Context lock_context;
+  size_t i;
+  const uint8_t *initialized_bytes;
 
-  _ISR_lock_Initialize( &lock, "test" );
-  rtems_test_assert( memcmp( &lock, &initialized, lock_size ) == 0 );
+  memset( &container, 0xff, sizeof( container ) );
+  _ISR_lock_Initialize( &container.lock, "test" );
+  initialized_bytes = (const uint8_t *) &initialized;
+
+  for ( i = 0; i < sizeof( container ); ++i ) {
+    if ( container.bytes[ i ] != 0xff ) {
+      rtems_test_assert( container.bytes[ i ] == initialized_bytes[ i] );
+    }
+  }
 
-  _ISR_lock_ISR_disable_and_acquire( &lock, &lock_context );
+  _ISR_lock_ISR_disable_and_acquire( &container.lock, &lock_context );
   rtems_test_assert( normal_interrupt_level != _ISR_Get_level() );
-  _ISR_lock_Flash( &lock, &lock_context );
+  _ISR_lock_Flash( &container.lock, &lock_context );
   rtems_test_assert( normal_interrupt_level != _ISR_Get_level() );
-  _ISR_lock_Release_and_ISR_enable( &lock, &lock_context );
+  _ISR_lock_Release_and_ISR_enable( &container.lock, &lock_context );
 
   rtems_test_assert( normal_interrupt_level == _ISR_Get_level() );
 
@@ -191,13 +195,13 @@ static void test_isr_locks( void )
 
   rtems_test_assert( normal_interrupt_level == _ISR_Get_level() );
 
-  _ISR_lock_Acquire( &lock, &lock_context );
+  _ISR_lock_Acquire( &container.lock, &lock_context );
   rtems_test_assert( normal_interrupt_level == _ISR_Get_level() );
-  _ISR_lock_Release( &lock, &lock_context );
+  _ISR_lock_Release( &container.lock, &lock_context );
 
   rtems_test_assert( normal_interrupt_level == _ISR_Get_level() );
 
-  _ISR_lock_Destroy( &lock );
+  _ISR_lock_Destroy( &container.lock );
   _ISR_lock_Destroy( &initialized );
 }
 
@@ -216,25 +220,36 @@ static void test_interrupt_locks( void )
 {
   rtems_mode normal_interrupt_level = get_interrupt_level();
   rtems_interrupt_lock initialized = RTEMS_INTERRUPT_LOCK_INITIALIZER("test");
-  rtems_interrupt_lock lock;
+  union {
+    rtems_interrupt_lock lock;
+    uint8_t bytes[ sizeof( rtems_interrupt_lock ) ];
+  } container;
   rtems_interrupt_lock_context lock_context;
+  size_t i;
+  const uint8_t *initialized_bytes;
+
+  rtems_interrupt_lock_initialize( &container.lock, "test" );
+  initialized_bytes = (const uint8_t *) &initialized;
 
-  rtems_interrupt_lock_initialize( &lock, "test" );
-  rtems_test_assert( memcmp( &lock, &initialized, lock_size ) == 0 );
+  for ( i = 0; i < sizeof( container ); ++i ) {
+    if ( container.bytes[ i ] != 0xff ) {
+      rtems_test_assert( container.bytes[ i ] == initialized_bytes[ i] );
+    }
+  }
 
-  rtems_interrupt_lock_acquire( &lock, &lock_context );
+  rtems_interrupt_lock_acquire( &container.lock, &lock_context );
   rtems_test_assert( normal_interrupt_level != get_interrupt_level() );
-  rtems_interrupt_lock_release( &lock, &lock_context );
+  rtems_interrupt_lock_release( &container.lock, &lock_context );
 
   rtems_test_assert( normal_interrupt_level == get_interrupt_level() );
 
-  rtems_interrupt_lock_acquire_isr( &lock, &lock_context );
+  rtems_interrupt_lock_acquire_isr( &container.lock, &lock_context );
   rtems_test_assert( normal_interrupt_level == get_interrupt_level() );
-  rtems_interrupt_lock_release_isr( &lock, &lock_context );
+  rtems_interrupt_lock_release_isr( &container.lock, &lock_context );
 
   rtems_test_assert( normal_interrupt_level == get_interrupt_level() );
 
-  rtems_interrupt_lock_destroy( &lock );
+  rtems_interrupt_lock_destroy( &container.lock );
   rtems_interrupt_lock_destroy( &initialized );
 }
 
-- 
1.8.4.5