haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

tcg: Change memory offsets to intptr_t

Browse source 
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Richard Henderson 2013-08-20 15:17:25 -07:00
parent e2c6d1b42d
commit 2f2f244d02
2 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tcg/tcg.c
View file

@ -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, static inline int tcg_global_mem_new_internal(TCGType type, int reg,
tcg_target_long offset, intptr_t offset,
const char *name) const char *name)
{ {
TCGContext *s = &tcg_ctx; TCGContext *s = &tcg_ctx;
@ -449,21 +449,15 @@ static inline int tcg_global_mem_new_internal(TCGType type, int reg,
return idx; return idx;
} }
TCGv_i32 tcg_global_mem_new_i32(int reg, tcg_target_long offset, TCGv_i32 tcg_global_mem_new_i32(int reg, intptr_t offset, const char *name)
const char *name)
{ {
int idx; int idx = tcg_global_mem_new_internal(TCG_TYPE_I32, reg, offset, name);
idx = tcg_global_mem_new_internal(TCG_TYPE_I32, reg, offset, name);
return MAKE_TCGV_I32(idx); return MAKE_TCGV_I32(idx);
} }
TCGv_i64 tcg_global_mem_new_i64(int reg, tcg_target_long offset, TCGv_i64 tcg_global_mem_new_i64(int reg, intptr_t offset, const char *name)
const char *name)
{ {
int idx; int idx = tcg_global_mem_new_internal(TCG_TYPE_I64, reg, offset, name);
idx = tcg_global_mem_new_internal(TCG_TYPE_I64, reg, offset, name);
return MAKE_TCGV_I64(idx); return MAKE_TCGV_I64(idx);
} }

8
tcg/tcg.h
View file

@ -388,7 +388,7 @@ typedef struct TCGTemp {
int reg; int reg;
tcg_target_long val; tcg_target_long val;
int mem_reg; int mem_reg;
tcg_target_long mem_offset; intptr_t mem_offset;
unsigned int fixed_reg:1; unsigned int fixed_reg:1;
unsigned int mem_coherent:1; unsigned int mem_coherent:1;
unsigned int mem_allocated: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); 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_reg_new_i32(int reg, const char *name);
TCGv_i32 tcg_global_mem_new_i32(int reg, tcg_target_long offset, TCGv_i32 tcg_global_mem_new_i32(int reg, intptr_t offset, const char *name);
const char *name);
TCGv_i32 tcg_temp_new_internal_i32(int temp_local); TCGv_i32 tcg_temp_new_internal_i32(int temp_local);
static inline TCGv_i32 tcg_temp_new_i32(void) 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); 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_reg_new_i64(int reg, const char *name);
TCGv_i64 tcg_global_mem_new_i64(int reg, tcg_target_long offset, TCGv_i64 tcg_global_mem_new_i64(int reg, intptr_t offset, const char *name);
const char *name);
TCGv_i64 tcg_temp_new_internal_i64(int temp_local); TCGv_i64 tcg_temp_new_internal_i64(int temp_local);
static inline TCGv_i64 tcg_temp_new_i64(void) static inline TCGv_i64 tcg_temp_new_i64(void)
{ {