gwj / at91sam9263 · Commits

Commit 4f9cc92764f254bf2062c66e0922697932766aaf

Authored by edgar_igl
1 parent 84778508

CRIS: Correct tcg globals allocation for 64bit hosts. 

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5545 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 12 additions and 12 deletions
target-cris/translate.c
  View file @4f9cc92
@@ -3347,41 +3347,41 @@ CPUCRISState *cpu_cris_init (const char *cpu_model) @@ -3347,41 +3347,41 @@ CPUCRISState *cpu_cris_init (const char *cpu_model)
3347 cpu_T[1] = tcg_global_reg_new(TCG_TYPE_TL, TCG_AREG2, "T1"); 3347 cpu_T[1] = tcg_global_reg_new(TCG_TYPE_TL, TCG_AREG2, "T1");
3348 #endif 3348 #endif
3349 3349
3350 - cc_x = tcg_global_mem_new(TCG_TYPE_PTR, TCG_AREG0, 3350 + cc_x = tcg_global_mem_new(TCG_TYPE_TL, TCG_AREG0,
3351 offsetof(CPUState, cc_x), "cc_x"); 3351 offsetof(CPUState, cc_x), "cc_x");
3352 - cc_src = tcg_global_mem_new(TCG_TYPE_PTR, TCG_AREG0, 3352 + cc_src = tcg_global_mem_new(TCG_TYPE_TL, TCG_AREG0,
3353 offsetof(CPUState, cc_src), "cc_src"); 3353 offsetof(CPUState, cc_src), "cc_src");
3354 - cc_dest = tcg_global_mem_new(TCG_TYPE_PTR, TCG_AREG0, 3354 + cc_dest = tcg_global_mem_new(TCG_TYPE_TL, TCG_AREG0,
3355 offsetof(CPUState, cc_dest), 3355 offsetof(CPUState, cc_dest),
3356 "cc_dest"); 3356 "cc_dest");
3357 - cc_result = tcg_global_mem_new(TCG_TYPE_PTR, TCG_AREG0, 3357 + cc_result = tcg_global_mem_new(TCG_TYPE_TL, TCG_AREG0,
3358 offsetof(CPUState, cc_result), 3358 offsetof(CPUState, cc_result),
3359 "cc_result"); 3359 "cc_result");
3360 - cc_op = tcg_global_mem_new(TCG_TYPE_PTR, TCG_AREG0, 3360 + cc_op = tcg_global_mem_new(TCG_TYPE_TL, TCG_AREG0,
3361 offsetof(CPUState, cc_op), "cc_op"); 3361 offsetof(CPUState, cc_op), "cc_op");
3362 - cc_size = tcg_global_mem_new(TCG_TYPE_PTR, TCG_AREG0, 3362 + cc_size = tcg_global_mem_new(TCG_TYPE_TL, TCG_AREG0,
3363 offsetof(CPUState, cc_size), 3363 offsetof(CPUState, cc_size),
3364 "cc_size"); 3364 "cc_size");
3365 - cc_mask = tcg_global_mem_new(TCG_TYPE_PTR, TCG_AREG0, 3365 + cc_mask = tcg_global_mem_new(TCG_TYPE_TL, TCG_AREG0,
3366 offsetof(CPUState, cc_mask), 3366 offsetof(CPUState, cc_mask),
3367 "cc_mask"); 3367 "cc_mask");
3368 3368
3369 - env_pc = tcg_global_mem_new(TCG_TYPE_PTR, TCG_AREG0, 3369 + env_pc = tcg_global_mem_new(TCG_TYPE_TL, TCG_AREG0,
3370 offsetof(CPUState, pc), 3370 offsetof(CPUState, pc),
3371 "pc"); 3371 "pc");
3372 - env_btarget = tcg_global_mem_new(TCG_TYPE_PTR, TCG_AREG0, 3372 + env_btarget = tcg_global_mem_new(TCG_TYPE_TL, TCG_AREG0,
3373 offsetof(CPUState, btarget), 3373 offsetof(CPUState, btarget),
3374 "btarget"); 3374 "btarget");
3375 - env_btaken = tcg_global_mem_new(TCG_TYPE_PTR, TCG_AREG0, 3375 + env_btaken = tcg_global_mem_new(TCG_TYPE_TL, TCG_AREG0,
3376 offsetof(CPUState, btaken), 3376 offsetof(CPUState, btaken),
3377 "btaken"); 3377 "btaken");
3378 for (i = 0; i < 16; i++) { 3378 for (i = 0; i < 16; i++) {
3379 - cpu_R[i] = tcg_global_mem_new(TCG_TYPE_PTR, TCG_AREG0, 3379 + cpu_R[i] = tcg_global_mem_new(TCG_TYPE_TL, TCG_AREG0,
3380 offsetof(CPUState, regs[i]), 3380 offsetof(CPUState, regs[i]),
3381 regnames[i]); 3381 regnames[i]);
3382 } 3382 }
3383 for (i = 0; i < 16; i++) { 3383 for (i = 0; i < 16; i++) {
3384 - cpu_PR[i] = tcg_global_mem_new(TCG_TYPE_PTR, TCG_AREG0, 3384 + cpu_PR[i] = tcg_global_mem_new(TCG_TYPE_TL, TCG_AREG0,
3385 offsetof(CPUState, pregs[i]), 3385 offsetof(CPUState, pregs[i]),
3386 pregnames[i]); 3386 pregnames[i]);
3387 } 3387 }