OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/m68k: Use env_cpu 

Cleanup in the boilerplate that each target must define.
The combination CPU(m68k_env_get_cpu) should have used
ENV_GET_CPU to begin; use env_cpu now.

Acked-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2019-03-22 18:23:25 -07:00
parent 6dd40a906d
commit a8d92fd869
8 changed files with 24 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
linux-user/m68k-sim.c
View File

@ -91,7 +91,6 @@ static int translate_openflags(int flags)
#define ARG(x) tswap32(args[x]) #define ARG(x) tswap32(args[x])
void do_m68k_simcall(CPUM68KState *env, int nr) void do_m68k_simcall(CPUM68KState *env, int nr)
{ {
M68kCPU *cpu = m68k_env_get_cpu(env);
uint32_t *args; uint32_t *args;
args = (uint32_t *)(unsigned long)(env->aregs[7] + 4); args = (uint32_t *)(unsigned long)(env->aregs[7] + 4);
@ -159,6 +158,6 @@ void do_m68k_simcall(CPUM68KState *env, int nr)
check_err(env, lseek(ARG(0), (int32_t)ARG(1), ARG(2))); check_err(env, lseek(ARG(0), (int32_t)ARG(1), ARG(2)));
break; break;
default: default:
cpu_abort(CPU(cpu), "Unsupported m68k sim syscall %d\n", nr); cpu_abort(env_cpu(env), "Unsupported m68k sim syscall %d\n", nr);
} }
} }

2
linux-user/m68k/cpu_loop.c
View File

@ -23,7 +23,7 @@
void cpu_loop(CPUM68KState *env) void cpu_loop(CPUM68KState *env)
{ {
CPUState *cs = CPU(m68k_env_get_cpu(env)); CPUState *cs = env_cpu(env);
int trapnr; int trapnr;
unsigned int n; unsigned int n;
target_siginfo_t info; target_siginfo_t info;

2
linux-user/m68k/target_cpu.h
View File

@ -31,7 +31,7 @@ static inline void cpu_clone_regs(CPUM68KState *env, target_ulong newsp)
static inline void cpu_set_tls(CPUM68KState *env, target_ulong newtls) static inline void cpu_set_tls(CPUM68KState *env, target_ulong newtls)
{ {
CPUState *cs = CPU(m68k_env_get_cpu(env)); CPUState *cs = env_cpu(env);
TaskState *ts = cs->opaque; TaskState *ts = cs->opaque;
ts->tp_value = newtls; ts->tp_value = newtls;

5
target/m68k/cpu.h
View File

@ -163,11 +163,6 @@ struct M68kCPU {
CPUM68KState env; CPUM68KState env;
}; };
static inline M68kCPU *m68k_env_get_cpu(CPUM68KState *env)
{
return container_of(env, M68kCPU, env);
}
#define ENV_OFFSET offsetof(M68kCPU, env) #define ENV_OFFSET offsetof(M68kCPU, env)
void m68k_cpu_do_interrupt(CPUState *cpu); void m68k_cpu_do_interrupt(CPUState *cpu);

33
target/m68k/helper.c
View File

@ -168,8 +168,6 @@ void m68k_cpu_init_gdb(M68kCPU *cpu)
void HELPER(cf_movec_to)(CPUM68KState *env, uint32_t reg, uint32_t val) void HELPER(cf_movec_to)(CPUM68KState *env, uint32_t reg, uint32_t val)
{ {
M68kCPU *cpu = m68k_env_get_cpu(env);
switch (reg) { switch (reg) {
case M68K_CR_CACR: case M68K_CR_CACR:
env->cacr = val; env->cacr = val;
@ -186,7 +184,7 @@ void HELPER(cf_movec_to)(CPUM68KState *env, uint32_t reg, uint32_t val)
break; break;
/* TODO: Implement control registers. */ /* TODO: Implement control registers. */
default: default:
cpu_abort(CPU(cpu), cpu_abort(env_cpu(env),
"Unimplemented control register write 0x%x = 0x%x\n", "Unimplemented control register write 0x%x = 0x%x\n",
reg, val); reg, val);
} }
@ -194,8 +192,6 @@ void HELPER(cf_movec_to)(CPUM68KState *env, uint32_t reg, uint32_t val)
void HELPER(m68k_movec_to)(CPUM68KState *env, uint32_t reg, uint32_t val) void HELPER(m68k_movec_to)(CPUM68KState *env, uint32_t reg, uint32_t val)
{ {
M68kCPU *cpu = m68k_env_get_cpu(env);
switch (reg) { switch (reg) {
/* MC680[1234]0 */ /* MC680[1234]0 */
case M68K_CR_SFC: case M68K_CR_SFC:
@ -248,14 +244,13 @@ void HELPER(m68k_movec_to)(CPUM68KState *env, uint32_t reg, uint32_t val)
env->mmu.ttr[M68K_DTTR1] = val; env->mmu.ttr[M68K_DTTR1] = val;
return; return;
} }
cpu_abort(CPU(cpu), "Unimplemented control register write 0x%x = 0x%x\n", cpu_abort(env_cpu(env),
"Unimplemented control register write 0x%x = 0x%x\n",
reg, val); reg, val);
} }
uint32_t HELPER(m68k_movec_from)(CPUM68KState *env, uint32_t reg) uint32_t HELPER(m68k_movec_from)(CPUM68KState *env, uint32_t reg)
{ {
M68kCPU *cpu = m68k_env_get_cpu(env);
switch (reg) { switch (reg) {
/* MC680[1234]0 */ /* MC680[1234]0 */
case M68K_CR_SFC: case M68K_CR_SFC:
@ -292,7 +287,7 @@ uint32_t HELPER(m68k_movec_from)(CPUM68KState *env, uint32_t reg)
case M68K_CR_DTT1: case M68K_CR_DTT1:
return env->mmu.ttr[M68K_DTTR1]; return env->mmu.ttr[M68K_DTTR1];
} }
cpu_abort(CPU(cpu), "Unimplemented control register read 0x%x\n", cpu_abort(env_cpu(env), "Unimplemented control register read 0x%x\n",
reg); reg);
} }
@ -388,8 +383,7 @@ static void dump_address_map(CPUM68KState *env, uint32_t root_pointer)
uint32_t last_logical, last_physical; uint32_t last_logical, last_physical;
int32_t size; int32_t size;
int last_attr = -1, attr = -1; int last_attr = -1, attr = -1;
M68kCPU *cpu = m68k_env_get_cpu(env); CPUState *cs = env_cpu(env);
CPUState *cs = CPU(cpu);
MemTxResult txres; MemTxResult txres;
if (env->mmu.tcr & M68K_TCR_PAGE_8K) { if (env->mmu.tcr & M68K_TCR_PAGE_8K) {
@ -630,8 +624,7 @@ static int get_physical_address(CPUM68KState *env, hwaddr *physical,
int *prot, target_ulong address, int *prot, target_ulong address,
int access_type, target_ulong *page_size) int access_type, target_ulong *page_size)
{ {
M68kCPU *cpu = m68k_env_get_cpu(env); CPUState *cs = env_cpu(env);
CPUState *cs = CPU(cpu);
uint32_t entry; uint32_t entry;
uint32_t next; uint32_t next;
target_ulong page_mask; target_ulong page_mask;
@ -1175,7 +1168,7 @@ void HELPER(mac_set_flags)(CPUM68KState *env, uint32_t acc)
z = n; \ z = n; \
break; \ break; \
default: \ default: \
cpu_abort(CPU(m68k_env_get_cpu(env)), "Bad CC_OP %d", op); \ cpu_abort(env_cpu(env), "Bad CC_OP %d", op); \
} \ } \
} while (0) } while (0)
@ -1358,8 +1351,6 @@ void HELPER(set_mac_extu)(CPUM68KState *env, uint32_t val, uint32_t acc)
#if defined(CONFIG_SOFTMMU) #if defined(CONFIG_SOFTMMU)
void HELPER(ptest)(CPUM68KState *env, uint32_t addr, uint32_t is_read) void HELPER(ptest)(CPUM68KState *env, uint32_t addr, uint32_t is_read)
{ {
M68kCPU *cpu = m68k_env_get_cpu(env);
CPUState *cs = CPU(cpu);
hwaddr physical; hwaddr physical;
int access_type; int access_type;
int prot; int prot;
@ -1384,7 +1375,7 @@ void HELPER(ptest)(CPUM68KState *env, uint32_t addr, uint32_t is_read)
if (ret == 0) { if (ret == 0) {
addr &= TARGET_PAGE_MASK; addr &= TARGET_PAGE_MASK;
physical += addr & (page_size - 1); physical += addr & (page_size - 1);
tlb_set_page(cs, addr, physical, tlb_set_page(env_cpu(env), addr, physical,
prot, access_type & ACCESS_SUPER ? prot, access_type & ACCESS_SUPER ?
MMU_KERNEL_IDX : MMU_USER_IDX, page_size); MMU_KERNEL_IDX : MMU_USER_IDX, page_size);
} }
@ -1392,18 +1383,18 @@ void HELPER(ptest)(CPUM68KState *env, uint32_t addr, uint32_t is_read)
void HELPER(pflush)(CPUM68KState *env, uint32_t addr, uint32_t opmode) void HELPER(pflush)(CPUM68KState *env, uint32_t addr, uint32_t opmode)
{ {
M68kCPU *cpu = m68k_env_get_cpu(env); CPUState *cs = env_cpu(env);
switch (opmode) { switch (opmode) {
case 0: /* Flush page entry if not global */ case 0: /* Flush page entry if not global */
case 1: /* Flush page entry */ case 1: /* Flush page entry */
tlb_flush_page(CPU(cpu), addr); tlb_flush_page(cs, addr);
break; break;
case 2: /* Flush all except global entries */ case 2: /* Flush all except global entries */
tlb_flush(CPU(cpu)); tlb_flush(cs);
break; break;
case 3: /* Flush all entries */ case 3: /* Flush all entries */
tlb_flush(CPU(cpu)); tlb_flush(cs);
break; break;
} }
} }

4
target/m68k/m68k-semi.c
View File

@ -421,7 +421,7 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
case HOSTED_INIT_SIM: case HOSTED_INIT_SIM:
#if defined(CONFIG_USER_ONLY) #if defined(CONFIG_USER_ONLY)
{ {
CPUState *cs = CPU(m68k_env_get_cpu(env)); CPUState *cs = env_cpu(env);
TaskState *ts = cs->opaque; TaskState *ts = cs->opaque;
/* Allocate the heap using sbrk. */ /* Allocate the heap using sbrk. */
if (!ts->heap_limit) { if (!ts->heap_limit) {
@ -454,7 +454,7 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
#endif #endif
return; return;
default: default:
cpu_abort(CPU(m68k_env_get_cpu(env)), "Unsupported semihosting syscall %d\n", nr); cpu_abort(env_cpu(env), "Unsupported semihosting syscall %d\n", nr);
result = 0; result = 0;
} }
failed: failed:

12
target/m68k/op_helper.c
View File

@ -196,7 +196,7 @@ static const char *m68k_exception_name(int index)
static void cf_interrupt_all(CPUM68KState *env, int is_hw) static void cf_interrupt_all(CPUM68KState *env, int is_hw)
{ {
CPUState *cs = CPU(m68k_env_get_cpu(env)); CPUState *cs = env_cpu(env);
uint32_t sp; uint32_t sp;
uint32_t sr; uint32_t sr;
uint32_t fmt; uint32_t fmt;
@ -274,7 +274,7 @@ static inline void do_stack_frame(CPUM68KState *env, uint32_t *sp,
{ {
if (m68k_feature(env, M68K_FEATURE_QUAD_MULDIV)) { if (m68k_feature(env, M68K_FEATURE_QUAD_MULDIV)) {
/* all except 68000 */ /* all except 68000 */
CPUState *cs = CPU(m68k_env_get_cpu(env)); CPUState *cs = env_cpu(env);
switch (format) { switch (format) {
case 4: case 4:
*sp -= 4; *sp -= 4;
@ -299,7 +299,7 @@ static inline void do_stack_frame(CPUM68KState *env, uint32_t *sp,
static void m68k_interrupt_all(CPUM68KState *env, int is_hw) static void m68k_interrupt_all(CPUM68KState *env, int is_hw)
{ {
CPUState *cs = CPU(m68k_env_get_cpu(env)); CPUState *cs = env_cpu(env);
uint32_t sp; uint32_t sp;
uint32_t retaddr; uint32_t retaddr;
uint32_t vector; uint32_t vector;
@ -507,7 +507,7 @@ bool m68k_cpu_exec_interrupt(CPUState *cs, int interrupt_request)
static void raise_exception_ra(CPUM68KState *env, int tt, uintptr_t raddr) static void raise_exception_ra(CPUM68KState *env, int tt, uintptr_t raddr)
{ {
CPUState *cs = CPU(m68k_env_get_cpu(env)); CPUState *cs = env_cpu(env);
cs->exception_index = tt; cs->exception_index = tt;
cpu_loop_exit_restore(cs, raddr); cpu_loop_exit_restore(cs, raddr);
@ -1037,7 +1037,7 @@ void HELPER(chk)(CPUM68KState *env, int32_t val, int32_t ub)
env->cc_c = 0 <= ub ? val < 0 || val > ub : val > ub && val < 0; env->cc_c = 0 <= ub ? val < 0 || val > ub : val > ub && val < 0;
if (val < 0 || val > ub) { if (val < 0 || val > ub) {
CPUState *cs = CPU(m68k_env_get_cpu(env)); CPUState *cs = env_cpu(env);
/* Recover PC and CC_OP for the beginning of the insn. */ /* Recover PC and CC_OP for the beginning of the insn. */
cpu_restore_state(cs, GETPC(), true); cpu_restore_state(cs, GETPC(), true);
@ -1068,7 +1068,7 @@ void HELPER(chk2)(CPUM68KState *env, int32_t val, int32_t lb, int32_t ub)
env->cc_c = lb <= ub ? val < lb || val > ub : val > ub && val < lb; env->cc_c = lb <= ub ? val < lb || val > ub : val > ub && val < lb;
if (env->cc_c) { if (env->cc_c) {
CPUState *cs = CPU(m68k_env_get_cpu(env)); CPUState *cs = env_cpu(env);
/* Recover PC and CC_OP for the beginning of the insn. */ /* Recover PC and CC_OP for the beginning of the insn. */
cpu_restore_state(cs, GETPC(), true); cpu_restore_state(cs, GETPC(), true);

4
target/m68k/translate.c
View File

@ -4777,14 +4777,12 @@ DISAS_INSN(wddata)
DISAS_INSN(wdebug) DISAS_INSN(wdebug)
{ {
M68kCPU *cpu = m68k_env_get_cpu(env);
if (IS_USER(s)) { if (IS_USER(s)) {
gen_exception(s, s->base.pc_next, EXCP_PRIVILEGE); gen_exception(s, s->base.pc_next, EXCP_PRIVILEGE);
return; return;
} }
/* TODO: Implement wdebug. */ /* TODO: Implement wdebug. */
cpu_abort(CPU(cpu), "WDEBUG not implemented"); cpu_abort(env_cpu(env), "WDEBUG not implemented");
} }
#endif #endif