diff mbox

[14/18] tcg: Fix jit debug for pointer size != register size

Message ID 1377190729-14008-15-git-send-email-rth@twiddle.net
State New
Headers show

Commit Message

Richard Henderson Aug. 22, 2013, 4:58 p.m. UTC 
Signed-off-by: Richard Henderson <rth@twiddle.net>
---
 tcg/tcg.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

Aurelien Jarno Aug. 29, 2013, 4:44 p.m. UTC | #1 
On Thu, Aug 22, 2013 at 09:58:45AM -0700, Richard Henderson wrote:
> Signed-off-by: Richard Henderson <rth@twiddle.net>
> ---
>  tcg/tcg.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/tcg/tcg.c b/tcg/tcg.c
> index 72c064c..3c89e3b 100644
> --- a/tcg/tcg.c
> +++ b/tcg/tcg.c
> @@ -49,10 +49,10 @@
>  
>  #include "tcg-op.h"
>  
> -#if TCG_TARGET_REG_BITS == 64
> -# define ELF_CLASS  ELFCLASS64
> -#else
> +#if UINTPTR_MAX == UINT32_MAX
>  # define ELF_CLASS  ELFCLASS32
> +#else
> +# define ELF_CLASS  ELFCLASS64
>  #endif
>  #ifdef HOST_WORDS_BIGENDIAN
>  # define ELF_DATA   ELFDATA2MSB
> @@ -82,8 +82,8 @@ typedef struct {
>  typedef struct QEMU_PACKED {
>      uint32_t len __attribute__((aligned((sizeof(void *)))));
>      uint32_t cie_offset;
> -    tcg_target_long func_start;
> -    tcg_target_long func_len;
> +    uintptr_t func_start;
> +    uintptr_t func_len;
>  } DebugFrameFDEHeader;
>  
>  static void tcg_register_jit_int(void *buf, size_t size,

Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
diff mbox

Patch

diff --git a/tcg/tcg.c b/tcg/tcg.c
index 72c064c..3c89e3b 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -49,10 +49,10 @@ 
 
 #include "tcg-op.h"
 
-#if TCG_TARGET_REG_BITS == 64
-# define ELF_CLASS  ELFCLASS64
-#else
+#if UINTPTR_MAX == UINT32_MAX
 # define ELF_CLASS  ELFCLASS32
+#else
+# define ELF_CLASS  ELFCLASS64
 #endif
 #ifdef HOST_WORDS_BIGENDIAN
 # define ELF_DATA   ELFDATA2MSB
@@ -82,8 +82,8 @@  typedef struct {
 typedef struct QEMU_PACKED {
     uint32_t len __attribute__((aligned((sizeof(void *)))));
     uint32_t cie_offset;
-    tcg_target_long func_start;
-    tcg_target_long func_len;
+    uintptr_t func_start;
+    uintptr_t func_len;
 } DebugFrameFDEHeader;
 
 static void tcg_register_jit_int(void *buf, size_t size,