Revision 79383c9c

b/block.c
56 56
static int bdrv_write_em(BlockDriverState *bs, int64_t sector_num,
57 57
                         const uint8_t *buf, int nb_sectors);
58 58

  
59
BlockDriverState *bdrv_first;
60 59
static BlockDriver *first_drv;
61 60

  
62 61
int path_is_absolute(const char *path)
b/exec-all.h
57 57
typedef void (GenOpFunc2)(long, long);
58 58
typedef void (GenOpFunc3)(long, long, long);
59 59

  
60
extern FILE *logfile;
61
extern int loglevel;
60
#include "qemu-log.h"
62 61

  
63 62
void gen_intermediate_code(CPUState *env, struct TranslationBlock *tb);
64 63
void gen_intermediate_code_pc(CPUState *env, struct TranslationBlock *tb);
......
290 289
void tlb_fill(target_ulong addr, int is_write, int mmu_idx,
291 290
              void *retaddr);
292 291

  
292
#include "softmmu_defs.h"
293

  
293 294
#define ACCESS_TYPE (NB_MMU_MODES + 1)
294 295
#define MEMSUFFIX _code
295 296
#define env cpu_single_env
b/hw/arm-misc.h
34 34
void arm_load_kernel(CPUState *env, struct arm_boot_info *info);
35 35

  
36 36
/* armv7m_nvic.c */
37

  
38
/* Multiplication factor to convert from system clock ticks to qemu timer
39
   ticks.  */
37 40
int system_clock_scale;
38 41
qemu_irq *armv7m_nvic_init(CPUState *env);
39 42

  
b/hw/armv7m_nvic.c
50 50
#define SYSTICK_CLKSOURCE (1 << 2)
51 51
#define SYSTICK_COUNTFLAG (1 << 16)
52 52

  
53
/* Multiplication factor to convert from system clock ticks to qemu timer
54
   ticks.  */
55
int system_clock_scale;
56

  
57 53
/* Conversion factor from qemu timer to SysTick frequencies.  */
58 54
static inline int64_t systick_scale(nvic_state *s)
59 55
{
b/hw/isa.h
1
#ifndef HW_ISA_H
2
#define HW_ISA_H
1 3
/* ISA bus */
2 4

  
3 5
extern target_phys_addr_t isa_mem_base;
......
22 24
void DMA_register_channel (int nchan,
23 25
                           DMA_transfer_handler transfer_handler,
24 26
                           void *opaque);
27
#endif
b/hw/usb.h
235 235
int set_usb_string(uint8_t *buf, const char *str);
236 236
void usb_send_msg(USBDevice *dev, int msg);
237 237

  
238
void usb_packet_complete(USBPacket *p);
239

  
240 238
/* usb hub */
241 239
USBDevice *usb_hub_init(int nb_ports);
242 240

  
b/linux-user/arm/nwfpe/fpa11_cprt.c
27 27
//#include "fpmodule.h"
28 28
//#include "fpmodule.inl"
29 29

  
30
void SetRoundingMode(const unsigned int opcode);
31

  
32 30
unsigned int PerformFLT(const unsigned int opcode);
33 31
unsigned int PerformFIX(const unsigned int opcode);
34 32

  
b/linux-user/arm/syscall.h
40 40
#else
41 41
#define UNAME_MACHINE "armv5tel"
42 42
#endif
43

  
44
uint32_t do_arm_semihosting(CPUState *);
b/linux-user/m68k/syscall.h
18 18

  
19 19
#define UNAME_MACHINE "m68k"
20 20

  
21
void do_m68k_semihosting(CPUState *, int);
22 21
void do_m68k_simcall(CPUState *, int);
b/linux-user/main.c
477 477

  
478 478
#ifdef TARGET_ARM
479 479

  
480
/* XXX: find a better solution */
481
extern void tb_invalidate_page_range(abi_ulong start, abi_ulong end);
482

  
483 480
static void arm_cache_flush(abi_ulong start, abi_ulong last)
484 481
{
485 482
    abi_ulong addr, last1;
b/linux-user/qemu.h
199 199
void fork_start(void);
200 200
void fork_end(int child);
201 201

  
202
extern int loglevel;
203
extern FILE *logfile;
202
#include "qemu-log.h"
204 203

  
205 204
/* strace.c */
206 205
void print_syscall(int num,
b/linux-user/syscall.c
269 269
extern int flock(int, int);
270 270
extern int setfsuid(int);
271 271
extern int setfsgid(int);
272
extern int setresuid(uid_t, uid_t, uid_t);
273
extern int getresuid(uid_t *, uid_t *, uid_t *);
274
extern int setresgid(gid_t, gid_t, gid_t);
275
extern int getresgid(gid_t *, gid_t *, gid_t *);
276 272
extern int setgroups(int, gid_t *);
277 273

  
278 274
#define ERRNO_TABLE_SIZE 1200
b/monitor.c
2687 2687
        readline_handle_byte(buf[i]);
2688 2688
}
2689 2689

  
2690
static void monitor_start_input(void);
2691

  
2692 2690
static void monitor_handle_command1(void *opaque, const char *cmdline)
2693 2691
{
2694 2692
    monitor_handle_command(cmdline);
b/qemu-log.h
1
#ifndef QEMU_LOG_H
2
#define QEMU_LOG_H
3

  
4
extern FILE *logfile;
5
extern int loglevel;
6

  
7
#endif
b/slirp/debug.c
16 16
#endif
17 17
int slirp_debug = 0;
18 18

  
19
extern char *strerror _P((int));
20

  
21 19
/* Carry over one item from main.c so that the tty's restored.
22 20
 * Only done when the tty being used is /dev/tty --RedWolf */
23 21
#ifndef CONFIG_QEMU
b/slirp/mbuf.c
28 28
 * Find a nice value for msize
29 29
 * XXX if_maxlinkhdr already in mtu
30 30
 */
31
#define MSIZE (IF_MTU + IF_MAXLINKHDR + sizeof(struct m_hdr ) + 6)
31
#define SLIRP_MSIZE (IF_MTU + IF_MAXLINKHDR + sizeof(struct m_hdr ) + 6)
32 32

  
33 33
void
34 34
m_init()
......
54 54
	DEBUG_CALL("m_get");
55 55

  
56 56
	if (m_freelist.m_next == &m_freelist) {
57
		m = (struct mbuf *)malloc(MSIZE);
57
		m = (struct mbuf *)malloc(SLIRP_MSIZE);
58 58
		if (m == NULL) goto end_error;
59 59
		mbuf_alloced++;
60 60
		if (mbuf_alloced > MBUF_THRESH)
......
71 71
	m->m_flags = (flags | M_USEDLIST);
72 72

  
73 73
	/* Initialise it */
74
	m->m_size = MSIZE - sizeof(struct m_hdr);
74
	m->m_size = SLIRP_MSIZE - sizeof(struct m_hdr);
75 75
	m->m_data = m->m_dat;
76 76
	m->m_len = 0;
77 77
	m->m_nextpkt = 0;
b/slirp/misc.h
17 17
};
18 18

  
19 19
extern struct ex_list *exec_list;
20
extern u_int curtime, time_fasttimo, last_slowtimo;
20
extern u_int time_fasttimo, last_slowtimo;
21 21

  
22 22
extern int (*lprint_print) _P((void *, const char *, va_list));
23 23
extern char *lprint_ptr, *lprint_ptr2, **lprint_arg;
b/slirp/slirp_config.h
128 128
#undef HAVE_SYS_STROPTS_H
129 129

  
130 130
/* Define to whatever your compiler thinks inline should be */
131
#define inline inline
131
//#define inline inline
132 132

  
133 133
/* Define to whatever your compiler thinks const should be */
134
#define const const
134
//#define const const
135 135

  
136 136
/* Define if your compiler doesn't like prototypes */
137 137
#undef NO_PROTOTYPES
......
170 170
#undef HAVE_SETENV
171 171

  
172 172
/* Define if you have index() */
173
#undef HAVE_INDEX
173
#define HAVE_INDEX
174 174

  
175 175
/* Define if you have bcmp() */
176 176
#undef HAVE_BCMP
......
182 182
#define HAVE_MEMMOVE
183 183

  
184 184
/* Define if you have gethostid */
185
#undef HAVE_GETHOSTID
185
#define HAVE_GETHOSTID
186 186

  
187 187
/* Define if you DON'T have unix-domain sockets */
188 188
#undef NO_UNIX_SOCKETS
b/slirp/socket.c
8 8
#define WANT_SYS_IOCTL_H
9 9
#include <slirp.h>
10 10
#include "ip_icmp.h"
11
#include "main.h"
12 11
#ifdef __sun__
13 12
#include <sys/filio.h>
14 13
#endif
b/softmmu_defs.h
1
#ifndef SOFTMMU_DEFS_H
2
#define SOFTMMU_DEFS_H
3

  
4
uint8_t REGPARM __ldb_mmu(target_ulong addr, int mmu_idx);
5
void REGPARM __stb_mmu(target_ulong addr, uint8_t val, int mmu_idx);
6
uint16_t REGPARM __ldw_mmu(target_ulong addr, int mmu_idx);
7
void REGPARM __stw_mmu(target_ulong addr, uint16_t val, int mmu_idx);
8
uint32_t REGPARM __ldl_mmu(target_ulong addr, int mmu_idx);
9
void REGPARM __stl_mmu(target_ulong addr, uint32_t val, int mmu_idx);
10
uint64_t REGPARM __ldq_mmu(target_ulong addr, int mmu_idx);
11
void REGPARM __stq_mmu(target_ulong addr, uint64_t val, int mmu_idx);
12

  
13
uint8_t REGPARM __ldb_cmmu(target_ulong addr, int mmu_idx);
14
void REGPARM __stb_cmmu(target_ulong addr, uint8_t val, int mmu_idx);
15
uint16_t REGPARM __ldw_cmmu(target_ulong addr, int mmu_idx);
16
void REGPARM __stw_cmmu(target_ulong addr, uint16_t val, int mmu_idx);
17
uint32_t REGPARM __ldl_cmmu(target_ulong addr, int mmu_idx);
18
void REGPARM __stl_cmmu(target_ulong addr, uint32_t val, int mmu_idx);
19
uint64_t REGPARM __ldq_cmmu(target_ulong addr, int mmu_idx);
20
void REGPARM __stq_cmmu(target_ulong addr, uint64_t val, int mmu_idx);
21

  
22
#endif
b/softmmu_exec.h
9 9
#define ldul_executive  ldl_executive
10 10
#define ldul_supervisor ldl_supervisor
11 11

  
12
#include "softmmu_defs.h"
13

  
12 14
#define ACCESS_TYPE 0
13 15
#define MEMSUFFIX MMU_MODE0_SUFFIX
14 16
#define DATA_SIZE 1
b/softmmu_header.h
70 70
#define ADDR_READ addr_read
71 71
#endif
72 72

  
73
DATA_TYPE REGPARM glue(glue(__ld, SUFFIX), MMUSUFFIX)(target_ulong addr,
74
                                                         int mmu_idx);
75
void REGPARM glue(glue(__st, SUFFIX), MMUSUFFIX)(target_ulong addr, DATA_TYPE v, int mmu_idx);
76

  
77 73
#if (DATA_SIZE <= 4) && (TARGET_LONG_BITS == 32) && defined(__i386__) && \
78 74
    (ACCESS_TYPE < NB_MMU_MODES) && defined(ASM_SOFTMMU)
79 75

  
b/target-alpha/exec.h
74 74

  
75 75
int cpu_alpha_handle_mmu_fault (CPUState *env, uint64_t address, int rw,
76 76
                                int mmu_idx, int is_softmmu);
77
int cpu_alpha_mfpr (CPUState *env, int iprn, uint64_t *valp);
78
int cpu_alpha_mtpr (CPUState *env, int iprn, uint64_t val, uint64_t *oldvalp);
79 77

  
80 78
void do_interrupt (CPUState *env);
81 79

  
b/target-arm/exec.h
61 61
void cpu_loop_exit(void);
62 62

  
63 63
void raise_exception(int);
64

  
65
uint32_t helper_neon_mul_p8(uint32_t op1, uint32_t op2);
b/target-arm/translate.c
29 29
#include "exec-all.h"
30 30
#include "disas.h"
31 31
#include "tcg-op.h"
32
#include "qemu-log.h"
32 33

  
33 34
#define GEN_HELPER 1
34 35
#include "helpers.h"
......
72 73
#define DISAS_WFI 4
73 74
#define DISAS_SWI 5
74 75

  
75
/* XXX: move that elsewhere */
76
extern FILE *logfile;
77
extern int loglevel;
78

  
79 76
static TCGv cpu_env;
80 77
/* We reuse the same 64-bit temporaries for efficiency.  */
81 78
static TCGv cpu_V0, cpu_V1, cpu_M0;
b/target-cris/exec.h
46 46

  
47 47
int cpu_cris_handle_mmu_fault (CPUState *env, target_ulong address, int rw,
48 48
                              int mmu_idx, int is_softmmu);
49
void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr);
50 49

  
51 50
#if !defined(CONFIG_USER_ONLY)
52 51
#include "softmmu_exec.h"
b/target-i386/exec.h
31 31

  
32 32
register struct CPUX86State *env asm(AREG0);
33 33

  
34
extern FILE *logfile;
35
extern int loglevel;
34
#include "qemu-log.h"
36 35

  
37 36
#define EAX (env->regs[R_EAX])
38 37
#define ECX (env->regs[R_ECX])
......
58 57
#include "cpu.h"
59 58
#include "exec-all.h"
60 59

  
61
void cpu_x86_update_cr0(CPUX86State *env, uint32_t new_cr0);
62 60
void cpu_x86_update_cr3(CPUX86State *env, target_ulong new_cr3);
63 61
void cpu_x86_update_cr4(CPUX86State *env, uint32_t new_cr4);
64 62
int cpu_x86_handle_mmu_fault(CPUX86State *env, target_ulong addr,
65 63
                             int is_write, int mmu_idx, int is_softmmu);
66
void tlb_fill(target_ulong addr, int is_write, int mmu_idx,
67
              void *retaddr);
68 64
void __hidden cpu_lock(void);
69 65
void __hidden cpu_unlock(void);
70 66
void do_interrupt(int intno, int is_int, int error_code,
......
120 116
#define floatx_round_to_int floatx80_round_to_int
121 117
#define floatx_compare floatx80_compare
122 118
#define floatx_compare_quiet floatx80_compare_quiet
123
#define sin sinl
124
#define cos cosl
125
#define sqrt sqrtl
126
#define pow powl
127
#define log logl
128
#define tan tanl
129
#define atan2 atan2l
130
#define floor floorl
131
#define ceil ceill
132
#define ldexp ldexpl
133 119
#else
134 120
#define floatx_to_int32 float64_to_int32
135 121
#define floatx_to_int64 float64_to_int64
......
148 134
#define floatx_compare_quiet float64_compare_quiet
149 135
#endif
150 136

  
151
extern CPU86_LDouble sin(CPU86_LDouble x);
152
extern CPU86_LDouble cos(CPU86_LDouble x);
153
extern CPU86_LDouble sqrt(CPU86_LDouble x);
154
extern CPU86_LDouble pow(CPU86_LDouble, CPU86_LDouble);
155
extern CPU86_LDouble log(CPU86_LDouble x);
156
extern CPU86_LDouble tan(CPU86_LDouble x);
157
extern CPU86_LDouble atan2(CPU86_LDouble, CPU86_LDouble);
158
extern CPU86_LDouble floor(CPU86_LDouble x);
159
extern CPU86_LDouble ceil(CPU86_LDouble x);
160

  
161 137
#define RC_MASK         0xc00
162 138
#define RC_NEAR		0x000
163 139
#define RC_DOWN		0x400
b/target-i386/helper.h
186 186
DEF_HELPER(void, helper_fscale, (void))
187 187
DEF_HELPER(void, helper_fsin, (void))
188 188
DEF_HELPER(void, helper_fcos, (void))
189
DEF_HELPER(void, helper_fxam_ST0, (void))
190 189
DEF_HELPER(void, helper_fstenv, (target_ulong ptr, int data32))
191 190
DEF_HELPER(void, helper_fldenv, (target_ulong ptr, int data32))
192 191
DEF_HELPER(void, helper_fsave, (target_ulong ptr, int data32))
b/target-m68k/exec.h
44 44
#include "softmmu_exec.h"
45 45
#endif
46 46

  
47
void cpu_m68k_flush_flags(CPUM68KState *env, int cc_op);
48

  
49 47
void cpu_loop_exit(void);
50 48

  
51 49
static inline int cpu_halted(CPUState *env) {
b/target-m68k/translate.c
30 30
#include "exec-all.h"
31 31
#include "disas.h"
32 32
#include "tcg-op.h"
33
#include "qemu-log.h"
33 34

  
34 35
#define GEN_HELPER 1
35 36
#include "helpers.h"
......
157 158
static void *gen_throws_exception;
158 159
#define gen_last_qop NULL
159 160

  
160
extern FILE *logfile;
161
extern int loglevel;
162

  
163 161
#define OS_BYTE 0
164 162
#define OS_WORD 1
165 163
#define OS_LONG 2
b/target-mips/exec.h
33 33
void do_raise_exception_err (uint32_t exception, int error_code);
34 34
void do_raise_exception (uint32_t exception);
35 35

  
36
void cpu_dump_state(CPUState *env, FILE *f,
37
                    int (*cpu_fprintf)(FILE *f, const char *fmt, ...),
38
                    int flags);
39 36
void cpu_mips_irqctrl_init (void);
40 37
uint32_t cpu_mips_get_random (CPUState *env);
41 38
uint32_t cpu_mips_get_count (CPUState *env);
b/target-ppc/translate_init.c
8941 8941
#include <stdlib.h>
8942 8942
#include <string.h>
8943 8943

  
8944
int fflush (FILE *stream);
8945

  
8946 8944
/* Opcode types */
8947 8945
enum {
8948 8946
    PPC_DIRECT   = 0, /* Opcode routine        */
b/tcg/arm/tcg-target.c
808 808
}
809 809

  
810 810
#ifdef CONFIG_SOFTMMU
811
extern void __ldb_mmu(void);
812
extern void __ldw_mmu(void);
813
extern void __ldl_mmu(void);
814
extern void __ldq_mmu(void);
815

  
816
extern void __stb_mmu(void);
817
extern void __stw_mmu(void);
818
extern void __stl_mmu(void);
819
extern void __stq_mmu(void);
811

  
812
#include "../../softmmu_defs.h"
820 813

  
821 814
static void *qemu_ld_helpers[4] = {
822 815
    __ldb_mmu,
b/tcg/hppa/tcg-target.c
345 345
}
346 346

  
347 347
#if defined(CONFIG_SOFTMMU)
348
extern void __ldb_mmu(void);
349
extern void __ldw_mmu(void);
350
extern void __ldl_mmu(void);
351
extern void __ldq_mmu(void);
352

  
353
extern void __stb_mmu(void);
354
extern void __stw_mmu(void);
355
extern void __stl_mmu(void);
356
extern void __stq_mmu(void);
348

  
349
#include "../../softmmu_defs.h"
357 350

  
358 351
static void *qemu_ld_helpers[4] = {
359 352
    __ldb_mmu,
b/tcg/i386/tcg-target.c
404 404
}
405 405

  
406 406
#if defined(CONFIG_SOFTMMU)
407
extern void __ldb_mmu(void);
408
extern void __ldw_mmu(void);
409
extern void __ldl_mmu(void);
410
extern void __ldq_mmu(void);
411

  
412
extern void __stb_mmu(void);
413
extern void __stw_mmu(void);
414
extern void __stl_mmu(void);
415
extern void __stq_mmu(void);
407

  
408
#include "../../softmmu_defs.h"
416 409

  
417 410
static void *qemu_ld_helpers[4] = {
418 411
    __ldb_mmu,
b/tcg/ppc/tcg-target.c
454 454
}
455 455

  
456 456
#if defined(CONFIG_SOFTMMU)
457
extern void __ldb_mmu(void);
458
extern void __ldw_mmu(void);
459
extern void __ldl_mmu(void);
460
extern void __ldq_mmu(void);
461

  
462
extern void __stb_mmu(void);
463
extern void __stw_mmu(void);
464
extern void __stl_mmu(void);
465
extern void __stq_mmu(void);
457

  
458
#include "../../softmmu_defs.h"
466 459

  
467 460
static void *qemu_ld_helpers[4] = {
468 461
    __ldb_mmu,
b/tcg/ppc64/tcg-target.c
509 509
}
510 510

  
511 511
#if defined (CONFIG_SOFTMMU)
512
extern void __ldb_mmu(void);
513
extern void __ldw_mmu(void);
514
extern void __ldl_mmu(void);
515
extern void __ldq_mmu(void);
516

  
517
extern void __stb_mmu(void);
518
extern void __stw_mmu(void);
519
extern void __stl_mmu(void);
520
extern void __stq_mmu(void);
512

  
513
#include "../../softmmu_defs.h"
521 514

  
522 515
static void *qemu_ld_helpers[4] = {
523 516
    __ldb_mmu,
b/tcg/sparc/tcg-target.c
472 472
}
473 473

  
474 474
#if defined(CONFIG_SOFTMMU)
475
extern void __ldb_mmu(void);
476
extern void __ldw_mmu(void);
477
extern void __ldl_mmu(void);
478
extern void __ldq_mmu(void);
479

  
480
extern void __stb_mmu(void);
481
extern void __stw_mmu(void);
482
extern void __stl_mmu(void);
483
extern void __stq_mmu(void);
484 475

  
476
#include "../../softmmu_defs.h"
485 477

  
486 478
static const void * const qemu_ld_helpers[4] = {
487 479
    __ldb_mmu,
b/tcg/x86_64/tcg-target.c
467 467
}
468 468

  
469 469
#if defined(CONFIG_SOFTMMU)
470
extern void __ldb_mmu(void);
471
extern void __ldw_mmu(void);
472
extern void __ldl_mmu(void);
473
extern void __ldq_mmu(void);
474

  
475
extern void __stb_mmu(void);
476
extern void __stw_mmu(void);
477
extern void __stl_mmu(void);
478
extern void __stq_mmu(void);
479 470

  
471
#include "../../softmmu_defs.h"
480 472

  
481 473
static void *qemu_ld_helpers[4] = {
482 474
    __ldb_mmu,

Also available in: Unified diff