From 0eaef5aa01a8e27b57a46217a0b65cc1d30a5d41 Mon Sep 17 00:00:00 2001 From: ths Date: Wed, 23 Jul 2008 16:14:22 +0000 Subject: Less hardcoding of TARGET_USER_ONLY. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4928 c046a42c-6fe2-441c-8c8c-71466251a162 --- target-mips/cpu.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'target-mips/cpu.h') diff --git a/target-mips/cpu.h b/target-mips/cpu.h index 3ec867a722..8918a868e2 100644 --- a/target-mips/cpu.h +++ b/target-mips/cpu.h @@ -445,17 +445,12 @@ struct CPUMIPSState { uint32_t CP0_TCStatus_rw_bitmask; /* Read/write bits in CP0_TCStatus */ int insn_flags; /* Supported instruction set */ -#ifdef CONFIG_USER_ONLY - target_ulong tls_value; -#endif + target_ulong tls_value; /* For usermode emulation */ CPU_COMMON const mips_def_t *cpu_model; -#ifndef CONFIG_USER_ONLY void *irq[8]; -#endif - struct QEMUTimer *timer; /* Internal timer */ }; @@ -494,7 +489,6 @@ static inline int cpu_mmu_index (CPUState *env) return env->hflags & MIPS_HFLAG_KSU; } -#if defined(CONFIG_USER_ONLY) static inline void cpu_clone_regs(CPUState *env, target_ulong newsp) { if (newsp) @@ -502,7 +496,6 @@ static inline void cpu_clone_regs(CPUState *env, target_ulong newsp) env->active_tc.gpr[7] = 0; env->active_tc.gpr[2] = 0; } -#endif #include "cpu-all.h" -- cgit 1.4.1