]> Zhao Yanbai Git Server - minix.git/commitdiff
minor cleanup
authorBen Gras <ben@minix3.org>
Mon, 8 Jun 2009 04:30:16 +0000 (04:30 +0000)
committerBen Gras <ben@minix3.org>
Mon, 8 Jun 2009 04:30:16 +0000 (04:30 +0000)
kernel/arch/i386/memory.c
kernel/arch/i386/proto.h
kernel/arch/i386/system.c
kernel/debug.h
kernel/proc.c
kernel/system/do_exec.c
servers/vm/alloc.c
servers/vm/main.c

index eebf143748e6ae93744b3c9b93544de550b7318d..14f90d5fda804f6050671038b79e306ed3c1c7fb 100644 (file)
@@ -141,7 +141,6 @@ int lin_lin_copy(struct proc *srcproc, vir_bytes srclinaddr,
        int procslot;
        NOREC_ENTER(linlincopy);
 
-       FIXME("lin_lin_copy requires big pages");
        vmassert(vm_running);
        vmassert(!catch_pagefaults);
        vmassert(nfreepdes >= 3);
index 04866debf616e9d991dc773bd7abdcd9b4c117f0..0dfb478c9e6ccbb96646fbdddf0a835b22ff922c 100644 (file)
@@ -80,6 +80,7 @@ _PROTOTYPE( int _memcpy_k, (void *dst, void *src, size_t n) );
 _PROTOTYPE( int _memcpy_k_fault, (void) );
 _PROTOTYPE( u32_t read_cr3, (void) );
 _PROTOTYPE( void reload_cr3, (void) );
+_PROTOTYPE( void phys_memset, (phys_bytes ph, u32_t c, phys_bytes bytes)       );
 
 /* protect.c */
 _PROTOTYPE( void prot_init, (void)                                             );
index 4fac6d0fbf8dd2ded9b045b1306807302508a2ba..4b88b085cfb468db592110f8da39149271ba90ab 100644 (file)
@@ -137,6 +137,21 @@ PUBLIC void do_ser_debug()
        ser_debug(c);
 }
 
+PRIVATE void ser_dump_queues(void)
+{
+       int q;
+       for(q = 0; q < NR_SCHED_QUEUES; q++) {
+               struct proc *p;
+               if(rdy_head[q]) 
+                       printf("%2d: ", q);
+               for(p = rdy_head[q]; p; p = p->p_nextready) {
+                       printf("%s / %d  ", p->p_name, p->p_endpoint);
+               }
+               printf("\n");
+       }
+
+}
+
 PRIVATE void ser_debug(int c)
 {
        int u = 0;
@@ -228,20 +243,6 @@ PRIVATE void printslot(struct proc *pp, int level)
                printslot(depproc, level+1);
 }
 
-PUBLIC void ser_dump_queues()
-{
-       int q;
-       for(q = 0; q < NR_SCHED_QUEUES; q++) {
-               struct proc *p;
-               if(rdy_head[q]) 
-                       printf("%2d: ", q);
-               for(p = rdy_head[q]; p; p = p->p_nextready) {
-                       printf("%s / %d  ", p->p_name, p->p_endpoint);
-               }
-               printf("\n");
-       }
-
-}
 
 PUBLIC void ser_dump_proc()
 {
index 8ad26332fd33531cdc9e8c6b6582191197eabc38..baa044834b017b0d26af5db0366327aaa3e7e268 100644 (file)
@@ -48,8 +48,7 @@
        if(varname) {   \
                minix_panic(#varname " recursive enter", __LINE__); \
        } \
-       varname = 1;    \
-       FIXME(#varname " recursion check enabled");
+       varname = 1;
 
 #define NOREC_RETURN(varname, v) do {  \
        if(!varname)            \
index c5318b5c08a6b17d009fff2fc5fbecb5c98004b8..789965d22baadbd42af1ecfb44cf46b86d51d300 100755 (executable)
@@ -97,8 +97,6 @@ PRIVATE int QueueMess(endpoint_t ep, vir_bytes msg_lin, struct proc *dst)
        vmassert(!(dst->p_misc_flags & MF_DELIVERMSG)); 
        vmassert(dst->p_delivermsg_lin);
        vmassert(isokendpt(ep, &k));
-       FIXME("copy messages directly if in memory");
-       FIXME("possibly also msgcopy specific function");
 
        if(INMEMORY(dst)) {
                PHYS_COPY_CATCH(msg_lin, dst->p_delivermsg_lin,
@@ -120,12 +118,6 @@ PRIVATE int QueueMess(endpoint_t ep, vir_bytes msg_lin, struct proc *dst)
        dst->p_delivermsg.m_source = ep;
        dst->p_misc_flags |= MF_DELIVERMSG;
 
-#if 0
-       if(INMEMORY(dst)) {
-               delivermsg(dst);
-       }
-#endif
-
        NOREC_RETURN(queuemess, OK);
 }
 
@@ -621,7 +613,6 @@ int flags;
 #endif
 
            /* Found acceptable message. Copy it and update status. */
-           FIXME("message copied twice here");
            vmassert(!(caller_ptr->p_misc_flags & MF_DELIVERMSG));
            QueueMess((*xpp)->p_endpoint,
                vir2phys(&(*xpp)->p_sendmsg), caller_ptr);
@@ -743,6 +734,8 @@ size_t size;
 
        if(!(linaddr = umap_local(caller_ptr, D, (vir_bytes) table,
                size * sizeof(*table)))) {
+               printf("mini_senda: umap_local failed; 0x%lx len 0x%lx\n",
+                       table, size * sizeof(*table));
                return EFAULT;
        }
 
index 0bffb7f648078aa074da87c29db76a71c17966e3..b2284aadfd6b6c07e9dd6d08008d4f191fde3ae9 100644 (file)
@@ -32,12 +32,8 @@ register message *m_ptr;     /* pointer to request message */
   rp = proc_addr(proc);
 
   if(rp->p_misc_flags & MF_DELIVERMSG) {
-       printf("%s / %d has MF_DELIVERMSG on during exec - clearing.\n",
-               rp->p_name, rp->p_endpoint);
-#if 1
        rp->p_misc_flags &= ~MF_DELIVERMSG;
        rp->p_delivermsg_lin = 0;
-#endif
   }
 
   /* Save command name for debugging, ps(1) output, etc. */
index bf04f1b44a8a09b15c8a942edf14dd25866835cc..6348019f01d26f73a8e905d660f73d6291f31ff1 100644 (file)
@@ -408,8 +408,6 @@ struct memory *chunks;              /* list of free memory chunks */
   }
 
   CHECKHOLES;
-
-  FIXME("below 16MB allocation not done");
 }
 
 /*===========================================================================*
index 954281b615ce74e12f547f4ac35cf507b681e967..23bbede361409fddc52aa20b668cd451774c40aa 100644 (file)
@@ -262,14 +262,11 @@ PRIVATE void vm_init(void)
                         * mapping. VM has its own pagetable,
                         * don't check it.
                         */
-                       printf("VM: not giving %d its own pt\n",
-                               vmp->vm_endpoint);
                        if(!(vmp->vm_flags & VMF_HASPT)) {
                                pt_check(vmp);
                        }
                        continue;
                }
-               printf("VM: giving %d its own pt\n", vmp->vm_endpoint);
 
                old_stack = 
                        vmp->vm_arch.vm_seg[S].mem_vir +