From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1K02fa-0003Ay-Mh
	for qemu-devel@nongnu.org; Sat, 24 May 2008 18:56:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1K02fa-00039u-1Q
	for qemu-devel@nongnu.org; Sat, 24 May 2008 18:56:58 -0400
Received: from [199.232.76.173] (port=57050 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1K02fZ-00039i-U6
	for qemu-devel@nongnu.org; Sat, 24 May 2008 18:56:57 -0400
Received: from savannah.gnu.org ([199.232.41.3]:51048 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <balrogg@gmail.com>) id 1K02fZ-0000rR-Ha
	for qemu-devel@nongnu.org; Sat, 24 May 2008 18:56:57 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <balrogg@gmail.com>) id 1K02fU-0001h5-4d
	for qemu-devel@nongnu.org; Sat, 24 May 2008 22:56:52 +0000
Received: from balrog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <balrog@savannah.gnu.org>) id 1K02fT-0001h0-U3
	for qemu-devel@nongnu.org; Sat, 24 May 2008 22:56:52 +0000
MIME-Version: 1.0
Errors-To: balrog
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Andrzej Zaborowski <balrogg@gmail.com>
Message-Id: <E1K02fT-0001h0-U3@cvs.savannah.gnu.org>
Date: Sat, 24 May 2008 22:56:51 +0000
Subject: [Qemu-devel] [4566] Fix a deadly typo, correct comments.
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 4566
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4566
Author:   balrog
Date:     2008-05-24 22:56:51 +0000 (Sat, 24 May 2008)

Log Message:
-----------
Fix a deadly typo, correct comments.

Modified Paths:
--------------
    trunk/tcg/arm/tcg-target.c

Modified: trunk/tcg/arm/tcg-target.c
===================================================================
--- trunk/tcg/arm/tcg-target.c	2008-05-24 22:29:16 UTC (rev 4565)
+++ trunk/tcg/arm/tcg-target.c	2008-05-24 22:56:51 UTC (rev 4566)
@@ -78,7 +78,7 @@
         tcg_abort();
 
     case R_ARM_PC24:
-        *(uint32_t *) code_ptr |= (*(uint32_t *) code_ptr & 0xff000000) |
+        *(uint32_t *) code_ptr = ((*(uint32_t *) code_ptr) & 0xff000000) |
                 (((value - ((tcg_target_long) code_ptr + 8)) >> 2) & 0xffffff);
         break;
     }
@@ -109,7 +109,7 @@
         break;
 
 #ifdef CONFIG_SOFTMMU
-    /* qemu_ld/st inputs (unless 'd', 'D' or 'X') */
+    /* qemu_ld/st inputs (unless 'X' or 'D') */
     case 'x':
         ct->ct |= TCG_CT_REG;
         tcg_regset_set32(ct->u.regs, 0, (1 << TCG_TARGET_NB_REGS) - 1);
@@ -995,7 +995,8 @@
         tcg_out_ld32_12(s, COND_AL, data_reg, addr_reg, 0);
         break;
     case 3:
-        /* TODO: use block load */
+        /* TODO: use block load -
+         * check that data_reg2 > data_reg or the other way */
         tcg_out_ld32_12(s, COND_AL, data_reg, addr_reg, 0);
         tcg_out_ld32_12(s, COND_AL, data_reg2, addr_reg, 4);
         break;
@@ -1200,7 +1201,8 @@
         tcg_out_st32_12(s, COND_AL, data_reg, addr_reg, 0);
         break;
     case 3:
-        /* TODO: use block store */
+        /* TODO: use block store -
+         * check that data_reg2 > data_reg or the other way */
         tcg_out_st32_12(s, COND_AL, data_reg, addr_reg, 0);
         tcg_out_st32_12(s, COND_AL, data_reg2, addr_reg, 4);
         break;