diff options
| author | Peter Maydell | 2019-02-07 12:46:40 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-02-07 12:46:40 +0100 |
| commit | 713acc316ddca119fe168e72846f1d2dd0548430 (patch) | |
| tree | b21f44c9bca32d1f6aab105a0049ec8a8dca9f63 /accel | |
| parent | Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (diff) | |
| parent | accel/tcg: Consider cluster index in tb_lookup__cpu_state() (diff) | |
| download | qemu-713acc316ddca119fe168e72846f1d2dd0548430.tar.gz qemu-713acc316ddca119fe168e72846f1d2dd0548430.tar.xz qemu-713acc316ddca119fe168e72846f1d2dd0548430.zip | |
Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20190206' into staging
Queued accel/tcg patches
# gpg: Signature made Wed 06 Feb 2019 03:42:52 GMT
# gpg: using RSA key 64DF38E8AF7E215F
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" [full]
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A 05C0 64DF 38E8 AF7E 215F
* remotes/rth/tags/pull-tcg-20190206:
accel/tcg: Consider cluster index in tb_lookup__cpu_state()
tcg: add early clober modifier in atomic16_cmpxchg on aarch64
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'accel')
| -rw-r--r-- | accel/tcg/cpu-exec.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index fab30af86f..45ef41ebb2 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -328,9 +328,6 @@ TranslationBlock *tb_htable_lookup(CPUState *cpu, target_ulong pc, struct tb_desc desc; uint32_t h; - cf_mask &= ~CF_CLUSTER_MASK; - cf_mask |= cpu->cluster_index << CF_CLUSTER_SHIFT; - desc.env = (CPUArchState *)cpu->env_ptr; desc.cs_base = cs_base; desc.flags = flags; |