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

Last minute fix. 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJWUwPWAAoJEK0ScMxN0CebaxQH/0bYARUKEC9xwXesG50Mf2qE
 ennSljcuf3S7poBmoqgcoeBe5nngEX37G4ccC5z1gSsByLnOdSxF1eNBG0VmEtlj
 jF5KqPb8a7LDAKqU/h69fvXkrrvDS/VtCPUcNG5cLe6f93mCvp16hdndMNaepGm2
 upELH3yOg5KQtMr7JhW7Pa6nv/7+nDYQanUqwyi3rtsObZkaF4lL/+lLfFxmPjUQ
 GZiCkcdGquUQMDLp7MwcNPcUcv1L3tLK2AYVs9RaDNBsLmzfD6hgYxs9CQ0IHwqy
 LUILsig9U7edzMaT+cSWM2CgTdI6en7zcYc9oRuEEnIt3QtA7lWGG0zlng7ZcwQ=
 =vPkH
 -----END PGP SIGNATURE-----

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

Last minute fix.

# gpg: Signature made Mon 23 Nov 2015 12:17:26 GMT 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-20151123:
  tcg: Fix highwater check

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2015-11-23 13:54:41 +00:00
parent 541abd10a0 644da9b39e
commit 68c61282fe
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tcg/tcg.c
View File

@ -2443,7 +2443,7 @@ int tcg_gen_code(TCGContext *s, tcg_insn_unit *gen_code_buf)
one operation beginning below the high water mark cannot overrun one operation beginning below the high water mark cannot overrun
the buffer completely. Thus we can test for overflow after the buffer completely. Thus we can test for overflow after
generating code without having to check during generation. */ generating code without having to check during generation. */
if (unlikely(s->code_gen_ptr > s->code_gen_highwater)) { if (unlikely((void *)s->code_ptr > s->code_gen_highwater)) {
return -1; return -1;
} }
} }