compile fixes for mini-os

[Kip Macy <kmacy@fsmware.com>]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 412 bytes --]

I'm compiling the mini-os files in the FreeBSD build environment which
uses the following extra flags:

-Wcast-qual -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wpointer-arith -Winline -ansi

This produces a number of annoying warnings which are fixed by the
attached patch. In addition the sabon.sty doesn't exist in my
environment - I was able to comment it out in style.tex any
apparent ill effect.

[-- Attachment #2: Type: TEXT/PLAIN, Size: 8236 bytes --]

===== docs/style.tex 1.1 vs edited =====
7c7
< \usepackage{sabon}
---
> % \usepackage{sabon}
===== extras/mini-os/Makefile 1.5 vs edited =====
6c6,7
< CFLAGS  := -fno-builtin -O3 -Wall -Ih/
---
> CFLAGS  := -fno-builtin -O3 -Wall -Ih/ -Wcast-qual -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wpointer-arith -Winline -ansi
> 
===== extras/mini-os/events.c 1.3 vs edited =====
35,36c35,36
< 
<     if (ev >= NR_EVS) {
---
> 	/* assuming ev can't be negative */
>     if ((unsigned int)ev >= NR_EVS) {
94c94
<     int i;
---
>     unsigned int i;
===== extras/mini-os/kernel.c 1.8 vs edited =====
63c63
< 
---
> extern char shared_info[PAGE_SIZE];
66c66
<     extern char shared_info[PAGE_SIZE];
---
> 
===== extras/mini-os/mm.c 1.4 vs edited =====
90c90
<         int i;
---
>         unsigned int i;
222c222
<     int i;
---
>     unsigned int i;
259c259
<         for ( i = PAGE_SHIFT; (1<<(i+1)) <= range; i++ )
---
>         for ( i = PAGE_SHIFT;  (unsigned int)(1<<(i+1)) <= range;  i++ )
281c281
<     int i;
---
>     unsigned int i;
300c300
<     while ( i != order )
---
>     while ( i != (unsigned int)order )
===== extras/mini-os/time.c 1.4 vs edited =====
91c91
< static inline unsigned long get_time_delta_usecs(void)
---
> __inline__ static unsigned long get_time_delta_usecs(void)
===== extras/mini-os/traps.c 1.5 vs edited =====
60c60
< static inline void dump_code(unsigned eip)
---
> __inline__ static void dump_code(unsigned eip)
83c83
< static void inline do_trap(int trapnr, char *str,
---
> __inline__ static void do_trap(int trapnr, char *str,
87c87
<   printf("%d %s", trapnr, str);
---
>   printf("%d %s : %ld", trapnr, str, error_code);
===== extras/mini-os/h/hypervisor.h 1.8 vs edited =====
35c35
< static inline int HYPERVISOR_set_trap_table(trap_info_t *table)
---
> __inline__ static int HYPERVISOR_set_trap_table(trap_info_t *table)
46c46
< static inline int HYPERVISOR_mmu_update(mmu_update_t *req, int count)
---
> __inline__ static int HYPERVISOR_mmu_update(mmu_update_t *req, int count)
57c57
< static inline int HYPERVISOR_console_write(const char *str, int count)
---
> __inline__ static int HYPERVISOR_console_write(const char *str, int count)
69c69
< static inline int HYPERVISOR_set_gdt(unsigned long *frame_list, int entries)
---
> __inline__ static int HYPERVISOR_set_gdt(unsigned long *frame_list, int entries)
81c81
< static inline int HYPERVISOR_stack_switch(unsigned long ss, unsigned long esp)
---
> __inline__ static int HYPERVISOR_stack_switch(unsigned long ss, unsigned long esp)
92c92
< static inline int HYPERVISOR_set_callbacks(
---
> __inline__ static int HYPERVISOR_set_callbacks(
106c106
< static inline int HYPERVISOR_net_io_op(netop_t *op)
---
> __inline__ static int HYPERVISOR_net_io_op(netop_t *op)
117c117
< static inline int HYPERVISOR_fpu_taskswitch(void)
---
> __inline__ static int HYPERVISOR_fpu_taskswitch(void)
127c127
< static inline int HYPERVISOR_yield(void)
---
> __inline__ static int HYPERVISOR_yield(void)
138c138
< static inline int HYPERVISOR_exit(void)
---
> __inline__ static int HYPERVISOR_exit(void)
149c149
< static inline int HYPERVISOR_stop(void)
---
> __inline__ static int HYPERVISOR_stop(void)
160c160
< static inline int HYPERVISOR_dom0_op(void *dom0_op)
---
> __inline__ static int HYPERVISOR_dom0_op(void *dom0_op)
171c171
< static inline int HYPERVISOR_network_op(void *network_op)
---
> __inline__ static int HYPERVISOR_network_op(void *network_op)
182c182
< static inline int HYPERVISOR_block_io_op(unsigned int op)
---
> __inline__ static int HYPERVISOR_block_io_op(unsigned int op)
193c193
< static inline int HYPERVISOR_set_debugreg(int reg, unsigned long value)
---
> __inline__ static int HYPERVISOR_set_debugreg(int reg, unsigned long value)
204c204
< static inline unsigned long HYPERVISOR_get_debugreg(int reg)
---
> __inline__ static unsigned long HYPERVISOR_get_debugreg(int reg)
215c215
< static inline int HYPERVISOR_update_descriptor(
---
> __inline__ static int HYPERVISOR_update_descriptor(
227c227
< static inline int HYPERVISOR_set_fast_trap(int idx)
---
> __inline__ static int HYPERVISOR_set_fast_trap(int idx)
238c238
< static inline int HYPERVISOR_dom_mem_op(void *dom_mem_op)
---
> __inline__ static int HYPERVISOR_dom_mem_op(void *dom_mem_op)
249c249
< static inline int HYPERVISOR_multicall(void *call_list, int nr_calls)
---
> __inline__ static int HYPERVISOR_multicall(void *call_list, int nr_calls)
260c260
< static inline long HYPERVISOR_kbd_op(unsigned char op, unsigned char val)
---
> __inline__ static long HYPERVISOR_kbd_op(unsigned char op, unsigned char val)
271c271
< static inline int HYPERVISOR_update_va_mapping(
---
> __inline__ static int HYPERVISOR_update_va_mapping(
===== extras/mini-os/h/lib.h 1.2 vs edited =====
117c117
< struct mallinfo mallinfo();
---
> struct mallinfo mallinfo(void);
126c126
< void malloc_stats();
---
> void malloc_stats(void);
===== extras/mini-os/h/mm.h 1.3 vs edited =====
54c54
< static inline unsigned long phys_to_machine(unsigned long phys)
---
> __inline__ static unsigned long phys_to_machine(unsigned long phys)
60c60
< static inline unsigned long machine_to_phys(unsigned long machine)
---
> __inline__ static unsigned long machine_to_phys(unsigned long machine)
72c72
< void init_mm();
---
> void init_mm(void);
===== extras/mini-os/h/os.h 1.5 vs edited =====
140,141c140,142
< #define __xg(x) ((struct __xchg_dummy *)(x))
< static inline unsigned long __xchg(unsigned long x, volatile void * ptr,
---
> #define __xg(x) ((volatile struct __xchg_dummy *)(x))
> 
> __inline__ static unsigned long __xchg(unsigned long x, volatile void * ptr,
===== extras/mini-os/lib/malloc.c 1.3 vs edited =====
47c47
<     static void *last;
---
>     static char *last;
49c49
<     void *ret;
---
>     char *ret;
57c57
<     ret = (void *)alloc_pages(order);
---
>     ret = (char *)alloc_pages(order);
===== extras/mini-os/lib/math.c 1.2 vs edited =====
143,144c143
< __qdivrem(uq, vq, arq)
< 	u64 uq, vq, *arq;
---
> __qdivrem(u64 uq, u64 vq, u64 *arq)
366,367c365
< __udivdi3(a, b)
<         u64 a, b;
---
> __udivdi3(u64 a, u64 b)
377,378c375
< __umoddi3(a, b)
<         u_quad_t a, b;
---
> __umoddi3(u_quad_t a, u_quad_t b)
===== extras/mini-os/lib/string.c 1.2 vs edited =====
38c38,39
< 	char *tmp = (char *) dest, *s = (char *) src;
---
> 	char *tmp = (char *) dest;
> 	const char *s = (const char *) src;
123c124
<         return (char *) s;
---
>         return (char *)s;
126,138c127,144
< char * strstr(const char * s1,const char * s2)
< {
<         int l1, l2;
< 
<         l2 = strlen(s2);
<         if (!l2)
<                 return (char *) s1;
<         l1 = strlen(s1);
<         while (l1 >= l2) {
<                 l1--;
<                 if (!memcmp(s1,s2,l2))
<                         return (char *) s1;
<                 s1++;
---
> /*
>  * Find the first occurrence of find in s.
>  */
> char *
> strstr(const char *s, const char *find)
> {
> 	    char c, sc;
>         size_t len;
> 
>         if ((c = *find++) != 0) {
>                 len = strlen(find);
>                 do {
>                         do {
>                                 if ((sc = *s++) == 0)
>                                         return (NULL);
>                         } while (sc != c);
>                 } while (strncmp(s, find, len) != 0);
>                 s--;
140c146
<         return NULL;
---
>         return ((char *)s);
142d147
< 
===== xen/include/hypervisor-ifs/block.h 1.24 vs edited =====
107,108c107,108
<     int         max;             // maximumum number of disks to report
<     xen_disk_t *disks;           // pointer to array of disk info 
---
>     int         max;             /* maximumum number of disks to report */
>     xen_disk_t *disks;           /* pointer to array of disk info */ 
110c110
<     int         count;           // how many disks we have info about 
---
>     int         count;           /* how many disks we have info about */