Changeset 7bdcc45 in mainline for kernel/test/fpu


Ignore:
Timestamp:
2010-12-16T16:38:49Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
7837101
Parents:
8e58f94 (diff), eb221e5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

Location:
kernel/test/fpu
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • kernel/test/fpu/fpu1_ia64.c

    r8e58f94 r7bdcc45  
    8585               
    8686                if ((int) (100000000 * e) != E_10e8) {
    87                         TPRINTF("tid%" PRIu64 ": e*10e8=%zd should be %" PRIun "\n", THREAD->tid, (unative_t) (100000000 * e), (unative_t) E_10e8);
     87                        TPRINTF("tid%" PRIu64 ": e*10e8=%zd should be %" PRIun "\n", THREAD->tid, (sysarg_t) (100000000 * e), (sysarg_t) E_10e8);
    8888                        atomic_inc(&threads_fault);
    8989                        break;
    … …  
    118118               
    119119                if ((int) (1000000 * pi) != PI_10e8) {
    120                         TPRINTF("tid%" PRIu64 ": pi*10e8=%zd should be %" PRIun "\n", THREAD->tid, (unative_t) (1000000 * pi), (unative_t) (PI_10e8 / 100));
     120                        TPRINTF("tid%" PRIu64 ": pi*10e8=%zd should be %" PRIun "\n", THREAD->tid, (sysarg_t) (1000000 * pi), (sysarg_t) (PI_10e8 / 100));
    121121                        atomic_inc(&threads_fault);
    122122                        break;
    … …  
    161161       
    162162        while (atomic_get(&threads_ok) != total) {
    163                 TPRINTF("Threads left: %d\n", total - atomic_get(&threads_ok));
     163                TPRINTF("Threads left: %" PRIua "\n",
     164                    total - atomic_get(&threads_ok));
    164165                thread_sleep(1);
    165166        }

  • kernel/test/fpu/fpu1_x86.c

    r8e58f94 r7bdcc45  
    8282               
    8383                if ((int) (100000000 * e) != E_10e8) {
    84                         TPRINTF("tid%" PRIu64 ": e*10e8=%zd should be %" PRIun "\n", THREAD->tid, (unative_t) (100000000 * e), (unative_t) E_10e8);
     84                        TPRINTF("tid%" PRIu64 ": e*10e8=%" PRIun " should be %" PRIun "\n",
     85                            THREAD->tid, (sysarg_t) (100000000 * e), (sysarg_t) E_10e8);
    8586                        atomic_inc(&threads_fault);
    8687                        break;
    … …  
    115116               
    116117                if ((int) (100000000 * pi) != PI_10e8) {
    117                         TPRINTF("tid%" PRIu64 ": pi*10e8=%zd should be %" PRIun "\n", THREAD->tid, (unative_t) (100000000 * pi), (unative_t) PI_10e8);
     118                        TPRINTF("tid%" PRIu64 ": pi*10e8=%" PRIun " should be %" PRIun "\n",
     119                            THREAD->tid, (sysarg_t) (100000000 * pi), (sysarg_t) PI_10e8);
    118120                        atomic_inc(&threads_fault);
    119121                        break;
    … …  
    158160       
    159161        while (atomic_get(&threads_ok) != total) {
    160                 TPRINTF("Threads left: %d\n", total - atomic_get(&threads_ok));
     162                TPRINTF("Threads left: %" PRIua "\n", total - atomic_get(&threads_ok));
    161163                thread_sleep(1);
    162164        }

  • kernel/test/fpu/mips2.c

    r8e58f94 r7bdcc45  
    4848{
    4949        int i;
    50         int arg __attribute__((aligned(16))) = (int) ((unative_t) data);
     50        int arg __attribute__((aligned(16))) = (int) ((sysarg_t) data);
    5151        int after_arg __attribute__((aligned(16)));
    5252       
    … …  
    8080{
    8181        int i;
    82         int arg __attribute__((aligned(16))) = (int) ((unative_t) data);
     82        int arg __attribute__((aligned(16))) = (int) ((sysarg_t) data);
    8383        int after_arg __attribute__((aligned(16)));
    8484       
    … …  
    123123                thread_t *t;
    124124               
    125                 if (!(t = thread_create(testit1, (void *) ((unative_t) 2 * i), TASK, 0, "testit1", false))) {
     125                if (!(t = thread_create(testit1, (void *) ((sysarg_t) 2 * i), TASK, 0, "testit1", false))) {
    126126                        TPRINTF("could not create thread %u\n", 2 * i);
    127127                        break;
    … …  
    130130                total++;
    131131               
    132                 if (!(t = thread_create(testit2, (void *) ((unative_t) 2 * i + 1), TASK, 0, "testit2", false))) {
     132                if (!(t = thread_create(testit2, (void *) ((sysarg_t) 2 * i + 1), TASK, 0, "testit2", false))) {
    133133                        TPRINTF("could not create thread %u\n", 2 * i + 1);
    134134                        break;

  • kernel/test/fpu/sse1.c

    r8e58f94 r7bdcc45  
    4848{
    4949        int i;
    50         int arg __attribute__((aligned(16))) = (int) ((unative_t) data);
     50        int arg __attribute__((aligned(16))) = (int) ((sysarg_t) data);
    5151        int after_arg __attribute__((aligned(16)));
    5252       
    … …  
    7979{
    8080        int i;
    81         int arg __attribute__((aligned(16))) = (int) ((unative_t) data);
     81        int arg __attribute__((aligned(16))) = (int) ((sysarg_t) data);
    8282        int after_arg __attribute__((aligned(16)));
    8383       
    … …  
    121121                thread_t *t;
    122122               
    123                 if (!(t = thread_create(testit1, (void *) ((unative_t) 2 * i), TASK, 0, "testit1", false))) {
     123                if (!(t = thread_create(testit1, (void *) ((sysarg_t) 2 * i), TASK, 0, "testit1", false))) {
    124124                        TPRINTF("could not create thread %u\n", 2 * i);
    125125                        break;
    … …  
    128128                total++;
    129129               
    130                 if (!(t = thread_create(testit2, (void *) ((unative_t) 2 * i + 1), TASK, 0, "testit2", false))) {
     130                if (!(t = thread_create(testit2, (void *) ((sysarg_t) 2 * i + 1), TASK, 0, "testit2", false))) {
    131131                        TPRINTF("could not create thread %u\n", 2 * i + 1);
    132132                        break;
    … …  
    142142       
    143143        while (atomic_get(&threads_ok) != total) {
    144                 TPRINTF("Threads left: %d\n", total - atomic_get(&threads_ok));
     144                TPRINTF("Threads left: %" PRIua "\n", total - atomic_get(&threads_ok));
    145145                thread_sleep(1);
    146146        }
Note: See TracChangeset for help on using the changeset viewer.