Patchwork tci: fix build breakage for target MIPS

login
register
mail settings
Submitter Stefan Weil
Date Nov. 18, 2012, 7:06 p.m.
Message ID <1353265579-16544-1-git-send-email-sw@weilnetz.de>
Download mbox | patch
Permalink /patch/199906/
State Accepted
Headers show

Comments

Stefan Weil - Nov. 18, 2012, 7:06 p.m.
commit 5f7319cd introduced GETPC() usage for MIPS, which is currently
not defined when building with --enable-tcg-interpreter. Add MIPS to
the list of targets we selectively define GETPC() for.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 exec-all.h |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
Blue Swirl - Nov. 18, 2012, 9:10 p.m.
Thanks, applied.

On Sun, Nov 18, 2012 at 7:06 PM, Stefan Weil <sw@weilnetz.de> wrote:
> commit 5f7319cd introduced GETPC() usage for MIPS, which is currently
> not defined when building with --enable-tcg-interpreter. Add MIPS to
> the list of targets we selectively define GETPC() for.
>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>  exec-all.h |    7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/exec-all.h b/exec-all.h
> index cce1a65..49f7e38 100644
> --- a/exec-all.h
> +++ b/exec-all.h
> @@ -290,10 +290,11 @@ extern int tb_invalidated_flag;
>  /* The return address may point to the start of the next instruction.
>     Subtracting one gets us the call instruction itself.  */
>  #if defined(CONFIG_TCG_INTERPRETER)
> -/* Alpha and SH4 user mode emulations and Softmmu call GETPC().
> +/* Softmmu, Alpha, MIPS, SH4 and SPARC user mode emulations call GETPC().
>     For all others, GETPC remains undefined (which makes TCI a little faster. */
> -# if defined(CONFIG_SOFTMMU) || defined(TARGET_ALPHA) || defined(TARGET_SH4) \
> -     || defined(TARGET_SPARC)
> +# if defined(CONFIG_SOFTMMU) || \
> +    defined(TARGET_ALPHA) || defined(TARGET_MIPS) || \
> +    defined(TARGET_SH4) || defined(TARGET_SPARC)
>  extern uintptr_t tci_tb_ptr;
>  #  define GETPC() tci_tb_ptr
>  # endif
> --
> 1.7.10.4
>
>

Patch

diff --git a/exec-all.h b/exec-all.h
index cce1a65..49f7e38 100644
--- a/exec-all.h
+++ b/exec-all.h
@@ -290,10 +290,11 @@  extern int tb_invalidated_flag;
 /* The return address may point to the start of the next instruction.
    Subtracting one gets us the call instruction itself.  */
 #if defined(CONFIG_TCG_INTERPRETER)
-/* Alpha and SH4 user mode emulations and Softmmu call GETPC().
+/* Softmmu, Alpha, MIPS, SH4 and SPARC user mode emulations call GETPC().
    For all others, GETPC remains undefined (which makes TCI a little faster. */
-# if defined(CONFIG_SOFTMMU) || defined(TARGET_ALPHA) || defined(TARGET_SH4) \
-     || defined(TARGET_SPARC)
+# if defined(CONFIG_SOFTMMU) || \
+    defined(TARGET_ALPHA) || defined(TARGET_MIPS) || \
+    defined(TARGET_SH4) || defined(TARGET_SPARC)
 extern uintptr_t tci_tb_ptr;
 #  define GETPC() tci_tb_ptr
 # endif