mirror of
https://github.com/yuzu-emu/unicorn.git
synced 2024-12-23 05:45:36 +00:00
target/arm: Add allocation tag storage for user mode
Use the now-saved PAGE_ANON and PAGE_MTE bits, and the per-page saved data. Backports a11d3830d96ad8077440ce4e0aa60608f1f12dde
This commit is contained in:
parent
f03656b5c3
commit
c588c150e4
|
@ -76,8 +76,33 @@ static uint8_t *allocation_tag_mem(CPUARMState *env, int ptr_mmu_idx,
|
||||||
int tag_size, uintptr_t ra)
|
int tag_size, uintptr_t ra)
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_USER_ONLY
|
#ifdef CONFIG_USER_ONLY
|
||||||
/* Tag storage not implemented. */
|
uint64_t clean_ptr = useronly_clean_ptr(ptr);
|
||||||
return NULL;
|
int flags = page_get_flags(clean_ptr);
|
||||||
|
uint8_t *tags;
|
||||||
|
uintptr_t index;
|
||||||
|
|
||||||
|
if (!(flags & (ptr_access == MMU_DATA_STORE ? PAGE_WRITE : PAGE_READ))) {
|
||||||
|
/* SIGSEGV */
|
||||||
|
arm_cpu_tlb_fill(env_cpu(env), ptr, ptr_size, ptr_access,
|
||||||
|
ptr_mmu_idx, false, ra);
|
||||||
|
g_assert_not_reached();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Require both MAP_ANON and PROT_MTE for the page. */
|
||||||
|
if (!(flags & PAGE_ANON) || !(flags & PAGE_MTE)) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
tags = page_get_target_data(clean_ptr);
|
||||||
|
if (tags == NULL) {
|
||||||
|
size_t alloc_size = TARGET_PAGE_SIZE >> (LOG2_TAG_GRANULE + 1);
|
||||||
|
tags = page_alloc_target_data(clean_ptr, alloc_size);
|
||||||
|
assert(tags != NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
index = extract32(ptr, LOG2_TAG_GRANULE + 1,
|
||||||
|
TARGET_PAGE_BITS - LOG2_TAG_GRANULE - 1);
|
||||||
|
return tags + index;
|
||||||
#else
|
#else
|
||||||
uintptr_t index;
|
uintptr_t index;
|
||||||
CPUIOTLBEntry *iotlbentry;
|
CPUIOTLBEntry *iotlbentry;
|
||||||
|
|
Loading…
Reference in a new issue