oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed various GCC compiler warnings for the kernel.

Browse Source 
Only main() now gives a warning about the return type (GCC wants an int).
This commit is contained in:
Jorrit Herder 2005-06-21 10:47:46 +00:00
parent 3eeff022fb
commit 355a10864b
9 changed files with 36 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/clock.c
View File

@ -150,10 +150,6 @@ message *m_ptr; /* pointer to request message */
/* Despite its name, this routine is not called on every clock tick. It /* Despite its name, this routine is not called on every clock tick. It
* is called on those clock ticks when a lot of work needs to be done. * is called on those clock ticks when a lot of work needs to be done.
*/ */
register struct proc *rp;
register int proc_nr;
timer_t *tp;
struct proc *p;
/* Check if a clock timer expired and run its watchdog function. */ /* Check if a clock timer expired and run its watchdog function. */
if (next_timeout <= realtime) { if (next_timeout <= realtime) {
@ -226,7 +222,6 @@ irq_hook_t *hook;
* faster on a 5MHz 8088, and make task debugging much easier since there are * faster on a 5MHz 8088, and make task debugging much easier since there are
* no task switches on an inactive system. * no task switches on an inactive system.
*/ */
register struct proc *rp;
register unsigned ticks; register unsigned ticks;
message m; message m;
#if ! NEW_TIME_COUNT #if ! NEW_TIME_COUNT

34
kernel/exception.c
View File

@ -22,23 +22,23 @@ unsigned vec_nr;
int minprocessor; int minprocessor;
}; };
static struct ex_s ex_data[] = { static struct ex_s ex_data[] = {
"Divide error", SIGFPE, 86, { "Divide error", SIGFPE, 86 },
"Debug exception", SIGTRAP, 86, { "Debug exception", SIGTRAP, 86 },
"Nonmaskable interrupt", SIGBUS, 86, { "Nonmaskable interrupt", SIGBUS, 86 },
"Breakpoint", SIGEMT, 86, { "Breakpoint", SIGEMT, 86 },
"Overflow", SIGFPE, 86, { "Overflow", SIGFPE, 86 },
"Bounds check", SIGFPE, 186, { "Bounds check", SIGFPE, 186 },
"Invalid opcode", SIGILL, 186, { "Invalid opcode", SIGILL, 186 },
"Coprocessor not available", SIGFPE, 186, { "Coprocessor not available", SIGFPE, 186 },
"Double fault", SIGBUS, 286, { "Double fault", SIGBUS, 286 },
"Copressor segment overrun", SIGSEGV, 286, { "Copressor segment overrun", SIGSEGV, 286 },
"Invalid TSS", SIGSEGV, 286, { "Invalid TSS", SIGSEGV, 286 },
"Segment not present", SIGSEGV, 286, { "Segment not present", SIGSEGV, 286 },
"Stack exception", SIGSEGV, 286, /* STACK_FAULT already used */ { "Stack exception", SIGSEGV, 286 }, /* STACK_FAULT already used */
"General protection", SIGSEGV, 286, { "General protection", SIGSEGV, 286 },
"Page fault", SIGSEGV, 386, /* not close */ { "Page fault", SIGSEGV, 386 }, /* not close */
NIL_PTR, SIGILL, 0, /* probably software trap */ { NIL_PTR, SIGILL, 0 }, /* probably software trap */
"Coprocessor error", SIGFPE, 386, { "Coprocessor error", SIGFPE, 386 },
}; };
register struct ex_s *ep; register struct ex_s *ep;
struct proc *saved_proc; struct proc *saved_proc;

1
kernel/proc.c
View File

@ -436,7 +436,6 @@ register struct proc *rp; /* this process is now runnable */
{ {
/* Add 'rp' to one of the queues of runnable processes. */ /* Add 'rp' to one of the queues of runnable processes. */
register int q = rp->p_priority; /* scheduling queue to use */ register int q = rp->p_priority; /* scheduling queue to use */
register struct proc **xpp; /* iterate over queue */
#if ENABLE_K_DEBUGGING #if ENABLE_K_DEBUGGING
if(rp->p_ready) { if(rp->p_ready) {

32
kernel/protect.c
View File

@ -93,23 +93,23 @@ PUBLIC void prot_init()
unsigned char privilege; unsigned char privilege;
} }
gate_table[] = { gate_table[] = {
divide_error, DIVIDE_VECTOR, INTR_PRIVILEGE, { divide_error, DIVIDE_VECTOR, INTR_PRIVILEGE },
single_step_exception, DEBUG_VECTOR, INTR_PRIVILEGE, { single_step_exception, DEBUG_VECTOR, INTR_PRIVILEGE },
nmi, NMI_VECTOR, INTR_PRIVILEGE, { nmi, NMI_VECTOR, INTR_PRIVILEGE },
breakpoint_exception, BREAKPOINT_VECTOR, USER_PRIVILEGE, { breakpoint_exception, BREAKPOINT_VECTOR, USER_PRIVILEGE },
overflow, OVERFLOW_VECTOR, USER_PRIVILEGE, { overflow, OVERFLOW_VECTOR, USER_PRIVILEGE },
bounds_check, BOUNDS_VECTOR, INTR_PRIVILEGE, { bounds_check, BOUNDS_VECTOR, INTR_PRIVILEGE },
inval_opcode, INVAL_OP_VECTOR, INTR_PRIVILEGE, { inval_opcode, INVAL_OP_VECTOR, INTR_PRIVILEGE },
copr_not_available, COPROC_NOT_VECTOR, INTR_PRIVILEGE, { copr_not_available, COPROC_NOT_VECTOR, INTR_PRIVILEGE },
double_fault, DOUBLE_FAULT_VECTOR, INTR_PRIVILEGE, { double_fault, DOUBLE_FAULT_VECTOR, INTR_PRIVILEGE },
copr_seg_overrun, COPROC_SEG_VECTOR, INTR_PRIVILEGE, { copr_seg_overrun, COPROC_SEG_VECTOR, INTR_PRIVILEGE },
inval_tss, INVAL_TSS_VECTOR, INTR_PRIVILEGE, { inval_tss, INVAL_TSS_VECTOR, INTR_PRIVILEGE },
segment_not_present, SEG_NOT_VECTOR, INTR_PRIVILEGE, { segment_not_present, SEG_NOT_VECTOR, INTR_PRIVILEGE },
stack_exception, STACK_FAULT_VECTOR, INTR_PRIVILEGE, { stack_exception, STACK_FAULT_VECTOR, INTR_PRIVILEGE },
general_protection, PROTECTION_VECTOR, INTR_PRIVILEGE, { general_protection, PROTECTION_VECTOR, INTR_PRIVILEGE },
#if _WORD_SIZE == 4 #if _WORD_SIZE == 4
page_fault, PAGE_FAULT_VECTOR, INTR_PRIVILEGE, { page_fault, PAGE_FAULT_VECTOR, INTR_PRIVILEGE },
copr_error, COPROC_ERR_VECTOR, INTR_PRIVILEGE, { copr_error, COPROC_ERR_VECTOR, INTR_PRIVILEGE },
#endif #endif
{ hwint00, VECTOR( 0), INTR_PRIVILEGE }, { hwint00, VECTOR( 0), INTR_PRIVILEGE },
{ hwint01, VECTOR( 1), INTR_PRIVILEGE }, { hwint01, VECTOR( 1), INTR_PRIVILEGE },

1
kernel/start.c
View File

@ -27,7 +27,6 @@ U16_t parmoff, parmsize; /* boot parameters offset and length */
*/ */
char params[128*sizeof(char *)]; /* boot monitor parameters */ char params[128*sizeof(char *)]; /* boot monitor parameters */
register char *value; /* value in key=value pair */ register char *value; /* value in key=value pair */
unsigned mon_start;
extern int etext, end; extern int etext, end;
/* Decide if mode is protected; 386 or higher implies protected mode. /* Decide if mode is protected; 386 or higher implies protected mode.

5
kernel/system.c
View File

@ -320,7 +320,7 @@ int sig_nr; /* signal to be sent, 1 to _NSIG */
* the process when PM is informed, because PM can block waiting for FS to * the process when PM is informed, because PM can block waiting for FS to
* do a core dump. * do a core dump.
*/ */
register struct proc *rp, *mmp; register struct proc *rp;
message m; message m;
rp = proc_addr(proc_nr); rp = proc_addr(proc_nr);
@ -353,10 +353,9 @@ vir_bytes bytes; /* # of bytes to be copied */
* calling function will think an error occurred. This is not a problem, * calling function will think an error occurred. This is not a problem,
* since no one uses the first BIOS interrupt vector. * since no one uses the first BIOS interrupt vector.
*/ */
phys_bytes phys_addr;
/* Check all acceptable ranges. */ /* Check all acceptable ranges. */
#if 0 #if DEAD_CODE
if (vir_addr >= BIOS_MEM_BEGIN && vir_addr + bytes <= BIOS_MEM_END) if (vir_addr >= BIOS_MEM_BEGIN && vir_addr + bytes <= BIOS_MEM_END)
return (phys_bytes) vir_addr; return (phys_bytes) vir_addr;
else if (vir_addr >= UPPER_MEM_BEGIN && vir_addr + bytes <= UPPER_MEM_END) else if (vir_addr >= UPPER_MEM_BEGIN && vir_addr + bytes <= UPPER_MEM_END)

1
kernel/system/irqctl.c
View File

@ -23,7 +23,6 @@ register message *m_ptr; /* pointer to request message */
/* Dismember the request message. */ /* Dismember the request message. */
int irq_vec; int irq_vec;
int irq_hook_id; int irq_hook_id;
int proc_nr;
int r = OK; int r = OK;
irq_hook_t *hook_ptr; irq_hook_t *hook_ptr;

3
kernel/system/proctl.c
View File

@ -188,8 +188,7 @@ message *m_ptr; /* pointer to request message */
{ {
/* Handle sys_exit. A user process has exited (the PM sent the request). /* Handle sys_exit. A user process has exited (the PM sent the request).
*/ */
register struct proc *rp, *rc; register struct proc *rc;
struct proc *np, *xp;
int exit_proc_nr; int exit_proc_nr;
/* Get a pointer to the process that exited. */ /* Get a pointer to the process that exited. */

1
kernel/system/sysctl.c
View File

@ -25,7 +25,6 @@ message *m_ptr; /* pointer to request message */
/* Handle sys_exit. A server or driver wants to exit. This may happen /* Handle sys_exit. A server or driver wants to exit. This may happen
* on a panic, but also is done when MINIX is shutdown. * on a panic, but also is done when MINIX is shutdown.
*/ */
register struct proc *rp;
int proc_nr = m_ptr->m_source; /* can only exit own process */ int proc_nr = m_ptr->m_source; /* can only exit own process */
if (m_ptr->EXIT_STATUS != 0) { if (m_ptr->EXIT_STATUS != 0) {