haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

softmmu_header: pass CPUState to tlb_fill

Browse source 
Pass CPUState pointer to tlb_fill() instead of architecture local
cpu_single_env hacks.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl 2011-07-04 20:57:05 +00:00
parent efbf29b681
commit bccd9ec5f0
15 changed files with 43 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
exec-all.h
View file

@ -273,7 +273,7 @@ extern CPUWriteMemoryFunc *io_mem_write[IO_MEM_NB_ENTRIES][4];
extern CPUReadMemoryFunc *io_mem_read[IO_MEM_NB_ENTRIES][4]; extern CPUReadMemoryFunc *io_mem_read[IO_MEM_NB_ENTRIES][4];
extern void *io_mem_opaque[IO_MEM_NB_ENTRIES]; extern void *io_mem_opaque[IO_MEM_NB_ENTRIES];
void tlb_fill(target_ulong addr, int is_write, int mmu_idx, void tlb_fill(CPUState *env1, target_ulong addr, int is_write, int mmu_idx,
void *retaddr); void *retaddr);
#include "softmmu_defs.h" #include "softmmu_defs.h"

8
softmmu_template.h
View file

@ -136,7 +136,7 @@ DATA_TYPE REGPARM glue(glue(__ld, SUFFIX), MMUSUFFIX)(target_ulong addr,
if ((addr & (DATA_SIZE - 1)) != 0) if ((addr & (DATA_SIZE - 1)) != 0)
do_unaligned_access(addr, READ_ACCESS_TYPE, mmu_idx, retaddr); do_unaligned_access(addr, READ_ACCESS_TYPE, mmu_idx, retaddr);
#endif #endif
tlb_fill(addr, READ_ACCESS_TYPE, mmu_idx, retaddr); tlb_fill(env, addr, READ_ACCESS_TYPE, mmu_idx, retaddr);
goto redo; goto redo;
} }
return res; return res;
@ -186,7 +186,7 @@ static DATA_TYPE glue(glue(slow_ld, SUFFIX), MMUSUFFIX)(target_ulong addr,
} }
} else { } else {
/* the page is not in the TLB : fill it */ /* the page is not in the TLB : fill it */
tlb_fill(addr, READ_ACCESS_TYPE, mmu_idx, retaddr); tlb_fill(env, addr, READ_ACCESS_TYPE, mmu_idx, retaddr);
goto redo; goto redo;
} }
return res; return res;
@ -274,7 +274,7 @@ void REGPARM glue(glue(__st, SUFFIX), MMUSUFFIX)(target_ulong addr,
if ((addr & (DATA_SIZE - 1)) != 0) if ((addr & (DATA_SIZE - 1)) != 0)
do_unaligned_access(addr, 1, mmu_idx, retaddr); do_unaligned_access(addr, 1, mmu_idx, retaddr);
#endif #endif
tlb_fill(addr, 1, mmu_idx, retaddr); tlb_fill(env, addr, 1, mmu_idx, retaddr);
goto redo; goto redo;
} }
} }
@ -321,7 +321,7 @@ static void glue(glue(slow_st, SUFFIX), MMUSUFFIX)(target_ulong addr,
} }
} else { } else {
/* the page is not in the TLB : fill it */ /* the page is not in the TLB : fill it */
tlb_fill(addr, 1, mmu_idx, retaddr); tlb_fill(env, addr, 1, mmu_idx, retaddr);
goto redo; goto redo;
} }
} }

7
target-alpha/op_helper.c
View file

@ -1335,15 +1335,14 @@ void QEMU_NORETURN cpu_unassigned_access(CPUState *env1,
NULL, it means that the function was called in C code (i.e. not NULL, it means that the function was called in C code (i.e. not
from generated code or from helper.c) */ from generated code or from helper.c) */
/* XXX: fix it to restore all registers */ /* XXX: fix it to restore all registers */
void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) void tlb_fill(CPUState *env1, target_ulong addr, int is_write, int mmu_idx,
void *retaddr)
{ {
CPUState *saved_env; CPUState *saved_env;
int ret; int ret;
/* XXX: hack to restore env in all cases, even if not called from
generated code */
saved_env = env; saved_env = env;
env = cpu_single_env; env = env1;
ret = cpu_alpha_handle_mmu_fault(env, addr, is_write, mmu_idx); ret = cpu_alpha_handle_mmu_fault(env, addr, is_write, mmu_idx);
if (unlikely(ret != 0)) { if (unlikely(ret != 0)) {
do_restore_state(retaddr); do_restore_state(retaddr);

6
target-arm/op_helper.c
View file

@ -75,17 +75,15 @@ uint32_t HELPER(neon_tbl)(uint32_t ireg, uint32_t def,
NULL, it means that the function was called in C code (i.e. not NULL, it means that the function was called in C code (i.e. not
from generated code or from helper.c) */ from generated code or from helper.c) */
/* XXX: fix it to restore all registers */ /* XXX: fix it to restore all registers */
void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) void tlb_fill(CPUState *env1, target_ulong addr, int is_write, int mmu_idx,
void *retaddr)
{ {
TranslationBlock *tb; TranslationBlock *tb;
CPUState *saved_env; CPUState *saved_env;
unsigned long pc; unsigned long pc;
int ret; int ret;
/* XXX: hack to restore env in all cases, even if not called from
generated code */
saved_env = env; saved_env = env;
env = cpu_single_env;
ret = cpu_arm_handle_mmu_fault(env, addr, is_write, mmu_idx); ret = cpu_arm_handle_mmu_fault(env, addr, is_write, mmu_idx);
if (unlikely(ret)) { if (unlikely(ret)) {
if (retaddr) { if (retaddr) {

7
target-cris/op_helper.c
View file

@ -56,17 +56,16 @@
NULL, it means that the function was called in C code (i.e. not NULL, it means that the function was called in C code (i.e. not
from generated code or from helper.c) */ from generated code or from helper.c) */
/* XXX: fix it to restore all registers */ /* XXX: fix it to restore all registers */
void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) void tlb_fill(CPUState *env1, target_ulong addr, int is_write, int mmu_idx,
void *retaddr)
{ {
TranslationBlock *tb; TranslationBlock *tb;
CPUState *saved_env; CPUState *saved_env;
unsigned long pc; unsigned long pc;
int ret; int ret;
/* XXX: hack to restore env in all cases, even if not called from
generated code */
saved_env = env; saved_env = env;
env = cpu_single_env; env = env1;
D_LOG("%s pc=%x tpc=%x ra=%x\n", __func__, D_LOG("%s pc=%x tpc=%x ra=%x\n", __func__,
env->pc, env->debug1, retaddr); env->pc, env->debug1, retaddr);

7
target-i386/op_helper.c
View file

@ -4997,17 +4997,16 @@ void helper_boundl(target_ulong a0, int v)
NULL, it means that the function was called in C code (i.e. not NULL, it means that the function was called in C code (i.e. not
from generated code or from helper.c) */ from generated code or from helper.c) */
/* XXX: fix it to restore all registers */ /* XXX: fix it to restore all registers */
void tlb_fill(target_ulong addr, int is_write, int mmu_idx, void *retaddr) void tlb_fill(CPUState *env1, target_ulong addr, int is_write, int mmu_idx,
void *retaddr)
{ {
TranslationBlock *tb; TranslationBlock *tb;
int ret; int ret;
unsigned long pc; unsigned long pc;
CPUX86State *saved_env; CPUX86State *saved_env;
/* XXX: hack to restore env in all cases, even if not called from
generated code */
saved_env = env; saved_env = env;
env = cpu_single_env; env = env1;
ret = cpu_x86_handle_mmu_fault(env, addr, is_write, mmu_idx); ret = cpu_x86_handle_mmu_fault(env, addr, is_write, mmu_idx);
if (ret) { if (ret) {

7
target-lm32/op_helper.c
View file

@ -75,17 +75,16 @@ uint32_t helper_rcsr_jrx(void)
NULL, it means that the function was called in C code (i.e. not NULL, it means that the function was called in C code (i.e. not
from generated code or from helper.c) */ from generated code or from helper.c) */
/* XXX: fix it to restore all registers */ /* XXX: fix it to restore all registers */
void tlb_fill(target_ulong addr, int is_write, int mmu_idx, void *retaddr) void tlb_fill(CPUState *env1, target_ulong addr, int is_write, int mmu_idx,
void *retaddr)
{ {
TranslationBlock *tb; TranslationBlock *tb;
CPUState *saved_env; CPUState *saved_env;
unsigned long pc; unsigned long pc;
int ret; int ret;
/* XXX: hack to restore env in all cases, even if not called from
generated code */
saved_env = env; saved_env = env;
env = cpu_single_env; env = env1;
ret = cpu_lm32_handle_mmu_fault(env, addr, is_write, mmu_idx); ret = cpu_lm32_handle_mmu_fault(env, addr, is_write, mmu_idx);
if (unlikely(ret)) { if (unlikely(ret)) {

7
target-m68k/op_helper.c
View file

@ -55,17 +55,16 @@ extern int semihosting_enabled;
NULL, it means that the function was called in C code (i.e. not NULL, it means that the function was called in C code (i.e. not
from generated code or from helper.c) */ from generated code or from helper.c) */
/* XXX: fix it to restore all registers */ /* XXX: fix it to restore all registers */
void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) void tlb_fill(CPUState *env1, target_ulong addr, int is_write, int mmu_idx,
void *retaddr)
{ {
TranslationBlock *tb; TranslationBlock *tb;
CPUState *saved_env; CPUState *saved_env;
unsigned long pc; unsigned long pc;
int ret; int ret;
/* XXX: hack to restore env in all cases, even if not called from
generated code */
saved_env = env; saved_env = env;
env = cpu_single_env; env = env1;
ret = cpu_m68k_handle_mmu_fault(env, addr, is_write, mmu_idx); ret = cpu_m68k_handle_mmu_fault(env, addr, is_write, mmu_idx);
if (unlikely(ret)) { if (unlikely(ret)) {
if (retaddr) { if (retaddr) {

7
target-microblaze/op_helper.c
View file

@ -42,17 +42,16 @@
NULL, it means that the function was called in C code (i.e. not NULL, it means that the function was called in C code (i.e. not
from generated code or from helper.c) */ from generated code or from helper.c) */
/* XXX: fix it to restore all registers */ /* XXX: fix it to restore all registers */
void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) void tlb_fill(CPUState *env1, target_ulong addr, int is_write, int mmu_idx,
void *retaddr)
{ {
TranslationBlock *tb; TranslationBlock *tb;
CPUState *saved_env; CPUState *saved_env;
unsigned long pc; unsigned long pc;
int ret; int ret;
/* XXX: hack to restore env in all cases, even if not called from
generated code */
saved_env = env; saved_env = env;
env = cpu_single_env; env = env1;
ret = cpu_mb_handle_mmu_fault(env, addr, is_write, mmu_idx); ret = cpu_mb_handle_mmu_fault(env, addr, is_write, mmu_idx);
if (unlikely(ret)) { if (unlikely(ret)) {

7
target-mips/op_helper.c
View file

@ -2316,17 +2316,16 @@ static void do_unaligned_access (target_ulong addr, int is_write, int is_user, v
helper_raise_exception ((is_write == 1) ? EXCP_AdES : EXCP_AdEL); helper_raise_exception ((is_write == 1) ? EXCP_AdES : EXCP_AdEL);
} }
void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) void tlb_fill(CPUState *env1, target_ulong addr, int is_write, int mmu_idx,
void *retaddr)
{ {
TranslationBlock *tb; TranslationBlock *tb;
CPUState *saved_env; CPUState *saved_env;
unsigned long pc; unsigned long pc;
int ret; int ret;
/* XXX: hack to restore env in all cases, even if not called from
generated code */
saved_env = env; saved_env = env;
env = cpu_single_env; env = env1;
ret = cpu_mips_handle_mmu_fault(env, addr, is_write, mmu_idx); ret = cpu_mips_handle_mmu_fault(env, addr, is_write, mmu_idx);
if (ret) { if (ret) {
if (retaddr) { if (retaddr) {

7
target-ppc/op_helper.c
View file

@ -3714,17 +3714,16 @@ uint32_t helper_efdcmpeq (uint64_t op1, uint64_t op2)
NULL, it means that the function was called in C code (i.e. not NULL, it means that the function was called in C code (i.e. not
from generated code or from helper.c) */ from generated code or from helper.c) */
/* XXX: fix it to restore all registers */ /* XXX: fix it to restore all registers */
void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) void tlb_fill(CPUState *env1, target_ulong addr, int is_write, int mmu_idx,
void *retaddr)
{ {
TranslationBlock *tb; TranslationBlock *tb;
CPUState *saved_env; CPUState *saved_env;
unsigned long pc; unsigned long pc;
int ret; int ret;
/* XXX: hack to restore env in all cases, even if not called from
generated code */
saved_env = env; saved_env = env;
env = cpu_single_env; env = env1;
ret = cpu_ppc_handle_mmu_fault(env, addr, is_write, mmu_idx); ret = cpu_ppc_handle_mmu_fault(env, addr, is_write, mmu_idx);
if (unlikely(ret != 0)) { if (unlikely(ret != 0)) {
if (likely(retaddr)) { if (likely(retaddr)) {

7
target-s390x/op_helper.c
View file

@ -52,17 +52,16 @@
NULL, it means that the function was called in C code (i.e. not NULL, it means that the function was called in C code (i.e. not
from generated code or from helper.c) */ from generated code or from helper.c) */
/* XXX: fix it to restore all registers */ /* XXX: fix it to restore all registers */
void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) void tlb_fill(CPUState *env1, target_ulong addr, int is_write, int mmu_idx,
void *retaddr)
{ {
TranslationBlock *tb; TranslationBlock *tb;
CPUState *saved_env; CPUState *saved_env;
unsigned long pc; unsigned long pc;
int ret; int ret;
/* XXX: hack to restore env in all cases, even if not called from
generated code */
saved_env = env; saved_env = env;
env = cpu_single_env; env = env1;
ret = cpu_s390x_handle_mmu_fault(env, addr, is_write, mmu_idx); ret = cpu_s390x_handle_mmu_fault(env, addr, is_write, mmu_idx);
if (unlikely(ret != 0)) { if (unlikely(ret != 0)) {
if (likely(retaddr)) { if (likely(retaddr)) {

7
target-sh4/op_helper.c
View file

@ -55,15 +55,14 @@ static void cpu_restore_state_from_retaddr(void *retaddr)
#define SHIFT 3 #define SHIFT 3
#include "softmmu_template.h" #include "softmmu_template.h"
void tlb_fill(target_ulong addr, int is_write, int mmu_idx, void *retaddr) void tlb_fill(CPUState *env1, target_ulong addr, int is_write, int mmu_idx,
void *retaddr)
{ {
CPUState *saved_env; CPUState *saved_env;
int ret; int ret;
/* XXX: hack to restore env in all cases, even if not called from
generated code */
saved_env = env; saved_env = env;
env = cpu_single_env; env = env1;
ret = cpu_sh4_handle_mmu_fault(env, addr, is_write, mmu_idx); ret = cpu_sh4_handle_mmu_fault(env, addr, is_write, mmu_idx);
if (ret) { if (ret) {
/* now we have a real cpu fault */ /* now we have a real cpu fault */

7
target-sparc/op_helper.c
View file

@ -4225,15 +4225,14 @@ static void do_unaligned_access(target_ulong addr, int is_write, int is_user,
NULL, it means that the function was called in C code (i.e. not NULL, it means that the function was called in C code (i.e. not
from generated code or from helper.c) */ from generated code or from helper.c) */
/* XXX: fix it to restore all registers */ /* XXX: fix it to restore all registers */
void tlb_fill(target_ulong addr, int is_write, int mmu_idx, void *retaddr) void tlb_fill(CPUState *env1, target_ulong addr, int is_write, int mmu_idx,
void *retaddr)
{ {
int ret; int ret;
CPUState *saved_env; CPUState *saved_env;
/* XXX: hack to restore env in all cases, even if not called from
generated code */
saved_env = env; saved_env = env;
env = cpu_single_env; env = env1;
ret = cpu_sparc_handle_mmu_fault(env, addr, is_write, mmu_idx); ret = cpu_sparc_handle_mmu_fault(env, addr, is_write, mmu_idx);
if (ret) { if (ret) {

5
target-xtensa/op_helper.c
View file

@ -70,11 +70,12 @@ static void do_unaligned_access(target_ulong addr, int is_write, int is_user,
} }
} }
void tlb_fill(target_ulong vaddr, int is_write, int mmu_idx, void *retaddr) void tlb_fill(CPUState *env1, target_ulong vaddr, int is_write, int mmu_idx,
void *retaddr)
{ {
CPUState *saved_env = env; CPUState *saved_env = env;
env = cpu_single_env; env = env1;
{ {
uint32_t paddr; uint32_t paddr;
uint32_t page_size; uint32_t page_size;