diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-08-27 13:31:55 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-08-27 13:31:55 +0100 |
| commit | 351053e76d21d0eaa2e0f27c9b69c8ebf65f3650 (patch) | |
| tree | 2f5b151173a6d328bb6a2fedc6d8f454ba85789b | |
| parent | 47c9dfee808f9455d732aea7c4390ad0972bbd84 (diff) | |
| parent | a17d448274575efbfcc1c04ec2641a0afeb74e17 (diff) | |
| download | qemu-351053e76d21d0eaa2e0f27c9b69c8ebf65f3650.zip qemu-351053e76d21d0eaa2e0f27c9b69c8ebf65f3650.tar.gz qemu-351053e76d21d0eaa2e0f27c9b69c8ebf65f3650.tar.bz2 | |
Merge remote-tracking branch 'remotes/weil/tags/pull-tci-20150826' into staging
tci patch queue
# gpg: Signature made Wed 26 Aug 2015 19:51:07 BST using RSA key ID 677450AD
# gpg: Good signature from "Stefan Weil <sw@weilnetz.de>"
# gpg: aka "Stefan Weil <stefan.weil@weilnetz.de>"
# gpg: aka "Stefan Weil <stefan.weil@bib.uni-mannheim.de>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 4923 6FEA 75C9 5D69 8EC2 B78A E08C 21D5 6774 50AD
* remotes/weil/tags/pull-tci-20150826:
exec-all: Translate TCI return addresses backwards too
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | include/exec/exec-all.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index fbc6dcb..83b9251 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -357,11 +357,7 @@ extern uintptr_t tci_tb_ptr; to indicate the compressed mode; subtracting two works around that. It is also the case that there are no host isas that contain a call insn smaller than 4 bytes, so we don't worry about special-casing this. */ -#if defined(CONFIG_TCG_INTERPRETER) -# define GETPC_ADJ 0 -#else -# define GETPC_ADJ 2 -#endif +#define GETPC_ADJ 2 #define GETPC() (GETRA() - GETPC_ADJ) |