diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2011-07-04 20:57:05 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-10-01 09:31:26 +0000 |
| commit | bccd9ec5f098668576342c83d90d6d6833d61d33 (patch) | |
| tree | fa1cc26e01bd423b626d28c9cd9c9a6a286337dd /softmmu_template.h | |
| parent | efbf29b6816416731e5dc420901a90430b6ea92d (diff) | |
softmmu_header: pass CPUState to tlb_fill
Pass CPUState pointer to tlb_fill() instead of architecture local
cpu_single_env hacks.
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'softmmu_template.h')
| -rw-r--r-- | softmmu_template.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/softmmu_template.h b/softmmu_template.h index ae0ccf226..36eb2e8fc 100644 --- a/softmmu_template.h +++ b/softmmu_template.h @@ -136,7 +136,7 @@ DATA_TYPE REGPARM glue(glue(__ld, SUFFIX), MMUSUFFIX)(target_ulong addr, if ((addr & (DATA_SIZE - 1)) != 0) do_unaligned_access(addr, READ_ACCESS_TYPE, mmu_idx, retaddr); #endif - tlb_fill(addr, READ_ACCESS_TYPE, mmu_idx, retaddr); + tlb_fill(env, addr, READ_ACCESS_TYPE, mmu_idx, retaddr); goto redo; } return res; @@ -186,7 +186,7 @@ static DATA_TYPE glue(glue(slow_ld, SUFFIX), MMUSUFFIX)(target_ulong addr, } } else { /* 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; } return res; @@ -274,7 +274,7 @@ void REGPARM glue(glue(__st, SUFFIX), MMUSUFFIX)(target_ulong addr, if ((addr & (DATA_SIZE - 1)) != 0) do_unaligned_access(addr, 1, mmu_idx, retaddr); #endif - tlb_fill(addr, 1, mmu_idx, retaddr); + tlb_fill(env, addr, 1, mmu_idx, retaddr); goto redo; } } @@ -321,7 +321,7 @@ static void glue(glue(slow_st, SUFFIX), MMUSUFFIX)(target_ulong addr, } } else { /* 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; } } |