Changeset 46c20c8 in mainline for kernel/test/fpu


Ignore:
Timestamp:
2010-11-26T20:08:10Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
45df59a
Parents:
fb150d78 (diff), ffdd2b9 (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:
7 edited

Legend:

Unmodified
Added
Removed

  • kernel/test/fpu/fpu1_ia64.c

    rfb150d78 r46c20c8  
    126126}
    127127
    128 char *test_fpu1(void)
     128const char *test_fpu1(void)
    129129{
    130         unsigned int i, total = 0;
     130        unsigned int i;
     131        atomic_count_t total = 0;
    131132       
    132133        waitq_initialize(&can_start);
    … …  
    159160        waitq_wakeup(&can_start, WAKEUP_ALL);
    160161       
    161         while (atomic_get(&threads_ok) != (long) total) {
    162                 TPRINTF("Threads left: %d\n", total - atomic_get(&threads_ok));
     162        while (atomic_get(&threads_ok) != total) {
     163                TPRINTF("Threads left: %" PRIua "\n",
     164                    total - atomic_get(&threads_ok));
    163165                thread_sleep(1);
    164166        }

  • kernel/test/fpu/fpu1_skip.c

    rfb150d78 r46c20c8  
    2929#include <test.h>
    3030
    31 char *test_fpu1(void)
     31const char *test_fpu1(void)
    3232{
    3333        return NULL;

  • kernel/test/fpu/fpu1_x86.c

    rfb150d78 r46c20c8  
    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, (unative_t) (100000000 * e), (unative_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, (unative_t) (100000000 * pi), (unative_t) PI_10e8);
    118120                        atomic_inc(&threads_fault);
    119121                        break;
    … …  
    123125}
    124126
    125 char *test_fpu1(void)
     127const char *test_fpu1(void)
    126128{
    127         unsigned int i, total = 0;
     129        unsigned int i;
     130        atomic_count_t total = 0;
    128131       
    129132        waitq_initialize(&can_start);
    … …  
    156159        waitq_wakeup(&can_start, WAKEUP_ALL);
    157160       
    158         while (atomic_get(&threads_ok) != (long) total) {
    159                 TPRINTF("Threads left: %d\n", total - atomic_get(&threads_ok));
     161        while (atomic_get(&threads_ok) != total) {
     162                TPRINTF("Threads left: %" PRIua "\n", total - atomic_get(&threads_ok));
    160163                thread_sleep(1);
    161164        }

  • kernel/test/fpu/mips2.c

    rfb150d78 r46c20c8  
    109109
    110110
    111 char *test_mips2(void)
     111const char *test_mips2(void)
    112112{
    113         unsigned int i, total = 0;
     113        unsigned int i;
     114        atomic_count_t total = 0;
    114115       
    115116        waitq_initialize(&can_start);
    … …  
    138139       
    139140        TPRINTF("ok\n");
    140                
     141       
    141142        thread_sleep(1);
    142143        waitq_wakeup(&can_start, WAKEUP_ALL);
    143144       
    144         while (atomic_get(&threads_ok) != (long) total) {
     145        while (atomic_get(&threads_ok) != total) {
    145146                TPRINTF("Threads left: %d\n", total - atomic_get(&threads_ok));
    146147                thread_sleep(1);

  • kernel/test/fpu/mips2_skip.c

    rfb150d78 r46c20c8  
    2929#include <test.h>
    3030
    31 char *test_mips2(void)
     31const char *test_mips2(void)
    3232{
    3333        return NULL;

  • kernel/test/fpu/sse1.c

    rfb150d78 r46c20c8  
    107107}
    108108
    109 char *test_sse1(void)
     109const char *test_sse1(void)
    110110{
    111         unsigned int i, total = 0;
     111        unsigned int i;
     112        atomic_count_t total = 0;
    112113       
    113114        waitq_initialize(&can_start);
    … …  
    140141        waitq_wakeup(&can_start, WAKEUP_ALL);
    141142       
    142         while (atomic_get(&threads_ok) != (long) total) {
    143                 TPRINTF("Threads left: %d\n", total - atomic_get(&threads_ok));
     143        while (atomic_get(&threads_ok) != total) {
     144                TPRINTF("Threads left: %" PRIua "\n", total - atomic_get(&threads_ok));
    144145                thread_sleep(1);
    145146        }

  • kernel/test/fpu/sse1_skip.c

    rfb150d78 r46c20c8  
    2929#include <test.h>
    3030
    31 char *test_sse1(void)
     31const char *test_sse1(void)
    3232{
    3333        return NULL;
Note: See TracChangeset for help on using the changeset viewer.