Commit d377b803 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b9fe3139 dc1eccd6

tcg/aarch64/tcg-target.inc.c

+2 −2
Original line number Diff line number Diff line
@@ -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)