[Qemu-devel] [5545] CRIS: Correct tcg globals allocation for 64bit hosts.

[Qemu-devel] [5545] CRIS: Correct tcg globals allocation for 64bit hosts.

[Edgar E. Iglesias]

Revision: 5545
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5545
Author:   edgar_igl
Date:     2008-10-26 23:18:06 +0000 (Sun, 26 Oct 2008)

Log Message:
-----------
CRIS: Correct tcg globals allocation for 64bit hosts.

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

Modified Paths:
--------------
    trunk/target-cris/translate.c

Modified: trunk/target-cris/translate.c
===================================================================
--- trunk/target-cris/translate.c	2008-10-26 20:33:16 UTC (rev 5544)
+++ trunk/target-cris/translate.c	2008-10-26 23:18:06 UTC (rev 5545)
@@ -3347,41 +3347,41 @@
 	cpu_T[1] = tcg_global_reg_new(TCG_TYPE_TL, TCG_AREG2, "T1");
 #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");
-	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");
-	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),
 				     "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),
 				       "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");
-	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),
 				     "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),
 				     "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),
 				    "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),
 					 "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),
 					 "btaken");
 	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]),
 					      regnames[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]),
 					       pregnames[i]);
 	}

Re: [Qemu-devel] [5545] CRIS: Correct tcg globals allocation for 64bit hosts.

[Laurent Desnogues]

On Mon, Oct 27, 2008 at 1:18 AM, Edgar E. Iglesias
<edgar.iglesias@gmail.com> wrote:
> Revision: 5545
>          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5545
> Author:   edgar_igl
> Date:     2008-10-26 23:18:06 +0000 (Sun, 26 Oct 2008)
>
> Log Message:
> -----------
> CRIS: Correct tcg globals allocation for 64bit hosts.

This fixes Cris Linux boot on x86_64.  I could reach the prompt
and type some commands.  Well done :)


Laurent