Skip to content

Commit

Permalink
accel/tcg: Use CPUState in atomicity helpers
Browse files Browse the repository at this point in the history 
Makes ldst_atomicity.c.inc almost target-independent, with the exception
of TARGET_PAGE_MASK, which will be addressed in a future patch.

Signed-off-by: Anton Johansson <anjo@rev.ng>
Message-Id: <20230912153428.17816-8-anjo@rev.ng>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
  • Loading branch information
@rth7680
Anton Johansson authored and rth7680 committed Oct 4, 2023
1 parent d560225 commit 73fda56
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 62 deletions.
20 changes: 10 additions & 10 deletions accel/tcg/cputlb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2172,7 +2172,7 @@ static uint64_t do_ld_whole_be8(CPUState *cpu, uintptr_t ra,
MMULookupPageData *p, uint64_t ret_be)
{
int o = p->addr & 7;
uint64_t x = load_atomic8_or_exit(cpu_env(cpu), ra, p->haddr - o);
uint64_t x = load_atomic8_or_exit(cpu, ra, p->haddr - o);

x = cpu_to_be64(x);
x <<= o * 8;
Expand All @@ -2192,7 +2192,7 @@ static Int128 do_ld_whole_be16(CPUState *cpu, uintptr_t ra,
MMULookupPageData *p, uint64_t ret_be)
{
int o = p->addr & 15;
Int128 x, y = load_atomic16_or_exit(cpu_env(cpu), ra, p->haddr - o);
Int128 x, y = load_atomic16_or_exit(cpu, ra, p->haddr - o);
int size = p->size;

if (!HOST_BIG_ENDIAN) {
Expand Down Expand Up @@ -2329,7 +2329,7 @@ static uint16_t do_ld_2(CPUState *cpu, MMULookupPageData *p, int mmu_idx,
}
} else {
/* Perform the load host endian, then swap if necessary. */
ret = load_atom_2(cpu_env(cpu), ra, p->haddr, memop);
ret = load_atom_2(cpu, ra, p->haddr, memop);
if (memop & MO_BSWAP) {
ret = bswap16(ret);
}
Expand All @@ -2349,7 +2349,7 @@ static uint32_t do_ld_4(CPUState *cpu, MMULookupPageData *p, int mmu_idx,
}
} else {
/* Perform the load host endian. */
ret = load_atom_4(cpu_env(cpu), ra, p->haddr, memop);
ret = load_atom_4(cpu, ra, p->haddr, memop);
if (memop & MO_BSWAP) {
ret = bswap32(ret);
}
Expand All @@ -2369,7 +2369,7 @@ static uint64_t do_ld_8(CPUState *cpu, MMULookupPageData *p, int mmu_idx,
}
} else {
/* Perform the load host endian. */
ret = load_atom_8(cpu_env(cpu), ra, p->haddr, memop);
ret = load_atom_8(cpu, ra, p->haddr, memop);
if (memop & MO_BSWAP) {
ret = bswap64(ret);
}
Expand Down Expand Up @@ -2528,7 +2528,7 @@ static Int128 do_ld16_mmu(CPUState *cpu, vaddr addr,
}
} else {
/* Perform the load host endian. */
ret = load_atom_16(cpu_env(cpu), ra, l.page[0].haddr, l.memop);
ret = load_atom_16(cpu, ra, l.page[0].haddr, l.memop);
if (l.memop & MO_BSWAP) {
ret = bswap128(ret);
}
Expand Down Expand Up @@ -2880,7 +2880,7 @@ static void do_st_2(CPUState *cpu, MMULookupPageData *p, uint16_t val,
if (memop & MO_BSWAP) {
val = bswap16(val);
}
store_atom_2(cpu_env(cpu), ra, p->haddr, memop, val);
store_atom_2(cpu, ra, p->haddr, memop, val);
}
}

Expand All @@ -2899,7 +2899,7 @@ static void do_st_4(CPUState *cpu, MMULookupPageData *p, uint32_t val,
if (memop & MO_BSWAP) {
val = bswap32(val);
}
store_atom_4(cpu_env(cpu), ra, p->haddr, memop, val);
store_atom_4(cpu, ra, p->haddr, memop, val);
}
}

Expand All @@ -2918,7 +2918,7 @@ static void do_st_8(CPUState *cpu, MMULookupPageData *p, uint64_t val,
if (memop & MO_BSWAP) {
val = bswap64(val);
}
store_atom_8(cpu_env(cpu), ra, p->haddr, memop, val);
store_atom_8(cpu, ra, p->haddr, memop, val);
}
}

Expand Down Expand Up @@ -3045,7 +3045,7 @@ static void do_st16_mmu(CPUState *cpu, vaddr addr, Int128 val,
if (l.memop & MO_BSWAP) {
val = bswap128(val);
}
store_atom_16(cpu_env(cpu), ra, l.page[0].haddr, l.memop, val);
store_atom_16(cpu, ra, l.page[0].haddr, l.memop, val);
}
return;
}
Expand Down

0 comments on commit 73fda56

Please sign in to comment.