@@ -863,9 +863,7 @@ void cpu_x86_update_cr4(CPUX86State *env, uint32_t new_cr4);
void cpu_set_apic_base(CPUX86State *env, uint64_t val);
uint64_t cpu_get_apic_base(CPUX86State *env);
void cpu_set_apic_tpr(CPUX86State *env, uint8_t val);
-#ifndef NO_CPU_IO_DEFS
uint8_t cpu_get_apic_tpr(CPUX86State *env);
-#endif
/* hw/pc.c */
void cpu_smm_update(CPUX86State *env);
@@ -763,7 +763,6 @@ const ppc_def_t *cpu_ppc_find_by_name (const char *name);
int cpu_ppc_register_internal (CPUPPCState *env, const ppc_def_t *def);
/* Time-base and decrementer management */
-#ifndef NO_CPU_IO_DEFS
uint64_t cpu_ppc_load_tbl (CPUPPCState *env);
uint32_t cpu_ppc_load_tbu (CPUPPCState *env);
void cpu_ppc_store_tbu (CPUPPCState *env, uint32_t value);
@@ -797,7 +796,6 @@ void ppc_slb_invalidate_one (CPUPPCState *env, uint64_t T0);
#endif
int ppcemb_tlb_search (CPUPPCState *env, target_ulong address, uint32_t pid);
#endif
-#endif
static inline uint64_t ppc_dump_gpr(CPUPPCState *env, int gprn)
{
@@ -434,7 +434,6 @@ typedef struct CPUSPARCState {
sparc_def_t *def;
} CPUSPARCState;
-#ifndef NO_CPU_IO_DEFS
/* helper.c */
CPUSPARCState *cpu_sparc_init(const char *cpu_model);
void cpu_sparc_set_id(CPUSPARCState *env, unsigned int cpu);
@@ -487,7 +486,6 @@ static inline int tlb_compare_context(const
SparcTLBEntry *tlb,
}
#endif
-#endif
/* cpu-exec.c */
#if !defined(CONFIG_USER_ONLY)
@@ -52,7 +52,6 @@
/* Note: the long term plan is to reduce the dependancies on the QEMU
CPU definitions. Currently they are used for qemu_ld/st
instructions */
-#define NO_CPU_IO_DEFS
#include "cpu.h"
#include "exec-all.h"
@@ -24,7 +24,6 @@
#include "config.h"
-#define NO_CPU_IO_DEFS
#include "cpu.h"
#include "exec-all.h"
#include "disas.h"
Signed-off-by: Blue Swirl <blauwirbel@gmail.com> --- target-i386/cpu.h | 2 -- target-ppc/cpu.h | 2 -- target-sparc/cpu.h | 2 -- tcg/tcg.c | 1 - translate-all.c | 1 - 5 files changed, 0 insertions(+), 8 deletions(-)