mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
ppc patch queue for 2022-11-17:
Short queue with a build regression fix when using --disable-tcg. -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQQX6/+ZI9AYAK8oOBk82cqW3gMxZAUCY3ZP3wAKCRA82cqW3gMx ZB7uAPwN3C8R0YeL+NR44ZlzJVM75TjT1sDYD3oZjEraIfAz9AD7BKRNMPXmmF3A sIHlbhVWquFU07ZDq5UmMfa2WudFZgc= =z2+u -----END PGP SIGNATURE----- Merge tag 'pull-ppc-20221117' of https://gitlab.com/danielhb/qemu into staging ppc patch queue for 2022-11-17: Short queue with a build regression fix when using --disable-tcg. # -----BEGIN PGP SIGNATURE----- # # iHUEABYKAB0WIQQX6/+ZI9AYAK8oOBk82cqW3gMxZAUCY3ZP3wAKCRA82cqW3gMx # ZB7uAPwN3C8R0YeL+NR44ZlzJVM75TjT1sDYD3oZjEraIfAz9AD7BKRNMPXmmF3A # sIHlbhVWquFU07ZDq5UmMfa2WudFZgc= # =z2+u # -----END PGP SIGNATURE----- # gpg: Signature made Thu 17 Nov 2022 10:14:39 EST # gpg: using EDDSA key 17EBFF9923D01800AF2838193CD9CA96DE033164 # gpg: Good signature from "Daniel Henrique Barboza <danielhb413@gmail.com>" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 17EB FF99 23D0 1800 AF28 3819 3CD9 CA96 DE03 3164 * tag 'pull-ppc-20221117' of https://gitlab.com/danielhb/qemu: target/ppc: Fix build warnings when building with 'disable-tcg' Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
commit
a082fab9d2
|
@ -7015,6 +7015,7 @@ static vaddr ppc_cpu_get_pc(CPUState *cs)
|
||||||
return cpu->env.nip;
|
return cpu->env.nip;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_TCG
|
||||||
static void ppc_restore_state_to_opc(CPUState *cs,
|
static void ppc_restore_state_to_opc(CPUState *cs,
|
||||||
const TranslationBlock *tb,
|
const TranslationBlock *tb,
|
||||||
const uint64_t *data)
|
const uint64_t *data)
|
||||||
|
@ -7023,6 +7024,7 @@ static void ppc_restore_state_to_opc(CPUState *cs,
|
||||||
|
|
||||||
cpu->env.nip = data[0];
|
cpu->env.nip = data[0];
|
||||||
}
|
}
|
||||||
|
#endif /* CONFIG_TCG */
|
||||||
|
|
||||||
static bool ppc_cpu_has_work(CPUState *cs)
|
static bool ppc_cpu_has_work(CPUState *cs)
|
||||||
{
|
{
|
||||||
|
|
|
@ -2842,6 +2842,7 @@ void helper_td(CPUPPCState *env, target_ulong arg1, target_ulong arg2,
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef CONFIG_TCG
|
||||||
static uint32_t helper_SIMON_LIKE_32_64(uint32_t x, uint64_t key, uint32_t lane)
|
static uint32_t helper_SIMON_LIKE_32_64(uint32_t x, uint64_t key, uint32_t lane)
|
||||||
{
|
{
|
||||||
const uint16_t c = 0xfffc;
|
const uint16_t c = 0xfffc;
|
||||||
|
@ -2924,6 +2925,7 @@ HELPER_HASH(HASHST, env->spr[SPR_HASHKEYR], true)
|
||||||
HELPER_HASH(HASHCHK, env->spr[SPR_HASHKEYR], false)
|
HELPER_HASH(HASHCHK, env->spr[SPR_HASHKEYR], false)
|
||||||
HELPER_HASH(HASHSTP, env->spr[SPR_HASHPKEYR], true)
|
HELPER_HASH(HASHSTP, env->spr[SPR_HASHPKEYR], true)
|
||||||
HELPER_HASH(HASHCHKP, env->spr[SPR_HASHPKEYR], false)
|
HELPER_HASH(HASHCHKP, env->spr[SPR_HASHPKEYR], false)
|
||||||
|
#endif /* CONFIG_TCG */
|
||||||
|
|
||||||
#if !defined(CONFIG_USER_ONLY)
|
#if !defined(CONFIG_USER_ONLY)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue