Changeset 7bb6b06 in mainline

Timestamp:

2006-09-10T21:21:39Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9a5b556

Parents:

208fa65

Message:

Small improvements here and there.

Files:

• kernel/arch/sparc64/_link.ld.in (modified) (1 diff)
• kernel/arch/sparc64/include/asm.h (modified) (1 diff)
• kernel/arch/sparc64/include/trap/exception.h (modified) (1 diff)
• kernel/arch/sparc64/src/asm.S (modified) (2 diffs)
• kernel/arch/sparc64/src/console.c (modified) (2 diffs)
• kernel/arch/sparc64/src/mm/tlb.c (modified) (4 diffs)
• kernel/arch/sparc64/src/start.S (modified) (6 diffs)
• kernel/arch/sparc64/src/trap/exception.c (modified) (10 diffs)
• kernel/arch/sparc64/src/trap/trap_table.S (modified) (2 diffs)
• kernel/genarch/src/kbd/ns16550.c (modified) (2 diffs)
• kernel/generic/src/printf/printf_core.c (modified) (1 diff)
• kernel/generic/src/proc/task.c (modified) (2 diffs)
• kernel/generic/src/sysinfo/sysinfo.c (modified) (1 diff)
• uspace/ns/ns.c (modified) (2 diffs)

kernel/arch/sparc64/_link.ld.in

@@ -44 +44 @@
         
         /DISCARD/ : {
-                *(.comment);
-                *(.note*);
+                *(*);
         }
 

kernel/arch/sparc64/include/asm.h

@@ -223 +223 @@
         uintptr_t v;
         
-        __asm__ volatile ("and %%sp, %1, %0\n" : "=r" (v) : "r" (~(STACK_SIZE-1)));
+        __asm__ volatile ("andn %%sp, %1, %0\n" : "=r" (v) : "r" (STACK_SIZE-1));
         
         return v;

kernel/arch/sparc64/include/trap/exception.h

@@ -51 +51 @@
 #include <typedefs.h>
 
+extern void dump_istate(istate_t *istate);
+
 extern void instruction_access_exception(int n, istate_t *istate);
 extern void instruction_access_error(int n, istate_t *istate);

kernel/arch/sparc64/src/asm.S

@@ -228 +228 @@
 
 .macro WRITE_ALTERNATE_REGISTER reg, bit
-        save %sp, -STACK_WINDOW_SAVE_AREA_SIZE, %sp
-        rdpr %pstate, %l0
-        wrpr %l0, \bit, %pstate
-        mov %i0, \reg
-        wrpr %l0, 0, %pstate
-        ret
-        restore
+        wrpr %g0, (\bit | PSTATE_PRIV_BIT), %pstate
+        mov %o0, \reg
+        retl
+        wrpr %g0, PSTATE_PRIV_BIT, %pstate
 .endm
 
 .macro READ_ALTERNATE_REGISTER reg, bit
-        save %sp, -STACK_WINDOW_SAVE_AREA_SIZE, %sp
-        rdpr %pstate, %l0
-        wrpr %l0, \bit, %pstate
-        mov \reg, %i0
-        wrpr %l0, 0, %pstate
-        ret
-        restore
+        wrpr %g0, (\bit | PSTATE_PRIV_BIT), %pstate
+        mov \reg, %o0
+        retl
+        wrpr %g0, PSTATE_PRIV_BIT, %pstate
 .endm
 
@@ -306 +300 @@
         
         done                            ! jump to userspace
+

kernel/arch/sparc64/src/console.c

@@ -54 +54 @@
 #include <arch/mm/tlb.h>
 #include <arch/boot/boot.h>
+#include <arch.h>
 
 #define KEYBOARD_POLL_PAUSE     50000   /* 50ms */
@@ -80 +81 @@
 void kkbdpoll(void *arg)
 {
+        thread_detach(THREAD);
+
         if (!bootinfo.keyboard.addr)
                 return;

kernel/arch/sparc64/src/mm/tlb.c

@@ -48 +48 @@
 #include <config.h>
 #include <arch/trap/trap.h>
+#include <arch/trap/exception.h>
 #include <panic.h>
 #include <arch/asm.h>
-#include <symtab.h>
 
 static void dtlb_pte_copy(pte_t *t, bool ro);
@@ -308 +308 @@
 void do_fast_instruction_access_mmu_miss_fault(istate_t *istate, const char *str)
 {
-        char *tpc_str = get_symtab_entry(istate->tpc);
-
         fault_if_from_uspace(istate, "%s\n", str);
-        printf("TPC=%p, (%s)\n", istate->tpc, tpc_str);
+        dump_istate(istate);
         panic("%s\n", str);
 }
@@ -318 +316 @@
 {
         uintptr_t va;
-        char *tpc_str = get_symtab_entry(istate->tpc);
+
+        va = tag.vpn << PAGE_WIDTH;
+
+        fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d)\n", str, va, tag.context);
+        dump_istate(istate);
+        printf("Faulting page: %p, ASID=%d\n", va, tag.context);
+        panic("%s\n", str);
+}
+
+void do_fast_data_access_protection_fault(istate_t *istate, tlb_tag_access_reg_t tag, const char *str)
+{
+        uintptr_t va;
 
         va = tag.vpn << PAGE_WIDTH;
@@ -324 +333 @@
         fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d)\n", str, va, tag.context);
         printf("Faulting page: %p, ASID=%d\n", va, tag.context);
-        printf("TPC=%p, (%s)\n", istate->tpc, tpc_str);
-        panic("%s\n", str);
-}
-
-void do_fast_data_access_protection_fault(istate_t *istate, tlb_tag_access_reg_t tag, const char *str)
-{
-        uintptr_t va;
-        char *tpc_str = get_symtab_entry(istate->tpc);
-
-        va = tag.vpn << PAGE_WIDTH;
-
-        fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d)\n", str, va, tag.context);
-        printf("Faulting page: %p, ASID=%d\n", va, tag.context);
-        printf("TPC=%p, (%s)\n", istate->tpc, tpc_str);
+        dump_istate(istate);
         panic("%s\n", str);
 }

kernel/arch/sparc64/src/start.S

@@ -77 +77 @@
         mov %o1, %o2
         mov %o0, %o1
-        set bootinfo, %o0
+        sethi %hi(bootinfo), %o0
         call memcpy
-        nop
+        or %o0, %lo(bootinfo), %o0
 
         /*
          * Switch to kernel trap table.
          */
-        set trap_table, %g1
-        wrpr %g1, 0, %tba
+        sethi %hi(trap_table), %g1
+        wrpr %g1, %lo(trap_table), %tba
 
         /* 
@@ -121 +121 @@
         sllx %r2, TTE_SIZE_SHIFT, %r2; \
         or %r1, %r2, %r1; \
-        set 1, %r2; \
+        mov 1, %r2; \
         sllx %r2, TTE_V_SHIFT, %r2; \
         or %r1, %r2, %r1;
@@ -173 +173 @@
         ! write ITLB tag of context 1
         SET_TLB_TAG(g1, MEM_CONTEXT_TEMP)
-        set VA_DMMU_TAG_ACCESS, %g2
+        mov VA_DMMU_TAG_ACCESS, %g2
         stxa %g1, [%g2] ASI_IMMU
         flush %g5
@@ -183 +183 @@
         
         ! switch to context 1
-        set MEM_CONTEXT_TEMP, %g1
+        mov MEM_CONTEXT_TEMP, %g1
         stxa %g1, [VA_PRIMARY_CONTEXT_REG] %asi ! ASI_DMMU is correct here !!!
         flush %g5
@@ -194 +194 @@
         ! write ITLB tag of context 0
         SET_TLB_TAG(g1, MEM_CONTEXT_KERNEL)
-        set VA_DMMU_TAG_ACCESS, %g2
+        mov VA_DMMU_TAG_ACCESS, %g2
         stxa %g1, [%g2] ASI_IMMU
         flush %g5
@@ -211 +211 @@
 
         ! set context 1 in the primary context register
-        set MEM_CONTEXT_TEMP, %g1
+        mov MEM_CONTEXT_TEMP, %g1
         stxa %g1, [VA_PRIMARY_CONTEXT_REG] %asi ! ASI_DMMU is correct here !!!
         flush %g5

kernel/arch/sparc64/src/trap/exception.c

@@ -40 +40 @@
 #include <debug.h>
 #include <typedefs.h>
+#include <symtab.h>
+#include <print.h>
+
+void dump_istate(istate_t *istate)
+{
+        printf("TSTATE=%#llx\n", istate->tstate);
+        printf("TPC=%#llx (%s)\n", istate->tpc, get_symtab_entry(istate->tpc));
+        printf("TNPC=%#llx (%s)\n", istate->tnpc, get_symtab_entry(istate->tnpc));
+}
 
 /** Handle instruction_access_exception. (0x8) */
@@ -45 +54 @@
 {
         fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-        panic("%s at %p.\n", __FUNCTION__, istate->tpc);
+        dump_istate(istate);
+        panic("%s\n", __FUNCTION__);
 }
 
@@ -52 +62 @@
 {
         fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-        panic("%s at %p.\n", __FUNCTION__, istate->tpc);
+        dump_istate(istate);
+        panic("%s\n", __FUNCTION__);
 }
 
@@ -59 +70 @@
 {
         fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-        panic("%s at %p.\n", __FUNCTION__, istate->tpc);
+        dump_istate(istate);
+        panic("%s\n", __FUNCTION__);
 }
 
@@ -66 +78 @@
 {
         fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-        panic("%s at %p.\n", __FUNCTION__, istate->tpc);
+        dump_istate(istate);
+        panic("%s\n", __FUNCTION__);
 }
 
@@ -73 +86 @@
 {
         fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-        panic("%s at %p.\n", __FUNCTION__, istate->tpc);
+        dump_istate(istate);
+        panic("%s\n", __FUNCTION__);
 }
 
@@ -80 +94 @@
 {
         fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-        panic("%s from %p.\n", __FUNCTION__, istate->tpc);
+        dump_istate(istate);
+        panic("%s\n", __FUNCTION__);
 }
 
@@ -87 +102 @@
 {
         fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-        panic("%s from %p.\n", __FUNCTION__, istate->tpc);
+        dump_istate(istate);
+        panic("%s\n", __FUNCTION__);
 }
 
@@ -94 +110 @@
 {
         fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-        panic("%s from %p.\n", __FUNCTION__, istate->tpc);
+        dump_istate(istate);
+        panic("%s\n", __FUNCTION__);
 }
 
@@ -101 +118 @@
 {
         fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-        panic("%s at %p.\n", __FUNCTION__, istate->tpc);
+        dump_istate(istate);
+        panic("%s\n", __FUNCTION__);
 }
 

kernel/arch/sparc64/src/trap/trap_table.S

@@ -651 +651 @@
         ba 1f
         nop
-
 0:
         save %sp, -PREEMPTIBLE_HANDLER_STACK_FRAME_SIZE, %sp
@@ -782 +781 @@
         /*
          * OTHERWIN != 0 or fall-through from the OTHERWIN == 0 case.
-         * The CWP has already been restored to the value it had prior to the SAVE
+         * The CWP has already been restored to the value it had after the SAVE
          * at the beginning of this function.
          */

kernel/genarch/src/kbd/ns16550.c

@@ -48 +48 @@
 #include <console/console.h>
 #include <interrupt.h>
+#include <sysinfo/sysinfo.h>
 
 #define LSR_DATA_READY  0x01
@@ -87 +88 @@
         chardev_initialize("ns16550_kbd", &kbrd, &ops);
         stdin = &kbrd;
+        
+        sysinfo_set_item_val("kbd", NULL, true);
+        sysinfo_set_item_val("kbd.irq", NULL, 0);
+        sysinfo_set_item_val("kbd.address.virtual", NULL, (uintptr_t) kbd_virt_address);
 }
 

kernel/generic/src/printf/printf_core.c

@@ -393 +393 @@
  * FLAGS:@n
  *      - "#" Force to print prefix.
- *      For conversion \%o the prefix is 0, for %x and \%X prefixes are 0x and 0X
+ *      For conversion \%o the prefix is 0, for \%x and \%X prefixes are 0x and 0X
  *      and for conversion \%b the prefix is 0b.
  *

kernel/generic/src/proc/task.c

@@ -68 +68 @@
  * @li the tasks_lock is held,
  * @li the task's lock is held when task's lock is acquired before releasing tasks_lock or
- * @li the task's refcount is grater than 0
+ * @li the task's refcount is greater than 0
  *
  */
@@ -436 +436 @@
          * and no new threads can be created.
          */
-        
+
         ipc_cleanup();
         futex_cleanup();

kernel/generic/src/sysinfo/sysinfo.c

@@ -79 +79 @@
         
         if (subtree == NULL) {
-                        sysinfo_item_t *item = malloc(sizeof(sysinfo_item_t), 0);
-                        int i = 0, j;
-                        
-                        ASSERT(item);
-                        *psubtree = item;
-                        item->next = NULL;
-                        item->val_type = SYSINFO_VAL_UNDEFINED;
-                        item->subinfo.table = NULL;
-
-                        while (name[i] && (name[i] != '.'))
-                                i++;
-                        
-                        item->name = malloc(i, 0);
-                        ASSERT(item->name);
-
-                        for (j = 0; j < i; j++)
-                                item->name[j] = name[j];
-                        item->name[j] = 0;
-                        
-                        if (name[i]) { /* =='.' */
-                                item->subinfo_type = SYSINFO_SUBINFO_TABLE;
-                                return sysinfo_create_path(name + i + 1, &(item->subinfo.table));
-                        }
-                        item->subinfo_type = SYSINFO_SUBINFO_NONE;
-                        return item;
+                sysinfo_item_t *item = malloc(sizeof(sysinfo_item_t), 0);
+                int i = 0, j;
+                        
+                ASSERT(item);
+                *psubtree = item;
+                item->next = NULL;
+                item->val_type = SYSINFO_VAL_UNDEFINED;
+                item->subinfo.table = NULL;
+
+                while (name[i] && (name[i] != '.'))
+                        i++;
+                        
+                item->name = malloc(i, 0);
+                ASSERT(item->name);
+
+                for (j = 0; j < i; j++)
+                        item->name[j] = name[j];
+                item->name[j] = 0;
+                        
+                if (name[i]) { /* =='.' */
+                        item->subinfo_type = SYSINFO_SUBINFO_TABLE;
+                        return sysinfo_create_path(name + i + 1, &(item->subinfo.table));
+                }
+                item->subinfo_type = SYSINFO_SUBINFO_NONE;
+                return item;
         }
 

uspace/ns/ns.c

@@ -84 +84 @@
 static void *klogaddr = NULL;
 
-static void get_as(ipc_callid_t callid, ipc_call_t *call, char *name, void **addr)
+static void get_as_area(ipc_callid_t callid, ipc_call_t *call, char *name, void **addr)
 {
         void *ph_addr;
@@ -117 +117 @@
                         switch (IPC_GET_ARG3(call)) {
                         case SERVICE_MEM_REALTIME:
-                                get_as(callid, &call, "clock.faddr", &clockaddr);
+                                get_as_area(callid, &call, "clock.faddr", &clockaddr);
                                 break;
                         case SERVICE_MEM_KLOG:
-                                get_as(callid, &call, "klog.faddr", &klogaddr);
+                                get_as_area(callid, &call, "klog.faddr", &klogaddr);
                                 break;
                         default: