From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LrghB-0000Hu-Fo for qemu-devel@nongnu.org; Wed, 08 Apr 2009 18:56:37 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Lrgh9-0000Gm-5I for qemu-devel@nongnu.org; Wed, 08 Apr 2009 18:56:36 -0400 Received: from [199.232.76.173] (port=53226 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lrgh8-0000Gc-PK for qemu-devel@nongnu.org; Wed, 08 Apr 2009 18:56:34 -0400 Received: from savannah.gnu.org ([199.232.41.3]:36123 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 1Lrgh8-00029A-Fn for qemu-devel@nongnu.org; Wed, 08 Apr 2009 18:56:34 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Lrgh7-0005T0-Tr for qemu-devel@nongnu.org; Wed, 08 Apr 2009 22:56:33 +0000 Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.69) (envelope-from ) id 1Lrgh7-0005Sw-O4 for qemu-devel@nongnu.org; Wed, 08 Apr 2009 22:56:33 +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: Wed, 08 Apr 2009 22:56:33 +0000 Subject: [Qemu-devel] [7049] pcnet: Avoid double conversion via PHYSADDR 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: 7049 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7049 Author: aurel32 Date: 2009-04-08 22:56:33 +0000 (Wed, 08 Apr 2009) Log Message: ----------- pcnet: Avoid double conversion via PHYSADDR rdra and tdra are already kept converted in the pcnet state structure. Avoid converting derivatives a second time. The same case with the local variable xmit_cxda: it already contains a converted cxda address. This issue only causes troubles when using the pcnet in 16-bit legacy mode. Signed-off-by: Jan Kiszka Signed-off-by: Aurelien Jarno Modified Paths: -------------- trunk/hw/pcnet.c Modified: trunk/hw/pcnet.c =================================================================== --- trunk/hw/pcnet.c 2009-04-08 22:56:26 UTC (rev 7048) +++ trunk/hw/pcnet.c 2009-04-08 22:56:33 UTC (rev 7049) @@ -964,11 +964,11 @@ (BCR_SWSTYLE(s) ? 16 : 8 ); #endif - CHECK_RMD(PHYSADDR(s,crda), bad); + CHECK_RMD(crda, bad); if (!bad) { - CHECK_RMD(PHYSADDR(s,nrda), bad); + CHECK_RMD(nrda, bad); if (bad || (nrda == crda)) nrda = 0; - CHECK_RMD(PHYSADDR(s,nnrd), bad); + CHECK_RMD(nnrd, bad); if (bad || (nnrd == crda)) nnrd = 0; s->csr[28] = crda & 0xffff; @@ -980,11 +980,11 @@ #ifdef PCNET_DEBUG if (bad) { printf("pcnet: BAD RMD RECORDS AFTER 0x" TARGET_FMT_plx "\n", - PHYSADDR(s,crda)); + crda); } } else { printf("pcnet: BAD RMD RDA=0x" TARGET_FMT_plx "\n", - PHYSADDR(s,crda)); + crda); #endif } } @@ -1023,7 +1023,7 @@ (CSR_XMTRL(s) - CSR_XMTRC(s)) * (BCR_SWSTYLE(s) ? 16 : 8); int bad = 0; - CHECK_TMD(PHYSADDR(s, cxda),bad); + CHECK_TMD(cxda, bad); if (!bad) { if (CSR_CXDA(s) != cxda) { s->csr[60] = s->csr[34]; @@ -1034,7 +1034,7 @@ s->csr[34] = cxda & 0xffff; s->csr[35] = cxda >> 16; #ifdef PCNET_DEBUG_X - printf("pcnet: BAD TMD XDA=0x%08x\n", PHYSADDR(s,cxda)); + printf("pcnet: BAD TMD XDA=0x%08x\n", cxda); #endif } } @@ -1107,7 +1107,7 @@ nrda = s->rdra + (CSR_RCVRL(s) - rcvrc) * (BCR_SWSTYLE(s) ? 16 : 8 ); - RMDLOAD(&rmd, PHYSADDR(s,nrda)); + RMDLOAD(&rmd, nrda); if (GET_FIELD(rmd.status, RMDS, OWN)) { #ifdef PCNET_DEBUG_RMD printf("pcnet - scan buffer: RCVRC=%d PREV_RCVRC=%d\n", @@ -1319,12 +1319,12 @@ } else if (s->xmit_pos >= 0) { struct pcnet_TMD tmd; - TMDLOAD(&tmd, PHYSADDR(s,xmit_cxda)); + TMDLOAD(&tmd, xmit_cxda); SET_FIELD(&tmd.misc, TMDM, BUFF, 1); SET_FIELD(&tmd.misc, TMDM, UFLO, 1); SET_FIELD(&tmd.status, TMDS, ERR, 1); SET_FIELD(&tmd.status, TMDS, OWN, 0); - TMDSTORE(&tmd, PHYSADDR(s,xmit_cxda)); + TMDSTORE(&tmd, xmit_cxda); s->csr[0] |= 0x0200; /* set TINT */ if (!CSR_DXSUFLO(s)) { s->csr[0] &= ~0x0010;