Changeset 96b02eb9 in mainline for kernel/test

Timestamp:

2010-12-14T12:52:38Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6b10dab

Parents:

554debd

Message:

more unification of basic types

• use sysarg_t and native_t (unsigned and signed variant) in both kernel and uspace
• remove ipcarg_t in favour of sysarg_t

(no change in functionality)

Location:

kernel/test

Files:

• fpu/fpu1_ia64.c (modified) (2 diffs)
• fpu/fpu1_x86.c (modified) (2 diffs)
• fpu/mips2.c (modified) (4 diffs)
• fpu/sse1.c (modified) (4 diffs)
• mm/slab1.c (modified) (2 diffs)
• print/print2.c (modified) (1 diff)

kernel/test/fpu/fpu1_ia64.c

@@ -85 +85 @@
                 
                 if ((int) (100000000 * e) != E_10e8) {
-                        TPRINTF("tid%" PRIu64 ": e*10e8=%zd should be %" PRIun "\n", THREAD->tid, (unative_t) (100000000 * e), (unative_t) E_10e8);
+                        TPRINTF("tid%" PRIu64 ": e*10e8=%zd should be %" PRIun "\n", THREAD->tid, (sysarg_t) (100000000 * e), (sysarg_t) E_10e8);
                         atomic_inc(&threads_fault);
                         break;
@@ -118 +118 @@
                 
                 if ((int) (1000000 * pi) != PI_10e8) {
-                        TPRINTF("tid%" PRIu64 ": pi*10e8=%zd should be %" PRIun "\n", THREAD->tid, (unative_t) (1000000 * pi), (unative_t) (PI_10e8 / 100));
+                        TPRINTF("tid%" PRIu64 ": pi*10e8=%zd should be %" PRIun "\n", THREAD->tid, (sysarg_t) (1000000 * pi), (sysarg_t) (PI_10e8 / 100));
                         atomic_inc(&threads_fault);
                         break;

kernel/test/fpu/fpu1_x86.c

@@ -83 +83 @@
                 if ((int) (100000000 * e) != E_10e8) {
                         TPRINTF("tid%" PRIu64 ": e*10e8=%" PRIun " should be %" PRIun "\n",
-                            THREAD->tid, (unative_t) (100000000 * e), (unative_t) E_10e8);
+                            THREAD->tid, (sysarg_t) (100000000 * e), (sysarg_t) E_10e8);
                         atomic_inc(&threads_fault);
                         break;
@@ -117 +117 @@
                 if ((int) (100000000 * pi) != PI_10e8) {
                         TPRINTF("tid%" PRIu64 ": pi*10e8=%" PRIun " should be %" PRIun "\n",
-                            THREAD->tid, (unative_t) (100000000 * pi), (unative_t) PI_10e8);
+                            THREAD->tid, (sysarg_t) (100000000 * pi), (sysarg_t) PI_10e8);
                         atomic_inc(&threads_fault);
                         break;

kernel/test/fpu/mips2.c

@@ -48 +48 @@
 {
         int i;
-        int arg __attribute__((aligned(16))) = (int) ((unative_t) data);
+        int arg __attribute__((aligned(16))) = (int) ((sysarg_t) data);
         int after_arg __attribute__((aligned(16)));
         
@@ -80 +80 @@
 {
         int i;
-        int arg __attribute__((aligned(16))) = (int) ((unative_t) data);
+        int arg __attribute__((aligned(16))) = (int) ((sysarg_t) data);
         int after_arg __attribute__((aligned(16)));
         
@@ -123 +123 @@
                 thread_t *t;
                 
-                if (!(t = thread_create(testit1, (void *) ((unative_t) 2 * i), TASK, 0, "testit1", false))) {
+                if (!(t = thread_create(testit1, (void *) ((sysarg_t) 2 * i), TASK, 0, "testit1", false))) {
                         TPRINTF("could not create thread %u\n", 2 * i);
                         break;
@@ -130 +130 @@
                 total++;
                 
-                if (!(t = thread_create(testit2, (void *) ((unative_t) 2 * i + 1), TASK, 0, "testit2", false))) {
+                if (!(t = thread_create(testit2, (void *) ((sysarg_t) 2 * i + 1), TASK, 0, "testit2", false))) {
                         TPRINTF("could not create thread %u\n", 2 * i + 1);
                         break;

kernel/test/fpu/sse1.c

@@ -48 +48 @@
 {
         int i;
-        int arg __attribute__((aligned(16))) = (int) ((unative_t) data);
+        int arg __attribute__((aligned(16))) = (int) ((sysarg_t) data);
         int after_arg __attribute__((aligned(16)));
         
@@ -79 +79 @@
 {
         int i;
-        int arg __attribute__((aligned(16))) = (int) ((unative_t) data);
+        int arg __attribute__((aligned(16))) = (int) ((sysarg_t) data);
         int after_arg __attribute__((aligned(16)));
         
@@ -121 +121 @@
                 thread_t *t;
                 
-                if (!(t = thread_create(testit1, (void *) ((unative_t) 2 * i), TASK, 0, "testit1", false))) {
+                if (!(t = thread_create(testit1, (void *) ((sysarg_t) 2 * i), TASK, 0, "testit1", false))) {
                         TPRINTF("could not create thread %u\n", 2 * i);
                         break;
@@ -128 +128 @@
                 total++;
                 
-                if (!(t = thread_create(testit2, (void *) ((unative_t) 2 * i + 1), TASK, 0, "testit2", false))) {
+                if (!(t = thread_create(testit2, (void *) ((sysarg_t) 2 * i + 1), TASK, 0, "testit2", false))) {
                         TPRINTF("could not create thread %u\n", 2 * i + 1);
                         break;

kernel/test/mm/slab1.c

@@ -123 +123 @@
 static void slabtest(void *data)
 {
-        int offs = (int) (unative_t) data;
+        int offs = (int) (sysarg_t) data;
         int i, j;
         
@@ -156 +156 @@
         semaphore_initialize(&thr_sem, 0);
         for (i = 0; i < THREADS; i++) {  
-                if (!(t = thread_create(slabtest, (void *) (unative_t) i, TASK, 0, "slabtest", false))) {
+                if (!(t = thread_create(slabtest, (void *) (sysarg_t) i, TASK, 0, "slabtest", false))) {
                         TPRINTF("Could not create thread %d\n", i);
                 } else

kernel/test/print/print2.c

@@ -48 +48 @@
         TPRINTF("Real output:     [%#x] [%#5.3x] [%#-5.3x] [%#3.5x] [%#-3.5x]\n\n", 17, 18, 19, 20, 21);
         
-        unative_t nat = UINTN_C(0x12345678);
+        sysarg_t nat = UINTN_C(0x12345678);
         
         TPRINTF("Testing printf(\"%%#" PRIx64 " %%#" PRIx32 " %%#" PRIx16 " %%#" PRIx8 " %%#" PRIxn " %%#" PRIx64 " %%s\", (uint64_t) UINT64_C(0x1234567887654321), (uint32_t) UINT32_C(0x12345678), (uint16_t) UINT16_C(0x1234), (uint8_t) UINT8_C(0x12), nat, (uint64_t) UINT64_C(0x1234567887654321), \"Lovely string\"):\n");