gwj / at91sam9263 · Commits

Commit 8fcd36920e1b0e5ff92efb16f7ae05112cd4defa

Authored by blueswir1
1 parent a5f1b965

Fix some warnings that would be generated by gcc -Wmissing-prototypes 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5022 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 11 changed files with 61 additions and 67 deletions
dyngen.c
  View file @8fcd369
... ... @@ -272,7 +272,7 @@ static void *load_data(int fd, long offset, unsigned int size)
272 272 return data;
273 273 }
274 274  
275   -int strstart(const char *str, const char *val, const char **ptr)
  275 +static int strstart(const char *str, const char *val, const char **ptr)
276 276 {
277 277 const char *p, *q;
278 278 p = str;
... ... @@ -288,7 +288,7 @@ int strstart(const char *str, const char *val, const char **ptr)
288 288 return 1;
289 289 }
290 290  
291   -void pstrcpy(char *buf, int buf_size, const char *str)
  291 +static void pstrcpy(char *buf, int buf_size, const char *str)
292 292 {
293 293 int c;
294 294 char *q = buf;
... ... @@ -305,32 +305,32 @@ void pstrcpy(char *buf, int buf_size, const char *str)
305 305 *q = '\0';
306 306 }
307 307  
308   -void swab16s(uint16_t *p)
  308 +static void swab16s(uint16_t *p)
309 309 {
310 310 *p = bswap16(*p);
311 311 }
312 312  
313   -void swab32s(uint32_t *p)
  313 +static void swab32s(uint32_t *p)
314 314 {
315 315 *p = bswap32(*p);
316 316 }
317 317  
318   -void swab32ss(int32_t *p)
  318 +static void swab32ss(int32_t *p)
319 319 {
320 320 *p = bswap32(*p);
321 321 }
322 322  
323   -void swab64s(uint64_t *p)
  323 +static void swab64s(uint64_t *p)
324 324 {
325 325 *p = bswap64(*p);
326 326 }
327 327  
328   -void swab64ss(int64_t *p)
  328 +static void swab64ss(int64_t *p)
329 329 {
330 330 *p = bswap64(*p);
331 331 }
332 332  
333   -uint16_t get16(uint16_t *p)
  333 +static uint16_t get16(uint16_t *p)
334 334 {
335 335 uint16_t val;
336 336 val = *p;
... ... @@ -339,7 +339,7 @@ uint16_t get16(uint16_t *p)
339 339 return val;
340 340 }
341 341  
342   -uint32_t get32(uint32_t *p)
  342 +static uint32_t get32(uint32_t *p)
343 343 {
344 344 uint32_t val;
345 345 val = *p;
... ... @@ -348,14 +348,14 @@ uint32_t get32(uint32_t *p)
348 348 return val;
349 349 }
350 350  
351   -void put16(uint16_t *p, uint16_t val)
  351 +static void put16(uint16_t *p, uint16_t val)
352 352 {
353 353 if (do_swap)
354 354 val = bswap16(val);
355 355 *p = val;
356 356 }
357 357  
358   -void put32(uint32_t *p, uint32_t val)
  358 +static void put32(uint32_t *p, uint32_t val)
359 359 {
360 360 if (do_swap)
361 361 val = bswap32(val);
... ... @@ -378,7 +378,7 @@ uint8_t **sdata;
378 378 struct elfhdr ehdr;
379 379 char *strtab;
380 380  
381   -int elf_must_swap(struct elfhdr *h)
  381 +static int elf_must_swap(struct elfhdr *h)
382 382 {
383 383 union {
384 384 uint32_t i;
... ... @@ -390,7 +390,7 @@ int elf_must_swap(struct elfhdr *h)
390 390 (swaptest.b[0] == 0);
391 391 }
392 392  
393   -void elf_swap_ehdr(struct elfhdr *h)
  393 +static void elf_swap_ehdr(struct elfhdr *h)
394 394 {
395 395 swab16s(&h->e_type); /* Object file type */
396 396 swab16s(&h-> e_machine); /* Architecture */
... ... @@ -407,7 +407,7 @@ void elf_swap_ehdr(struct elfhdr *h)
407 407 swab16s(&h-> e_shstrndx); /* Section header string table index */
408 408 }
409 409  
410   -void elf_swap_shdr(struct elf_shdr *h)
  410 +static void elf_swap_shdr(struct elf_shdr *h)
411 411 {
412 412 swab32s(&h-> sh_name); /* Section name (string tbl index) */
413 413 swab32s(&h-> sh_type); /* Section type */
... ... @@ -421,7 +421,7 @@ void elf_swap_shdr(struct elf_shdr *h)
421 421 swabls(&h-> sh_entsize); /* Entry size if section holds table */
422 422 }
423 423  
424   -void elf_swap_phdr(struct elf_phdr *h)
  424 +static void elf_swap_phdr(struct elf_phdr *h)
425 425 {
426 426 swab32s(&h->p_type); /* Segment type */
427 427 swabls(&h->p_offset); /* Segment file offset */
... ... @@ -433,7 +433,7 @@ void elf_swap_phdr(struct elf_phdr *h)
433 433 swabls(&h->p_align); /* Segment alignment */
434 434 }
435 435  
436   -void elf_swap_rel(ELF_RELOC *rel)
  436 +static void elf_swap_rel(ELF_RELOC *rel)
437 437 {
438 438 swabls(&rel->r_offset);
439 439 swabls(&rel->r_info);
... ... @@ -442,8 +442,8 @@ void elf_swap_rel(ELF_RELOC *rel)
442 442 #endif
443 443 }
444 444  
445   -struct elf_shdr *find_elf_section(struct elf_shdr *shdr, int shnum, const char *shstr,
446   - const char *name)
  445 +static struct elf_shdr *find_elf_section(struct elf_shdr *shdr, int shnum,
  446 + const char *shstr, const char *name)
447 447 {
448 448 int i;
449 449 const char *shname;
... ... @@ -460,7 +460,7 @@ struct elf_shdr *find_elf_section(struct elf_shdr *shdr, int shnum, const char *
460 460 return NULL;
461 461 }
462 462  
463   -int find_reloc(int sh_index)
  463 +static int find_reloc(int sh_index)
464 464 {
465 465 struct elf_shdr *sec;
466 466 int i;
... ... @@ -489,7 +489,7 @@ static char *get_sym_name(EXE_SYM *sym)
489 489 }
490 490  
491 491 /* load an elf object file */
492   -int load_object(const char *filename)
  492 +static int load_object(const char *filename)
493 493 {
494 494 int fd;
495 495 struct elf_shdr *sec, *symtab_sec, *strtab_sec, *text_sec;
... ... @@ -1227,7 +1227,7 @@ int load_object(const char *filename)
1227 1227 #endif /* CONFIG_FORMAT_MACH */
1228 1228  
1229 1229 /* return true if the expression is a label reference */
1230   -int get_reloc_expr(char *name, int name_size, const char *sym_name)
  1230 +static int get_reloc_expr(char *name, int name_size, const char *sym_name)
1231 1231 {
1232 1232 const char *p;
1233 1233  
... ... @@ -1294,8 +1294,8 @@ get_plt_index (const char *name, unsigned long addend)
1294 1294 #define MAX_ARGS 3
1295 1295  
1296 1296 /* generate op code */
1297   -void gen_code(const char *name, host_ulong offset, host_ulong size,
1298   - FILE *outfile, int gen_switch)
  1297 +static void gen_code(const char *name, host_ulong offset, host_ulong size,
  1298 + FILE *outfile, int gen_switch)
1299 1299 {
1300 1300 int copy_size = 0;
1301 1301 uint8_t *p_start, *p_end;
... ... @@ -2630,7 +2630,7 @@ void gen_code(const char *name, host_ulong offset, host_ulong size,
2630 2630 }
2631 2631 }
2632 2632  
2633   -int gen_file(FILE *outfile, int out_type)
  2633 +static int gen_file(FILE *outfile, int out_type)
2634 2634 {
2635 2635 int i;
2636 2636 EXE_SYM *sym;
... ... @@ -2742,7 +2742,7 @@ int gen_file(FILE *outfile, int out_type)
2742 2742 return 0;
2743 2743 }
2744 2744  
2745   -void usage(void)
  2745 +static void usage(void)
2746 2746 {
2747 2747 printf("dyngen (c) 2003 Fabrice Bellard\n"
2748 2748 "usage: dyngen [-o outfile] [-c] objfile\n"
... ...
... ... @@ -386,7 +386,7 @@ static void tlb_unprotect_code_phys(CPUState *env, ram_addr_t ram_addr,
386 386 static uint8_t static_code_gen_buffer[DEFAULT_CODE_GEN_BUFFER_SIZE];
387 387 #endif
388 388  
389   -void code_gen_alloc(unsigned long tb_size)
  389 +static void code_gen_alloc(unsigned long tb_size)
390 390 {
391 391 #ifdef USE_STATIC_CODE_GEN_BUFFER
392 392 code_gen_buffer = static_code_gen_buffer;
... ...
hw/twl92230.c
  View file @8fcd369
... ... @@ -129,7 +129,7 @@ static void menelaus_rtc_hz(void *opaque)
129 129 menelaus_update(s);
130 130 }
131 131  
132   -void menelaus_reset(i2c_slave *i2c)
  132 +static void menelaus_reset(i2c_slave *i2c)
133 133 {
134 134 struct menelaus_s *s = (struct menelaus_s *) i2c;
135 135 s->reg = 0x00;
... ...
hw/usb-serial.c
  View file @8fcd369
... ... @@ -483,13 +483,13 @@ static void usb_serial_handle_destroy(USBDevice *dev)
483 483 qemu_free(s);
484 484 }
485 485  
486   -int usb_serial_can_read(void *opaque)
  486 +static int usb_serial_can_read(void *opaque)
487 487 {
488 488 USBSerialState *s = opaque;
489 489 return RECV_BUF - s->recv_used;
490 490 }
491 491  
492   -void usb_serial_read(void *opaque, const uint8_t *buf, int size)
  492 +static void usb_serial_read(void *opaque, const uint8_t *buf, int size)
493 493 {
494 494 USBSerialState *s = opaque;
495 495 int first_size = RECV_BUF - s->recv_ptr;
... ... @@ -501,7 +501,7 @@ void usb_serial_read(void *opaque, const uint8_t *buf, int size)
501 501 s->recv_used += size;
502 502 }
503 503  
504   -void usb_serial_event(void *opaque, int event)
  504 +static void usb_serial_event(void *opaque, int event)
505 505 {
506 506 USBSerialState *s = opaque;
507 507  
... ...
linux-user/main.c
  View file @8fcd369
... ... @@ -107,10 +107,12 @@ int cpu_inl(CPUState *env, int addr)
107 107 return 0;
108 108 }
109 109  
  110 +#if defined(TARGET_I386)
110 111 int cpu_get_pic_interrupt(CPUState *env)
111 112 {
112 113 return -1;
113 114 }
  115 +#endif
114 116  
115 117 /* timers for rdtsc */
116 118  
... ... @@ -2151,7 +2153,7 @@ void cpu_loop (CPUState *env)
2151 2153 }
2152 2154 #endif /* TARGET_ALPHA */
2153 2155  
2154   -void usage(void)
  2156 +static void usage(void)
2155 2157 {
2156 2158 printf("qemu-" TARGET_ARCH " version " QEMU_VERSION ", Copyright (c) 2003-2008 Fabrice Bellard\n"
2157 2159 "usage: qemu-" TARGET_ARCH " [options] program [arguments...]\n"
... ...
linux-user/signal.c
  View file @8fcd369
... ... @@ -154,7 +154,8 @@ void host_to_target_sigset(target_sigset_t *d, const sigset_t *s)
154 154 d->sig[i] = tswapl(d1.sig[i]);
155 155 }
156 156  
157   -void target_to_host_sigset_internal(sigset_t *d, const target_sigset_t *s)
  157 +static void target_to_host_sigset_internal(sigset_t *d,
  158 + const target_sigset_t *s)
158 159 {
159 160 int i;
160 161 sigemptyset(d);
... ... @@ -324,7 +325,7 @@ static inline void free_sigqueue(CPUState *env, struct sigqueue *q)
324 325 }
325 326  
326 327 /* abort execution with signal */
327   -void __attribute((noreturn)) force_sig(int sig)
  328 +static void __attribute((noreturn)) force_sig(int sig)
328 329 {
329 330 int host_sig;
330 331 host_sig = target_to_host_signal(sig);
... ...
linux-user/syscall.c
  View file @8fcd369
... ... @@ -105,38 +105,38 @@
105 105 #undef _syscall6
106 106  
107 107 #define _syscall0(type,name) \
108   -type name (void) \
  108 +static type name (void) \
109 109 { \
110 110 return syscall(__NR_##name); \
111 111 }
112 112  
113 113 #define _syscall1(type,name,type1,arg1) \
114   -type name (type1 arg1) \
  114 +static type name (type1 arg1) \
115 115 { \
116 116 return syscall(__NR_##name, arg1); \
117 117 }
118 118  
119 119 #define _syscall2(type,name,type1,arg1,type2,arg2) \
120   -type name (type1 arg1,type2 arg2) \
  120 +static type name (type1 arg1,type2 arg2) \
121 121 { \
122 122 return syscall(__NR_##name, arg1, arg2); \
123 123 }
124 124  
125 125 #define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
126   -type name (type1 arg1,type2 arg2,type3 arg3) \
  126 +static type name (type1 arg1,type2 arg2,type3 arg3) \
127 127 { \
128 128 return syscall(__NR_##name, arg1, arg2, arg3); \
129 129 }
130 130  
131 131 #define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
132   -type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4) \
  132 +static type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4) \
133 133 { \
134 134 return syscall(__NR_##name, arg1, arg2, arg3, arg4); \
135 135 }
136 136  
137 137 #define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
138 138 type5,arg5) \
139   -type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
  139 +static type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
140 140 { \
141 141 return syscall(__NR_##name, arg1, arg2, arg3, arg4, arg5); \
142 142 }
... ... @@ -144,7 +144,8 @@ type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
144 144  
145 145 #define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
146 146 type5,arg5,type6,arg6) \
147   -type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5,type6 arg6) \
  147 +static type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, \
  148 + type6 arg6) \
148 149 { \
149 150 return syscall(__NR_##name, arg1, arg2, arg3, arg4, arg5, arg6); \
150 151 }
... ... @@ -204,8 +205,10 @@ _syscall3(int, sys_getdents, uint, fd, struct dirent *, dirp, uint, count);
204 205 _syscall3(int, sys_getdents64, uint, fd, struct dirent64 *, dirp, uint, count);
205 206 #endif
206 207 _syscall2(int, sys_getpriority, int, which, int, who);
  208 +#if !defined (__x86_64__)
207 209 _syscall5(int, _llseek, uint, fd, ulong, hi, ulong, lo,
208 210 loff_t *, res, uint, wh);
  211 +#endif
209 212 #if defined(TARGET_NR_linkat) && defined(__NR_linkat)
210 213 _syscall5(int,sys_linkat,int,olddirfd,const char *,oldpath,
211 214 int,newdirfd,const char *,newpath,int,flags)
... ... @@ -253,10 +256,11 @@ _syscall3(int,sys_unlinkat,int,dirfd,const char *,pathname,int,flags)
253 256 _syscall4(int,sys_utimensat,int,dirfd,const char *,pathname,
254 257 const struct timespec *,tsp,int,flags)
255 258 #endif
  259 +#if defined(USE_NPTL)
256 260 #if defined(TARGET_NR_futex) && defined(__NR_futex)
257 261 _syscall6(int,sys_futex,int *,uaddr,int,op,int,val,
258 262 const struct timespec *,timeout,int *,uaddr2,int,val3)
259   -
  263 +#endif
260 264 #endif
261 265  
262 266 extern int personality(int);
... ... @@ -2522,8 +2526,8 @@ install:
2522 2526 }
2523 2527  
2524 2528 /* specific and weird i386 syscalls */
2525   -abi_long do_modify_ldt(CPUX86State *env, int func, abi_ulong ptr,
2526   - unsigned long bytecount)
  2529 +static abi_long do_modify_ldt(CPUX86State *env, int func, abi_ulong ptr,
  2530 + unsigned long bytecount)
2527 2531 {
2528 2532 abi_long ret;
2529 2533  
... ... @@ -2544,7 +2548,7 @@ abi_long do_modify_ldt(CPUX86State *env, int func, abi_ulong ptr,
2544 2548 return ret;
2545 2549 }
2546 2550  
2547   -abi_long do_set_thread_area(CPUX86State *env, abi_ulong ptr)
  2551 +static abi_long do_set_thread_area(CPUX86State *env, abi_ulong ptr)
2548 2552 {
2549 2553 uint64_t *gdt_table = g2h(env->gdt.base);
2550 2554 struct target_modify_ldt_ldt_s ldt_info;
... ... @@ -2629,7 +2633,7 @@ install:
2629 2633 return 0;
2630 2634 }
2631 2635  
2632   -abi_long do_get_thread_area(CPUX86State *env, abi_ulong ptr)
  2636 +static abi_long do_get_thread_area(CPUX86State *env, abi_ulong ptr)
2633 2637 {
2634 2638 struct target_modify_ldt_ldt_s *target_ldt_info;
2635 2639 uint64_t *gdt_table = g2h(env->gdt.base);
... ... @@ -2677,7 +2681,7 @@ abi_long do_get_thread_area(CPUX86State *env, abi_ulong ptr)
2677 2681 }
2678 2682  
2679 2683 #ifndef TARGET_ABI32
2680   -abi_long do_arch_prctl(CPUX86State *env, int code, abi_ulong addr)
  2684 +static abi_long do_arch_prctl(CPUX86State *env, int code, abi_ulong addr)
2681 2685 {
2682 2686 abi_long ret;
2683 2687 abi_ulong val;
... ... @@ -3150,8 +3154,8 @@ static inline abi_long host_to_target_timespec(abi_ulong target_addr,
3150 3154 futexes locally would make futexes shared between multiple processes
3151 3155 tricky. However they're probably useless because guest atomic
3152 3156 operations won't work either. */
3153   -int do_futex(target_ulong uaddr, int op, int val, target_ulong timeout,
3154   - target_ulong uaddr2, int val3)
  3157 +static int do_futex(target_ulong uaddr, int op, int val, target_ulong timeout,
  3158 + target_ulong uaddr2, int val3)
3155 3159 {
3156 3160 struct timespec ts, *pts;
3157 3161  
... ...
slirp/slirp.c
  View file @8fcd369
... ... @@ -554,7 +554,7 @@ struct arphdr
554 554 unsigned char ar_tip[4]; /* target IP address */
555 555 };
556 556  
557   -void arp_input(const uint8_t *pkt, int pkt_len)
  557 +static void arp_input(const uint8_t *pkt, int pkt_len)
558 558 {
559 559 struct ethhdr *eh = (struct ethhdr *)pkt;
560 560 struct arphdr *ah = (struct arphdr *)(pkt + ETH_HLEN);
... ...
tcg/tcg.c
  View file @8fcd369
... ... @@ -196,19 +196,6 @@ void tcg_pool_reset(TCGContext *s)
196 196 s->pool_current = NULL;
197 197 }
198 198  
199   -/* free all the pool */
200   -void tcg_pool_free(TCGContext *s)
201   -{
202   - TCGPool *p, *p1;
203   -
204   - for(p = s->pool_first; p != NULL; p = p1) {
205   - p1 = p->next;
206   - qemu_free(p);
207   - }
208   - s->pool_first = NULL;
209   - s->pool_cur = s->pool_end = NULL;
210   -}
211   -
212 199 void tcg_context_init(TCGContext *s)
213 200 {
214 201 int op, total_args, n;
... ... @@ -655,7 +642,7 @@ void tcg_gen_shifti_i64(TCGv ret, TCGv arg1,
655 642 }
656 643 #endif
657 644  
658   -void tcg_reg_alloc_start(TCGContext *s)
  645 +static void tcg_reg_alloc_start(TCGContext *s)
659 646 {
660 647 int i;
661 648 TCGTemp *ts;
... ... @@ -1025,7 +1012,7 @@ static inline void tcg_la_bb_end(TCGContext *s, uint8_t *dead_temps)
1025 1012 /* Liveness analysis : update the opc_dead_iargs array to tell if a
1026 1013 given input arguments is dead. Instructions updating dead
1027 1014 temporaries are removed. */
1028   -void tcg_liveness_analysis(TCGContext *s)
  1015 +static void tcg_liveness_analysis(TCGContext *s)
1029 1016 {
1030 1017 int i, op_index, op, nb_args, nb_iargs, nb_oargs, arg, nb_ops;
1031 1018 TCGArg *args;
... ...
tcg/x86_64/tcg-target.c
  View file @8fcd369
... ... @@ -108,7 +108,7 @@ static inline int tcg_target_get_call_iarg_regs_count(int flags)
108 108 }
109 109  
110 110 /* parse target specific constraints */
111   -int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)
  111 +static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)
112 112 {
113 113 const char *ct_str;
114 114  
... ... @@ -404,7 +404,7 @@ static inline void tgen_arithi64(TCGContext *s, int c, int r0, int64_t val)
404 404 }
405 405 }
406 406  
407   -void tcg_out_addi(TCGContext *s, int reg, tcg_target_long val)
  407 +static void tcg_out_addi(TCGContext *s, int reg, tcg_target_long val)
408 408 {
409 409 if (val != 0)
410 410 tgen_arithi64(s, ARITH_ADD, reg, val);
... ...
... ... @@ -2561,7 +2561,7 @@ static void pty_chr_state(CharDriverState *chr, int connected)
2561 2561 }
2562 2562 }
2563 2563  
2564   -void pty_chr_timer(void *opaque)
  2564 +static void pty_chr_timer(void *opaque)
2565 2565 {
2566 2566 struct CharDriverState *chr = opaque;
2567 2567 PtyCharDriver *s = chr->opaque;
... ...