Changeset fbf7b4c in mainline for generic

Timestamp:

2006-06-18T10:52:41Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e600ec4

Parents:

281994b

Message:

make kernel prints case consistent

Location:

generic

Files:

• include/interrupt.h (modified) (1 diff)
• src/console/cmd.c (modified) (1 diff)
• src/ipc/ipc.c (modified) (4 diffs)
• src/mm/as.c (modified) (2 diffs)
• src/proc/task.c (modified) (1 diff)
• src/proc/thread.c (modified) (2 diffs)
• src/sysinfo/sysinfo.c (modified) (1 diff)

generic/include/interrupt.h

@@ -57 +57 @@
         if (istate_from_uspace(istate)) { \
                 klog_printf(cmd, ##__VA_ARGS__); \
-                klog_printf("Task %lld got exception at PC:%P. Task killed.", TASK->taskid, istate_get_pc(istate)); \
+                klog_printf("Task %lld got exception at PC:%p. Task killed.", TASK->taskid, istate_get_pc(istate)); \
                 task_kill(TASK->taskid); \
                 thread_exit(); \

generic/src/console/cmd.c

@@ -535 +535 @@
                 symbol = get_symtab_entry(symaddr);
 
-                printf("Calling f(0x%zX): %.*p: %s\n", arg1, sizeof(__address) * 2, symaddr, symbol);
+                printf("Calling f(%#zx): %.*p: %s\n", arg1, sizeof(__address) * 2, symaddr, symbol);
 #ifdef ia64
                 fptr.f = symaddr;

generic/src/ipc/ipc.c

@@ -479 +479 @@
                                 break;
                         case IPC_PHONE_CONNECTED:
-                                printf("connected to: %P ", 
+                                printf("connected to: %p ", 
                                        task->phones[i].callee);
                                 break;
                         case IPC_PHONE_SLAMMED:
-                                printf("slammed by: %P ", 
+                                printf("slammed by: %p ", 
                                        task->phones[i].callee);
                                 break;
                         case IPC_PHONE_HUNGUP:
-                                printf("hung up - was: %P ", 
+                                printf("hung up - was: %p ", 
                                        task->phones[i].callee);
                                 break;
@@ -504 +504 @@
         for (tmp=task->answerbox.calls.next; tmp != &task->answerbox.calls;tmp = tmp->next) {
                 call = list_get_instance(tmp, call_t, link);
-                printf("Callid: %P Srctask:%lld M:%d A1:%d A2:%d A3:%d Flags:%x\n",call,
+                printf("Callid: %p Srctask:%lld M:%d A1:%d A2:%d A3:%d Flags:%x\n",call,
                        call->sender->taskid, IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data),
                        IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data), call->flags);
@@ -514 +514 @@
              tmp = tmp->next) {
                 call = list_get_instance(tmp, call_t, link);
-                printf("Callid: %P Srctask:%lld M:%d A1:%d A2:%d A3:%d Flags:%x\n",call,
+                printf("Callid: %p Srctask:%lld M:%d A1:%d A2:%d A3:%d Flags:%x\n",call,
                        call->sender->taskid, IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data),
                        IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data), call->flags);
@@ -522 +522 @@
         for (tmp=task->answerbox.answers.next; tmp != &task->answerbox.answers; tmp = tmp->next) {
                 call = list_get_instance(tmp, call_t, link);
-                printf("Callid:%P M:%d A1:%d A2:%d A3:%d Flags:%x\n",call,
+                printf("Callid:%p M:%d A1:%d A2:%d A3:%d Flags:%x\n",call,
                        IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data),
                        IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data), call->flags);

generic/src/mm/as.c

@@ -1310 +1310 @@
         }
 
-        panic("Inconsistency detected while adding %d pages of used space at %P.\n", count, page);
+        panic("Inconsistency detected while adding %d pages of used space at %p.\n", count, page);
 }
 
@@ -1464 +1464 @@
 
 error:
-        panic("Inconsistency detected while removing %d pages of used space from %P.\n", count, page);
+        panic("Inconsistency detected while removing %d pages of used space from %p.\n", count, page);
 }
 

generic/src/proc/task.c

@@ -356 +356 @@
                 
                         spinlock_lock(&t->lock);
-                        printf("%s(%lld): address=%#zX, as=%#zX, ActiveCalls: %zd",
+                        printf("%s(%lld): address=%#zx, as=%#zx, ActiveCalls: %zd",
                                 t->name, t->taskid, t, t->as, atomic_get(&t->active_calls));
                         for (j=0; j < IPC_MAX_PHONES; j++) {
                                 if (t->phones[j].callee)
-                                        printf(" Ph(%zd): %#zX ", j, t->phones[j].callee);
+                                        printf(" Ph(%zd): %#zx ", j, t->phones[j].callee);
                         }
                         printf("\n");

generic/src/proc/thread.c

@@ -537 +537 @@
                 
                         t = (thread_t *) node->value[i];
-                        printf("%s: address=%#zX, tid=%zd, state=%s, task=%#zX, code=%#zX, stack=%#zX, cpu=",
+                        printf("%s: address=%#zx, tid=%zd, state=%s, task=%#zx, code=%#zx, stack=%#zx, cpu=",
                                 t->name, t, t->tid, thread_states[t->state], t->task, t->thread_code, t->kstack);
                         if (t->cpu)
@@ -544 +544 @@
                                 printf("none");
                         if (t->state == Sleeping) {
-                                printf(", kst=%#zX", t->kstack);
-                                printf(", wq=%#zX", t->sleep_queue);
+                                printf(", kst=%#zx", t->kstack);
+                                printf(", wq=%#zx", t->sleep_queue);
                         }
                         printf("\n");

generic/src/sysinfo/sysinfo.c

@@ -245 +245 @@
                 }
                 
-                printf("%s    %s val:%d(%X) sub:%s\n", root->name, vtype, val, val, (root->subinfo_type == SYSINFO_SUBINFO_NONE) ? "NON" : ((root->subinfo_type == SYSINFO_SUBINFO_TABLE) ? "TAB" : "FUN"));
+                printf("%s    %s val:%d(%x) sub:%s\n", root->name, vtype, val, val, (root->subinfo_type == SYSINFO_SUBINFO_NONE) ? "NON" : ((root->subinfo_type == SYSINFO_SUBINFO_TABLE) ? "TAB" : "FUN"));
                 
                 if (root->subinfo_type == SYSINFO_SUBINFO_TABLE)