yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-09-26 18:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/m68k: Use env_cpu

Browse source 
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.

Backports commit a8d92fd869c601f723b82d9736a2d78ae640b8a2 from qemu
This commit is contained in:
Richard Henderson 2019-06-12 11:51:19 -04:00 committed by Lioncash
parent 187778c781
commit 585ba97389
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
3 changed files with 16 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
qemu/target/m68k/cpu.h
View file

@ -167,11 +167,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);

26
qemu/target/m68k/helper.c
View file

@ -55,8 +55,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:
@ -109,14 +107,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:
@ -153,7 +150,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);
} }
@ -268,8 +265,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;
@ -813,7 +809,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)
@ -996,8 +992,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;
@ -1022,7 +1016,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);
} }
@ -1030,18 +1024,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;
} }
} }

12
qemu/target/m68k/op_helper.c
View file

@ -199,7 +199,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;
@ -267,7 +267,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;
@ -292,7 +292,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;
@ -514,7 +514,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);
@ -1046,7 +1046,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);
@ -1077,7 +1077,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);