Changeset 3de6dd7a in mainline

Timestamp:

2006-05-30T22:23:11Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

4fded58

Parents:

8cf8ee6

Message:

Added console support to gxemul.
Wider information in thread list.

Files:

• arch/mips32/src/mips32.c (modified) (2 diffs)
• contrib/conf/gxemul.sh (modified) (1 diff)
• generic/src/proc/thread.c (modified) (1 diff)

arch/mips32/src/mips32.c ¶

@@ -62 +62 @@
 {
         /* Setup usermode */
-        init.cnt = 4;
+        init.cnt = 5;
         init.tasks[0].addr = INIT_ADDRESS;
         init.tasks[0].size = INIT_SIZE;
@@ -71 +71 @@
         init.tasks[3].addr = INIT_ADDRESS + 0x300000;
         init.tasks[3].size = INIT_SIZE;
+        init.tasks[4].addr = INIT_ADDRESS + 0x400000;
+        init.tasks[4].size = INIT_SIZE;
 
 }

contrib/conf/gxemul.sh ¶

@@ -2 +2 @@
 # Uspace addresses outside of normal memory (kernel has std. 8 or 16MB)
 # we place the pages at 24M
-        gxemul $@ -E testmips -X 0x81800000:../uspace/ns/ns 0x81900000:../uspace/kbd/kbd 0x81a00000:../uspace/fb/fb 0x81b00000:../uspace/init/init kernel.bin 
+        gxemul $@ -E testmips -X 0x81800000:../uspace/ns/ns 0x81900000:../uspace/kbd/kbd 0x81a00000:../uspace/fb/fb 0x81b00000:../uspace/init/init 0x81c00000:../uspace/console/console kernel.bin 

generic/src/proc/thread.c ¶

@@ -432 +432 @@
                                 t->name, t, t->tid, thread_states[t->state], t->task, t->thread_code, t->kstack);
                         if (t->cpu)
-                                printf("cpu%zd ", t->cpu->id);
+                                printf("cpu%zd", t->cpu->id);
                         else
                                 printf("none");
+                        if (t->state == Sleeping) {
+                                printf(", kst=%#zX", t->kstack);
+                                printf(", wq=%#zX", t->sleep_queue);
+                        }
                         printf("\n");
                 }