On Tue, May 26, 2015 at 9:58 AM, Andreas Färber <afaer...@suse.de> wrote:
> Am 26.05.2015 um 18:49 schrieb Yongbok Kim:
>> Add probe_write() forces a tlb_fill if the specified guest virtual
>> index isn't in the TCG softmmu TLB.
>>
>> Signed-off-by: Yongbok Kim <yongbok....@imgtec.com>
>> ---
>> include/exec/exec-all.h | 2 ++
>> softmmu_template.h | 20 ++++++++++++++++++++
>> 2 files changed, 22 insertions(+), 0 deletions(-)
>>
>> diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
>> index b58cd47..af51203 100644
>> --- a/include/exec/exec-all.h
>> +++ b/include/exec/exec-all.h
>> @@ -109,6 +109,8 @@ void tlb_set_page_with_attrs(CPUState *cpu, target_ulong
>> vaddr,
>> hwaddr paddr, MemTxAttrs attrs,
>> int prot, int mmu_idx, target_ulong size);
>> void tb_invalidate_phys_addr(AddressSpace *as, hwaddr addr);
>> +void probe_write(CPUArchState *env, target_ulong addr, int mmu_idx,
>> + uintptr_t retaddr);
>> #else
>> static inline void tlb_flush_page(CPUState *cpu, target_ulong addr)
>> {
>> diff --git a/softmmu_template.h b/softmmu_template.h
>> index 9cb1659..1a1de4a 100644
>> --- a/softmmu_template.h
>> +++ b/softmmu_template.h
>> @@ -548,6 +548,26 @@ glue(glue(helper_st, SUFFIX), MMUSUFFIX)(CPUArchState
>> *env, target_ulong addr,
>> helper_te_st_name(env, addr, val, oi, GETRA());
>> }
>>
>> +#if DATA_SIZE == 1
>> +/*
>> + * Force a tlb_fill if the specified guest virtual index isn't in the TCG
>> + * softmmu TLB.
>> + */
>> +void probe_write(CPUArchState *env, target_ulong addr, int mmu_idx,
>> + uintptr_t retaddr)
>> +{
>> + int index = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1);
>> + target_ulong tlb_addr = env->tlb_table[mmu_idx][index].addr_write;
>> +
>> + if ((addr & TARGET_PAGE_MASK)
>> + != (tlb_addr & (TARGET_PAGE_MASK | TLB_INVALID_MASK))) {
>> + /* TLB entry is for a different page */
>> + if (!VICTIM_TLB_HIT(addr_write)) {
>> + tlb_fill(ENV_GET_CPU(env), addr, MMU_DATA_STORE, mmu_idx,
>> retaddr);
>
> Isn't the use of ENV_GET_CPU() here contradicting Peter C.'s series?
>
Actually no this one is OK. softmmu_template is in the "write off"
bucket out outside my definition of core-code still. I am looking into
paolos approach of cputlb, exec-all and translate-all being a
multi-compiled template. Files inside the template are free to use
ENV_GET_CPU.
Regards,
Peter
> Regards,
> Andreas
>
>> + }
>> + }
>> +}
>> +#endif
>> #endif /* !defined(SOFTMMU_CODE_ACCESS) */
>>
>> #undef READ_ACCESS_TYPE
>
> --
> SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
> GF: Felix Imendörffer, Jane Smithard, Dilip Upmanyu, Graham Norton; HRB
> 21284 (AG Nürnberg)
>
