Last minute fix

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJWXiElAAoJEK0ScMxN0Cebz8IH/ilyHyS+Y8po4IguufcaYjNW
 PXU7PGSezut9WjTcJ1QGGiQVLex2SAPBWNdfVxuA4uinKmBtp3qUfdETcVWWug9k
 eXXWFnGqYJMg9FnyGIUObrQLQCbBwEDAfNEfS3UBX8j/uaedrPQBbUYVwHBx9arA
 vYnoZZcxWMfyFQmDXiiF4XO8yXuRpH6WGRL7pGCPBr4yvbBNFpLosQ3p+ADvkvqI
 oJ5ktv9bKXUfIeiUN71BGybEdz3/Up1Awv+W6lVWjtdgjCBJY51TyurVW5OK79TD
 VmkjJyg/Se3pv4px8pWFWEun3S6VXukSRwHMaGUG15T5C2KHSifafLESS1UdL9M=
 =vlPh
 -----END PGP SIGNATURE-----

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

Last minute fix

# gpg: Signature made Tue 01 Dec 2015 22:37:25 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-20151201:
  tcg: Increase the highwater reservation

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2015-12-02 10:16:53 +00:00
commit 9d7b969ea6

View File

@ -388,7 +388,11 @@ void tcg_prologue_init(TCGContext *s)
/* Compute a high-water mark, at which we voluntarily flush the buffer /* Compute a high-water mark, at which we voluntarily flush the buffer
and start over. The size here is arbitrary, significantly larger and start over. The size here is arbitrary, significantly larger
than we expect the code generation for any one opcode to require. */ than we expect the code generation for any one opcode to require. */
s->code_gen_highwater = s->code_gen_buffer + (total_size - 1024); /* ??? We currently have no good estimate for, or checks in,
tcg_out_tb_finalize. If there are quite a lot of guest memory ops,
the number of out-of-line fragments could be quite high. In the
short-term, increase the highwater buffer. */
s->code_gen_highwater = s->code_gen_buffer + (total_size - 64*1024);
tcg_register_jit(s->code_gen_buffer, total_size); tcg_register_jit(s->code_gen_buffer, total_size);