From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LsOFp-0004cP-Pm for qemu-devel@nongnu.org; Fri, 10 Apr 2009 17:27:18 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LsOFp-0004bi-AQ for qemu-devel@nongnu.org; Fri, 10 Apr 2009 17:27:17 -0400 Received: from [199.232.76.173] (port=34457 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LsOFo-0004bX-Ud for qemu-devel@nongnu.org; Fri, 10 Apr 2009 17:27:16 -0400 Received: from savannah.gnu.org ([199.232.41.3]:53667 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 ) id 1LsOFo-0008D2-Jy for qemu-devel@nongnu.org; Fri, 10 Apr 2009 17:27:16 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1LsOFo-0005uE-2S for qemu-devel@nongnu.org; Fri, 10 Apr 2009 21:27:16 +0000 Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.69) (envelope-from ) id 1LsOFn-0005u7-Pe for qemu-devel@nongnu.org; Fri, 10 Apr 2009 21:27:15 +0000 MIME-Version: 1.0 Errors-To: aurel32 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Aurelien Jarno Message-Id: Date: Fri, 10 Apr 2009 21:27:15 +0000 Subject: [Qemu-devel] [7073] target-alpha: overflow condition for sublv and subqv Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 7073 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7073 Author: aurel32 Date: 2009-04-10 21:27:15 +0000 (Fri, 10 Apr 2009) Log Message: ----------- target-alpha: overflow condition for sublv and subqv The conditions to detect overflow in sub operations was wrong. This patch is necessary to boot Tru64. Signed-off-by: Tristan Gingold Signed-off-by: Aurelien Jarno Modified Paths: -------------- trunk/target-alpha/op_helper.c trunk/tests/alpha/Makefile Added Paths: ----------- trunk/tests/alpha/test-ovf.c Modified: trunk/target-alpha/op_helper.c =================================================================== --- trunk/target-alpha/op_helper.c 2009-04-10 21:26:55 UTC (rev 7072) +++ trunk/target-alpha/op_helper.c 2009-04-10 21:27:15 UTC (rev 7073) @@ -158,22 +158,22 @@ uint64_t helper_subqv (uint64_t op1, uint64_t op2) { - uint64_t tmp = op1; - op1 -= op2; - if (unlikely(((~tmp) ^ op1 ^ (-1ULL)) & ((~tmp) ^ op2) & (1ULL << 63))) { + uint64_t res; + res = op1 - op2; + if (unlikely((op1 ^ op2) & (res ^ op1) & (1ULL << 63))) { helper_excp(EXCP_ARITH, EXCP_ARITH_OVERFLOW); } - return op1; + return res; } uint64_t helper_sublv (uint64_t op1, uint64_t op2) { - uint64_t tmp = op1; - op1 = (uint32_t)(op1 - op2); - if (unlikely(((~tmp) ^ op1 ^ (-1UL)) & ((~tmp) ^ op2) & (1UL << 31))) { + uint32_t res; + res = op1 - op2; + if (unlikely((op1 ^ op2) & (res ^ op1) & (1UL << 31))) { helper_excp(EXCP_ARITH, EXCP_ARITH_OVERFLOW); } - return op1; + return res; } uint64_t helper_mullv (uint64_t op1, uint64_t op2) Modified: trunk/tests/alpha/Makefile =================================================================== --- trunk/tests/alpha/Makefile 2009-04-10 21:26:55 UTC (rev 7072) +++ trunk/tests/alpha/Makefile 2009-04-10 21:27:15 UTC (rev 7073) @@ -23,6 +23,9 @@ test-cmov: test-cmov.o crt.o $(LINK) +test-ovf: test-ovf.o crt.o + $(LINK) + check: $(TESTS) for f in $(TESTS); do $(SIM) $$f || exit 1; done Added: trunk/tests/alpha/test-ovf.c =================================================================== --- trunk/tests/alpha/test-ovf.c (rev 0) +++ trunk/tests/alpha/test-ovf.c 2009-04-10 21:27:15 UTC (rev 7073) @@ -0,0 +1,29 @@ +static long test_subqv (long a, long b) +{ + long res; + + asm ("subq/v %1,%2,%0" + : "=r" (res) : "r" (a), "r" (b)); + return res; +} +static struct { + long (*func)(long, long); + long a; + long b; + long r; +} vectors[] = + { + {test_subqv, 0, 0x7d54000, 0xfffffffff82ac000L} + }; + +int main (void) +{ + int i; + + for (i = 0; i < sizeof (vectors)/sizeof(vectors[0]); i++) + if ((*vectors[i].func)(vectors[i].a, vectors[i].b) != vectors[i].r) { + write(1, "Failed\n", 7); + } + write(1, "OK\n", 3); + return 0; +}