[Qemu-devel] [PULL 0/1] tci queue

[Qemu-devel] [PULL 0/1] tci queue

[Stefan Weil]

The following changes since commit 47c9dfee808f9455d732aea7c4390ad0972bbd84:

  Merge remote-tracking branch 'remotes/kraxel/tags/pull-cve-2015-5225-20150826-1' into staging (2015-08-26 17:45:09 +0100)

are available in the git repository at:

  git://qemu.weilnetz.de/qemu.git tags/pull-tci-20150826

for you to fetch changes up to a17d448274575efbfcc1c04ec2641a0afeb74e17:

  exec-all: Translate TCI return addresses backwards too (2015-08-26 20:50:46 +0200)

----------------------------------------------------------------
tci patch queue

----------------------------------------------------------------
Peter Crosthwaite (1):
      exec-all: Translate TCI return addresses backwards too

 include/exec/exec-all.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

[Qemu-devel] [PULL 1/1] exec-all: Translate TCI return addresses backwards too

[Stefan Weil]

From: Peter Crosthwaite <crosthwaitepeter@gmail.com>

This subtraction of return addresses applies directly to TCI as well as
host-TCG. This fixes Linux boots for at least Microblaze, CRIS, ARM and
SH4 when using TCI.

[sw: Removed indentation for preprocessor statement]
[sw: The patch also fixes Linux boot for x86_64]

Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
---
 include/exec/exec-all.h | 6 +-----
 1 file changed, 1 insertion(+), 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)
 
-- 
2.1.4

Re: [Qemu-devel] [PULL 0/1] tci queue

[Peter Maydell]

On 26 August 2015 at 20:08, Stefan Weil <sw@weilnetz.de> wrote:
> The following changes since commit 47c9dfee808f9455d732aea7c4390ad0972bbd84:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/pull-cve-2015-5225-20150826-1' into staging (2015-08-26 17:45:09 +0100)
>
> are available in the git repository at:
>
>   git://qemu.weilnetz.de/qemu.git tags/pull-tci-20150826
>
> for you to fetch changes up to a17d448274575efbfcc1c04ec2641a0afeb74e17:
>
>   exec-all: Translate TCI return addresses backwards too (2015-08-26 20:50:46 +0200)
>
> ----------------------------------------------------------------
> tci patch queue
>

Applied, thanks.

-- PMM