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

Queued TCG patch 

-----BEGIN PGP SIGNATURE-----
 
 iQEcBAABAgAGBQJYtev4AAoJEK0ScMxN0CebHRQH/1X63RSQ0u5SreKN1gVV1lhy
 CR+/dS66VQNT76OUhtRH4fGnBaBP2J63S9PsMd/umFpyaPOmkSFyqRJrI/tMeXXQ
 Rj2KUIRGNwJQfyDYUtEw+ebyc8rFzx//afNlgWdbg8gEHI4lGUg6tsOgO34XpQws
 +8sHZbdLkOmpMa9KYKQWopfiQsHW0H2uQpxBOCniPFfEuwvCciG2k0azOswI8jaX
 YHIZfF5ZMC+sfDcMdfYH7wSUCzAoxl1onJ8/Ctv6fjo6SQ8U9ckpNSZUSuMv6czB
 3tGt5tYE5bWdxKnsoVLAr9UWpYx5xwSZ6BVY5a/eM1QIRsee1NodkTKEDEMH2bk=
 =FZwG
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20170301' into staging

Queued TCG patch

# gpg: Signature made Tue 28 Feb 2017 21:30:32 GMT
# gpg:                using RSA key 0xAD1270CC4DD0279B
# gpg: Good signature from "Richard Henderson <rth7680@gmail.com>"
# gpg:                 aka "Richard Henderson <rth@redhat.com>"
# gpg:                 aka "Richard Henderson <rth@twiddle.net>"
# Primary key fingerprint: 9CB1 8DDA F8E8 49AD 2AFC  16A4 AD12 70CC 4DD0 279B

* remotes/rth/tags/pull-tcg-20170301:
  aarch64: Change ext type to TCGType to fix warnings

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2017-03-02 08:35:13 +00:00
parent b9fe31392b dc1eccd661
commit d377b80338
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tcg/aarch64/tcg-target.inc.c
View File

@ -866,7 +866,7 @@ static inline void tcg_out_goto_label(TCGContext *s, TCGLabel *l)
}
}
static void tcg_out_brcond(TCGContext *s, TCGMemOp ext, TCGCond c, TCGArg a,
static void tcg_out_brcond(TCGContext *s, TCGType ext, TCGCond c, TCGArg a,
TCGArg b, bool b_const, TCGLabel *l)
{
intptr_t offset;
@ -937,7 +937,7 @@ static void tcg_out_addsubi(TCGContext *s, int ext, TCGReg rd,
}
}
static inline void tcg_out_addsub2(TCGContext *s, int ext, TCGReg rl,
static inline void tcg_out_addsub2(TCGContext *s, TCGType ext, TCGReg rl,
TCGReg rh, TCGReg al, TCGReg ah,
tcg_target_long bl, tcg_target_long bh,
bool const_bl, bool const_bh, bool sub)