diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2024-10-04 14:57:20 -0700 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2024-10-13 11:27:03 -0700 |
| commit | e5b063e81fd2b30aad1e9128238871c71b62a666 (patch) | |
| tree | fe5437d101092a25cd446a4fdb721f5b66a0c55c | |
| parent | c5809eee452b0393ca57763137344099912b354a (diff) | |
| download | qemu-e5b063e81fd2b30aad1e9128238871c71b62a666.zip qemu-e5b063e81fd2b30aad1e9128238871c71b62a666.tar.gz qemu-e5b063e81fd2b30aad1e9128238871c71b62a666.tar.bz2 | |
include/exec/memop: Introduce memop_atomicity_bits
Split out of mmu_lookup.
Reviewed-by: Helge Deller <deller@gmx.de>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
| -rw-r--r-- | accel/tcg/cputlb.c | 16 | ||||
| -rw-r--r-- | include/exec/memop.h | 24 |
2 files changed, 26 insertions, 14 deletions
diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index a975fe5..35cda1e 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -1767,20 +1767,8 @@ static bool mmu_lookup(CPUState *cpu, vaddr addr, MemOpIdx oi, * Device memory type require alignment. */ if (unlikely(flags & TLB_CHECK_ALIGNED)) { - MemOp size = l->memop & MO_SIZE; - - switch (l->memop & MO_ATOM_MASK) { - case MO_ATOM_NONE: - size = MO_8; - break; - case MO_ATOM_IFALIGN_PAIR: - case MO_ATOM_WITHIN16_PAIR: - size = size ? size - 1 : 0; - break; - default: - break; - } - if (addr & ((1 << size) - 1)) { + a_bits = memop_atomicity_bits(l->memop); + if (addr & ((1 << a_bits) - 1)) { cpu_unaligned_access(cpu, addr, type, l->mmu_idx, ra); } } diff --git a/include/exec/memop.h b/include/exec/memop.h index f53bf61..b699bf7 100644 --- a/include/exec/memop.h +++ b/include/exec/memop.h @@ -193,4 +193,28 @@ static inline unsigned memop_alignment_bits(MemOp memop) return a; } +/* + * memop_atomicity_bits: + * @memop: MemOp value + * + * Extract the atomicity size from the memop. + */ +static inline unsigned memop_atomicity_bits(MemOp memop) +{ + unsigned size = memop & MO_SIZE; + + switch (memop & MO_ATOM_MASK) { + case MO_ATOM_NONE: + size = MO_8; + break; + case MO_ATOM_IFALIGN_PAIR: + case MO_ATOM_WITHIN16_PAIR: + size = size ? size - 1 : 0; + break; + default: + break; + } + return size; +} + #endif |