Commit 351053e7 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 47c9dfee a17d4482

include/exec/exec-all.h

+1 −5
Original line number Diff line number Diff line
@@ -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()  (GETRA() - GETPC_ADJ)