ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

exec/cpu: Rename PAGE_BITS macro to PAGE_RWX 

This macro can be used to abbreviate PAGE_READ | PAGE_WRITE | PAGE_EXEC
for which PAGE_RWX is a better name and renaming it also shows it is
not related to TARGET_PAGE_BITS.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240505121008.44A0D4E602D@zero.eik.bme.hu>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
BALATON Zoltan 2024-05-05 14:10:08 +02:00 committed by Philippe Mathieu-Daudé
parent 1072f927f0
commit 86b7c55182
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accel/tcg/user-exec.c
View File

@ -765,7 +765,7 @@ int page_unprotect(target_ulong address, uintptr_t pc)
if (prot & PAGE_EXEC) { if (prot & PAGE_EXEC) {
prot = (prot & ~PAGE_EXEC) | PAGE_READ; prot = (prot & ~PAGE_EXEC) | PAGE_READ;
} }
mprotect((void *)g2h_untagged(start), len, prot & PAGE_BITS); mprotect((void *)g2h_untagged(start), len, prot & PAGE_RWX);
} }
mmap_unlock(); mmap_unlock();

6
bsd-user/mmap.c
View File

@ -96,7 +96,7 @@ int target_mprotect(abi_ulong start, abi_ulong len, int prot)
end = host_end; end = host_end;
} }
ret = mprotect(g2h_untagged(host_start), ret = mprotect(g2h_untagged(host_start),
qemu_host_page_size, prot1 & PAGE_BITS); qemu_host_page_size, prot1 & PAGE_RWX);
if (ret != 0) if (ret != 0)
goto error; goto error;
host_start += qemu_host_page_size; host_start += qemu_host_page_size;
@ -107,7 +107,7 @@ int target_mprotect(abi_ulong start, abi_ulong len, int prot)
prot1 |= page_get_flags(addr); prot1 |= page_get_flags(addr);
} }
ret = mprotect(g2h_untagged(host_end - qemu_host_page_size), ret = mprotect(g2h_untagged(host_end - qemu_host_page_size),
qemu_host_page_size, prot1 & PAGE_BITS); qemu_host_page_size, prot1 & PAGE_RWX);
if (ret != 0) if (ret != 0)
goto error; goto error;
host_end -= qemu_host_page_size; host_end -= qemu_host_page_size;
@ -174,7 +174,7 @@ static int mmap_frag(abi_ulong real_start,
return -1; return -1;
prot1 = prot; prot1 = prot;
} }
prot1 &= PAGE_BITS; prot1 &= PAGE_RWX;
prot_new = prot | prot1; prot_new = prot | prot1;
if (fd != -1) { if (fd != -1) {

2
include/exec/cpu-common.h
View File

@ -212,7 +212,7 @@ G_NORETURN void cpu_loop_exit_restore(CPUState *cpu, uintptr_t pc);
#define PAGE_READ 0x0001 #define PAGE_READ 0x0001
#define PAGE_WRITE 0x0002 #define PAGE_WRITE 0x0002
#define PAGE_EXEC 0x0004 #define PAGE_EXEC 0x0004
#define PAGE_BITS (PAGE_READ | PAGE_WRITE | PAGE_EXEC) #define PAGE_RWX (PAGE_READ | PAGE_WRITE | PAGE_EXEC)
#define PAGE_VALID 0x0008 #define PAGE_VALID 0x0008
/* /*
* Original state of the write flag (used when tracking self-modifying code) * Original state of the write flag (used when tracking self-modifying code)

2
linux-user/elfload.c
View File

@ -2361,7 +2361,7 @@ static bool zero_bss(abi_ulong start_bss, abi_ulong end_bss,
if (start_bss < align_bss) { if (start_bss < align_bss) {
int flags = page_get_flags(start_bss); int flags = page_get_flags(start_bss);
if (!(flags & PAGE_BITS)) { if (!(flags & PAGE_RWX)) {
/* /*
* The whole address space of the executable was reserved * The whole address space of the executable was reserved
* at the start, therefore all pages will be VALID. * at the start, therefore all pages will be VALID.

2
linux-user/mmap.c
View File

@ -117,7 +117,7 @@ static void shm_region_rm_complete(abi_ptr start, abi_ptr last)
static int validate_prot_to_pageflags(int prot) static int validate_prot_to_pageflags(int prot)
{ {
int valid = PROT_READ | PROT_WRITE | PROT_EXEC | TARGET_PROT_SEM; int valid = PROT_READ | PROT_WRITE | PROT_EXEC | TARGET_PROT_SEM;
int page_flags = (prot & PAGE_BITS) | PAGE_VALID; int page_flags = (prot & PAGE_RWX) | PAGE_VALID;
#ifdef TARGET_AARCH64 #ifdef TARGET_AARCH64
{ {

4
target/cris/mmu.c
View File

@ -333,7 +333,7 @@ int cris_mmu_translate(struct cris_mmu_result *res,
if (!cris_mmu_enabled(env->sregs[SFR_RW_GC_CFG])) { if (!cris_mmu_enabled(env->sregs[SFR_RW_GC_CFG])) {
res->phy = vaddr; res->phy = vaddr;
res->prot = PAGE_BITS; res->prot = PAGE_RWX;
goto done; goto done;
} }
@ -344,7 +344,7 @@ int cris_mmu_translate(struct cris_mmu_result *res,
miss = 0; miss = 0;
base = cris_mmu_translate_seg(env, seg); base = cris_mmu_translate_seg(env, seg);
res->phy = base | (0x0fffffff & vaddr); res->phy = base | (0x0fffffff & vaddr);
res->prot = PAGE_BITS; res->prot = PAGE_RWX;
} else { } else {
miss = cris_mmu_translate_page(res, env, vaddr, access_type, miss = cris_mmu_translate_page(res, env, vaddr, access_type,
is_user, debug); is_user, debug);

2
target/microblaze/helper.c
View File

@ -51,7 +51,7 @@ bool mb_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
if (mmu_idx == MMU_NOMMU_IDX) { if (mmu_idx == MMU_NOMMU_IDX) {
/* MMU disabled or not available. */ /* MMU disabled or not available. */
address &= TARGET_PAGE_MASK; address &= TARGET_PAGE_MASK;
prot = PAGE_BITS; prot = PAGE_RWX;
tlb_set_page_with_attrs(cs, address, address, attrs, prot, mmu_idx, tlb_set_page_with_attrs(cs, address, address, attrs, prot, mmu_idx,
TARGET_PAGE_SIZE); TARGET_PAGE_SIZE);
return true; return true;