From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Kes5G-0006s1-DQ for qemu-devel@nongnu.org; Sun, 14 Sep 2008 09:56:14 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Kes5E-0006rn-WA for qemu-devel@nongnu.org; Sun, 14 Sep 2008 09:56:13 -0400 Received: from [199.232.76.173] (port=45268 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Kes5E-0006rk-R2 for qemu-devel@nongnu.org; Sun, 14 Sep 2008 09:56:12 -0400 Received: from savannah.gnu.org ([199.232.41.3]:33579 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 1Kes5E-0002Lk-Cs for qemu-devel@nongnu.org; Sun, 14 Sep 2008 09:56:12 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1Kes5D-0003JN-N3 for qemu-devel@nongnu.org; Sun, 14 Sep 2008 13:56:11 +0000 Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1Kes5D-0003JJ-EQ for qemu-devel@nongnu.org; Sun, 14 Sep 2008 13:56:11 +0000 MIME-Version: 1.0 Errors-To: blueswir1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Blue Swirl Message-Id: Date: Sun, 14 Sep 2008 13:56:11 +0000 Subject: [Qemu-devel] [5209] Revert incorrect part of r4574 to avoid unaligned traps with i386 target 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: 5209 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5209 Author: blueswir1 Date: 2008-09-14 13:56:10 +0000 (Sun, 14 Sep 2008) Log Message: ----------- Revert incorrect part of r4574 to avoid unaligned traps with i386 target Modified Paths: -------------- trunk/cpu-all.h Modified: trunk/cpu-all.h =================================================================== --- trunk/cpu-all.h 2008-09-14 07:45:17 UTC (rev 5208) +++ trunk/cpu-all.h 2008-09-14 13:56:10 UTC (rev 5209) @@ -233,15 +233,6 @@ int val; __asm__ __volatile__ ("lhbrx %0,0,%1" : "=r" (val) : "r" (ptr)); return val; -#elif defined(__sparc__) -#ifndef ASI_PRIMARY_LITTLE -#define ASI_PRIMARY_LITTLE 0x88 -#endif - - int val; - __asm__ __volatile__ ("lduha [%1] %2, %0" : "=r" (val) : "r" (ptr), - "i" (ASI_PRIMARY_LITTLE)); - return val; #else uint8_t *p = ptr; return p[0] | (p[1] << 8); @@ -254,11 +245,6 @@ int val; __asm__ __volatile__ ("lhbrx %0,0,%1" : "=r" (val) : "r" (ptr)); return (int16_t)val; -#elif defined(__sparc__) - int val; - __asm__ __volatile__ ("ldsha [%1] %2, %0" : "=r" (val) : "r" (ptr), - "i" (ASI_PRIMARY_LITTLE)); - return val; #else uint8_t *p = ptr; return (int16_t)(p[0] | (p[1] << 8)); @@ -271,11 +257,6 @@ int val; __asm__ __volatile__ ("lwbrx %0,0,%1" : "=r" (val) : "r" (ptr)); return val; -#elif defined(__sparc__) - int val; - __asm__ __volatile__ ("lduwa [%1] %2, %0" : "=r" (val) : "r" (ptr), - "i" (ASI_PRIMARY_LITTLE)); - return val; #else uint8_t *p = ptr; return p[0] | (p[1] << 8) | (p[2] << 16) | (p[3] << 24); @@ -284,27 +265,17 @@ static inline uint64_t ldq_le_p(void *ptr) { -#if defined(__sparc__) - uint64_t val; - __asm__ __volatile__ ("ldxa [%1] %2, %0" : "=r" (val) : "r" (ptr), - "i" (ASI_PRIMARY_LITTLE)); - return val; -#else uint8_t *p = ptr; uint32_t v1, v2; v1 = ldl_le_p(p); v2 = ldl_le_p(p + 4); return v1 | ((uint64_t)v2 << 32); -#endif } static inline void stw_le_p(void *ptr, int v) { #ifdef __powerpc__ __asm__ __volatile__ ("sthbrx %1,0,%2" : "=m" (*(uint16_t *)ptr) : "r" (v), "r" (ptr)); -#elif defined(__sparc__) - __asm__ __volatile__ ("stha %1, [%2] %3" : "=m" (*(uint16_t *)ptr) : "r" (v), - "r" (ptr), "i" (ASI_PRIMARY_LITTLE)); #else uint8_t *p = ptr; p[0] = v; @@ -316,9 +287,6 @@ { #ifdef __powerpc__ __asm__ __volatile__ ("stwbrx %1,0,%2" : "=m" (*(uint32_t *)ptr) : "r" (v), "r" (ptr)); -#elif defined(__sparc__) - __asm__ __volatile__ ("stwa %1, [%2] %3" : "=m" (*(uint32_t *)ptr) : "r" (v), - "r" (ptr), "i" (ASI_PRIMARY_LITTLE)); #else uint8_t *p = ptr; p[0] = v; @@ -330,15 +298,9 @@ static inline void stq_le_p(void *ptr, uint64_t v) { -#if defined(__sparc__) - __asm__ __volatile__ ("stxa %1, [%2] %3" : "=m" (*(uint64_t *)ptr) : "r" (v), - "r" (ptr), "i" (ASI_PRIMARY_LITTLE)); -#undef ASI_PRIMARY_LITTLE -#else uint8_t *p = ptr; stl_le_p(p, (uint32_t)v); stl_le_p(p + 4, v >> 32); -#endif } /* float access */