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
This commit is contained in:
parent
84778508d7
commit
4f9cc92764
|
@ -3347,41 +3347,41 @@ CPUCRISState *cpu_cris_init (const char *cpu_model)
|
||||||
cpu_T[1] = tcg_global_reg_new(TCG_TYPE_TL, TCG_AREG2, "T1");
|
cpu_T[1] = tcg_global_reg_new(TCG_TYPE_TL, TCG_AREG2, "T1");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
cc_x = tcg_global_mem_new(TCG_TYPE_PTR, TCG_AREG0,
|
cc_x = tcg_global_mem_new(TCG_TYPE_TL, TCG_AREG0,
|
||||||
offsetof(CPUState, cc_x), "cc_x");
|
offsetof(CPUState, cc_x), "cc_x");
|
||||||
cc_src = tcg_global_mem_new(TCG_TYPE_PTR, TCG_AREG0,
|
cc_src = tcg_global_mem_new(TCG_TYPE_TL, TCG_AREG0,
|
||||||
offsetof(CPUState, cc_src), "cc_src");
|
offsetof(CPUState, cc_src), "cc_src");
|
||||||
cc_dest = tcg_global_mem_new(TCG_TYPE_PTR, TCG_AREG0,
|
cc_dest = tcg_global_mem_new(TCG_TYPE_TL, TCG_AREG0,
|
||||||
offsetof(CPUState, cc_dest),
|
offsetof(CPUState, cc_dest),
|
||||||
"cc_dest");
|
"cc_dest");
|
||||||
cc_result = tcg_global_mem_new(TCG_TYPE_PTR, TCG_AREG0,
|
cc_result = tcg_global_mem_new(TCG_TYPE_TL, TCG_AREG0,
|
||||||
offsetof(CPUState, cc_result),
|
offsetof(CPUState, cc_result),
|
||||||
"cc_result");
|
"cc_result");
|
||||||
cc_op = tcg_global_mem_new(TCG_TYPE_PTR, TCG_AREG0,
|
cc_op = tcg_global_mem_new(TCG_TYPE_TL, TCG_AREG0,
|
||||||
offsetof(CPUState, cc_op), "cc_op");
|
offsetof(CPUState, cc_op), "cc_op");
|
||||||
cc_size = tcg_global_mem_new(TCG_TYPE_PTR, TCG_AREG0,
|
cc_size = tcg_global_mem_new(TCG_TYPE_TL, TCG_AREG0,
|
||||||
offsetof(CPUState, cc_size),
|
offsetof(CPUState, cc_size),
|
||||||
"cc_size");
|
"cc_size");
|
||||||
cc_mask = tcg_global_mem_new(TCG_TYPE_PTR, TCG_AREG0,
|
cc_mask = tcg_global_mem_new(TCG_TYPE_TL, TCG_AREG0,
|
||||||
offsetof(CPUState, cc_mask),
|
offsetof(CPUState, cc_mask),
|
||||||
"cc_mask");
|
"cc_mask");
|
||||||
|
|
||||||
env_pc = tcg_global_mem_new(TCG_TYPE_PTR, TCG_AREG0,
|
env_pc = tcg_global_mem_new(TCG_TYPE_TL, TCG_AREG0,
|
||||||
offsetof(CPUState, pc),
|
offsetof(CPUState, pc),
|
||||||
"pc");
|
"pc");
|
||||||
env_btarget = tcg_global_mem_new(TCG_TYPE_PTR, TCG_AREG0,
|
env_btarget = tcg_global_mem_new(TCG_TYPE_TL, TCG_AREG0,
|
||||||
offsetof(CPUState, btarget),
|
offsetof(CPUState, btarget),
|
||||||
"btarget");
|
"btarget");
|
||||||
env_btaken = tcg_global_mem_new(TCG_TYPE_PTR, TCG_AREG0,
|
env_btaken = tcg_global_mem_new(TCG_TYPE_TL, TCG_AREG0,
|
||||||
offsetof(CPUState, btaken),
|
offsetof(CPUState, btaken),
|
||||||
"btaken");
|
"btaken");
|
||||||
for (i = 0; i < 16; i++) {
|
for (i = 0; i < 16; i++) {
|
||||||
cpu_R[i] = tcg_global_mem_new(TCG_TYPE_PTR, TCG_AREG0,
|
cpu_R[i] = tcg_global_mem_new(TCG_TYPE_TL, TCG_AREG0,
|
||||||
offsetof(CPUState, regs[i]),
|
offsetof(CPUState, regs[i]),
|
||||||
regnames[i]);
|
regnames[i]);
|
||||||
}
|
}
|
||||||
for (i = 0; i < 16; i++) {
|
for (i = 0; i < 16; i++) {
|
||||||
cpu_PR[i] = tcg_global_mem_new(TCG_TYPE_PTR, TCG_AREG0,
|
cpu_PR[i] = tcg_global_mem_new(TCG_TYPE_TL, TCG_AREG0,
|
||||||
offsetof(CPUState, pregs[i]),
|
offsetof(CPUState, pregs[i]),
|
||||||
pregnames[i]);
|
pregnames[i]);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue