Commit 2f2f244d authored by Richard Henderson's avatar Richard Henderson
Browse files

tcg: Change memory offsets to intptr_t 



Reviewed-by: default avatarAurelien Jarno <aurelien@aurel32.net>
Signed-off-by: default avatarRichard Henderson <rth@twiddle.net>
parent e2c6d1b4

tcg/tcg.c

+5 −11
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ TCGv_i64 tcg_global_reg_new_i64(int reg, const char *name) 
}



static inline int tcg_global_mem_new_internal(TCGType type, int reg,

                                              tcg_target_long offset,

                                              intptr_t offset,

                                              const char *name)

{

    TCGContext *s = &tcg_ctx;
@@ -449,21 +449,15 @@ static inline int tcg_global_mem_new_internal(TCGType type, int reg, 
    return idx;

}



TCGv_i32 tcg_global_mem_new_i32(int reg, tcg_target_long offset,

                                const char *name)

TCGv_i32 tcg_global_mem_new_i32(int reg, intptr_t offset, const char *name)

{

    int idx;



    idx = tcg_global_mem_new_internal(TCG_TYPE_I32, reg, offset, name);

    int idx = tcg_global_mem_new_internal(TCG_TYPE_I32, reg, offset, name);

    return MAKE_TCGV_I32(idx);

}



TCGv_i64 tcg_global_mem_new_i64(int reg, tcg_target_long offset,

                                const char *name)

TCGv_i64 tcg_global_mem_new_i64(int reg, intptr_t offset, const char *name)

{

    int idx;



    idx = tcg_global_mem_new_internal(TCG_TYPE_I64, reg, offset, name);

    int idx = tcg_global_mem_new_internal(TCG_TYPE_I64, reg, offset, name);

    return MAKE_TCGV_I64(idx);

}

tcg/tcg.h

+3 −5
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ typedef struct TCGTemp { 
    int reg;

    tcg_target_long val;

    int mem_reg;

    tcg_target_long mem_offset;

    intptr_t mem_offset;

    unsigned int fixed_reg:1;

    unsigned int mem_coherent:1;

    unsigned int mem_allocated:1;
@@ -533,8 +533,7 @@ int tcg_gen_code_search_pc(TCGContext *s, uint8_t *gen_code_buf, long offset); 
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,

                                const char *name);

TCGv_i32 tcg_global_mem_new_i32(int reg, intptr_t offset, const char *name);

TCGv_i32 tcg_temp_new_internal_i32(int temp_local);

static inline TCGv_i32 tcg_temp_new_i32(void)

{
@@ -548,8 +547,7 @@ void tcg_temp_free_i32(TCGv_i32 arg); 
char *tcg_get_arg_str_i32(TCGContext *s, char *buf, int buf_size, TCGv_i32 arg);



TCGv_i64 tcg_global_reg_new_i64(int reg, const char *name);

TCGv_i64 tcg_global_mem_new_i64(int reg, tcg_target_long offset,

                                const char *name);

TCGv_i64 tcg_global_mem_new_i64(int reg, intptr_t offset, const char *name);

TCGv_i64 tcg_temp_new_internal_i64(int temp_local);

static inline TCGv_i64 tcg_temp_new_i64(void)

{