mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix buglets for 2.4

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJVtj+oAAoJEK0ScMxN0Ceb4H0IAKTsgPwm+y/h1Qa80PRBU4bB
 40DIH0aF/saQu1jWZ3ieai4Zeh2LMrMTkGUrqd6wFgomGAdV8CkFR1GCJLYEDAJV
 NWgAME57SI9wgC1VHd9wjy2YnIO8ysSIdZf9uoghGkbrCUGLVsBBH8dz+1JeCmE5
 rAiZZqxXYfZhJ5IOoShNN6Na5X4dzlNsr4/sqxQhsTv68ygQAnKwfrKTY6+kZvxk
 biEG98teGIfDb42qxj/rIhxMGAi6kVfRdpUxmOjdWCtQNoAHHoL15Mgl9V1rOOPT
 tEs6zOGtSqX5GMROsjGDKcV6ChPGBpurdsC1WsygPg/+yRfh2qg8DoRCFryee3Q=
 =6hfM
 -----END PGP SIGNATURE-----

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

Fix buglets for 2.4

# gpg: Signature made Mon Jul 27 15:26:48 2015 BST using RSA key ID 4DD0279B
# gpg: Good signature from "Richard Henderson <rth7680@gmail.com>"
# gpg:                 aka "Richard Henderson <rth@redhat.com>"
# gpg:                 aka "Richard Henderson <rth@twiddle.net>"

* remotes/rth/tags/pull-tcg-20150727:
  tcg: mark temps as mem_coherent = 0 for mov with a constant
  tcg: correctly mark dead inputs for mov with a constant

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2015-07-27 19:37:09 +01:00
commit f8787f8723
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tcg/tcg.c
View File

@ -1894,6 +1894,7 @@ static void tcg_reg_alloc_mov(TCGContext *s, const TCGOpDef *def,
ts->mem_coherent = 1;
} else if (ts->val_type == TEMP_VAL_CONST) {
tcg_out_movi(s, itype, ts->reg, ts->val);
ts->mem_coherent = 0;
}
s->reg_to_temp[ts->reg] = args[1];
ts->val_type = TEMP_VAL_REG;
@ -1920,6 +1921,9 @@ static void tcg_reg_alloc_mov(TCGContext *s, const TCGOpDef *def,
}
ots->val_type = TEMP_VAL_CONST;
ots->val = ts->val;
if (IS_DEAD_ARG(1)) {
temp_dead(s, args[1]);
}
} else {
/* The code in the first if block should have moved the
temp to a register. */