From 23a368d91e9b40099d5c66775bb4230fc9d6b49c Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 23 Jan 2008 22:57:54 +0000 Subject: 2008-01-23 Joel Sherrill * sp34/changepri.c, sp35/priinv.c: Convert the Objects_Name type from a simple type to a union of an unsigned 32 bit integer and a pointer. This should help eliminate weird casts between u32 and pointers in various places. The APIs now have to explicitly call _u32 or _string versions of helper routines. This should also simplify things and eliminate the need for ugly casts in some cases. --- testsuites/sptests/ChangeLog | 9 +++++++++ testsuites/sptests/sp34/changepri.c | 4 ++-- testsuites/sptests/sp35/priinv.c | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) (limited to 'testsuites') diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog index 8ee5448e3d..065b1950f9 100644 --- a/testsuites/sptests/ChangeLog +++ b/testsuites/sptests/ChangeLog @@ -1,3 +1,12 @@ +2008-01-23 Joel Sherrill + + * sp34/changepri.c, sp35/priinv.c: Convert the Objects_Name type from a + simple type to a union of an unsigned 32 bit integer and a pointer. + This should help eliminate weird casts between u32 and pointers in + various places. The APIs now have to explicitly call _u32 or _string + versions of helper routines. This should also simplify things and + eliminate the need for ugly casts in some cases. + 2008-01-23 Jennifer Averett * sp42/Makefile.am: New file. diff --git a/testsuites/sptests/sp34/changepri.c b/testsuites/sptests/sp34/changepri.c index e950302330..71a16fdcff 100644 --- a/testsuites/sptests/sp34/changepri.c +++ b/testsuites/sptests/sp34/changepri.c @@ -10,7 +10,7 @@ /********************************************************************/ /* define this to use the RTEMS 4.5 scheme for object names */ -#define TEST_ON_RTEMS_45 +/* #define TEST_ON_RTEMS_45 */ /* define this to print the Id of the calling task */ /* #define TEST_ON_TASK_ID */ @@ -43,7 +43,7 @@ const char *CallerName() #if defined(TEST_ON_RTEMS_45) TempName.u = *(uint32_t *)_Thread_Executing->Object.name; #else - TempName.u = _Thread_Executing->Object.name; + TempName.u = _Thread_Executing->Object.name.name_u32; #endif sprintf( buffer, "%c%c%c%c -- %d", TempName.c[0], TempName.c[1], TempName.c[2], TempName.c[3], diff --git a/testsuites/sptests/sp35/priinv.c b/testsuites/sptests/sp35/priinv.c index 8d97f228ee..0f1ef6fc3d 100644 --- a/testsuites/sptests/sp35/priinv.c +++ b/testsuites/sptests/sp35/priinv.c @@ -84,7 +84,7 @@ const char *CallerName() #if defined(TEST_ON_RTEMS_45) TempName.u = *(uint32_t *)_Thread_Executing->Object.name; #else - TempName.u = (uint32_t) _Thread_Executing->Object.name; + TempName.u = (uint32_t) _Thread_Executing->Object.name.name_u32; #endif sprintf( buffer, "%c%c%c%c -- %d", TempName.c[0], TempName.c[1], TempName.c[2], TempName.c[3], -- cgit v1.2.3