From e2c6d1b42d34539120c3cee159dcd9e32cba7d3b Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Tue, 20 Aug 2013 15:12:31 -0700 Subject: [PATCH] tcg: Change frame pointer offsets to intptr_t Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson --- tcg/tcg.c | 5 ++--- tcg/tcg.h | 9 ++++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tcg/tcg.c b/tcg/tcg.c index 65cffcae8a..240e6f4a81 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -306,8 +306,7 @@ void tcg_prologue_init(TCGContext *s) #endif } -void tcg_set_frame(TCGContext *s, int reg, - tcg_target_long start, tcg_target_long size) +void tcg_set_frame(TCGContext *s, int reg, intptr_t start, intptr_t size) { s->frame_start = start; s->frame_end = start + size; @@ -1613,7 +1612,7 @@ static void temp_allocate_frame(TCGContext *s, int temp) ts->mem_offset = s->current_frame_offset; ts->mem_reg = s->frame_reg; ts->mem_allocated = 1; - s->current_frame_offset += (tcg_target_long)sizeof(tcg_target_long); + s->current_frame_offset += sizeof(tcg_target_long); } /* sync register 'reg' by saving it to the corresponding temporary */ diff --git a/tcg/tcg.h b/tcg/tcg.h index bb215a73e8..b7e112e534 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -435,9 +435,9 @@ struct TCGContext { into account fixed registers */ int reg_to_temp[TCG_TARGET_NB_REGS]; TCGRegSet reserved_regs; - tcg_target_long current_frame_offset; - tcg_target_long frame_start; - tcg_target_long frame_end; + intptr_t current_frame_offset; + intptr_t frame_start; + intptr_t frame_end; int frame_reg; uint8_t *code_ptr; @@ -530,8 +530,7 @@ void tcg_func_start(TCGContext *s); int tcg_gen_code(TCGContext *s, uint8_t *gen_code_buf); int tcg_gen_code_search_pc(TCGContext *s, uint8_t *gen_code_buf, long offset); -void tcg_set_frame(TCGContext *s, int reg, - tcg_target_long start, tcg_target_long size); +void tcg_set_frame(TCGContext *s, int reg, intptr_t start, intptr_t size); TCGv_i32 tcg_global_reg_new_i32(int reg, const char *name); TCGv_i32 tcg_global_mem_new_i32(int reg, tcg_target_long offset,