From patchwork Mon May 12 23:30:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 348144 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 0943D140082 for ; Tue, 13 May 2014 09:36:41 +1000 (EST) Received: from localhost ([::1]:40613 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wjzlv-0001Ay-0I for incoming@patchwork.ozlabs.org; Mon, 12 May 2014 19:36:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59132) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WjzhL-0004cL-4b for qemu-devel@nongnu.org; Mon, 12 May 2014 19:32:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WjzhG-0005lp-Cr for qemu-devel@nongnu.org; Mon, 12 May 2014 19:31:55 -0400 Received: from mail-qc0-x22d.google.com ([2607:f8b0:400d:c01::22d]:39232) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WjzhG-0005lf-9M for qemu-devel@nongnu.org; Mon, 12 May 2014 19:31:50 -0400 Received: by mail-qc0-f173.google.com with SMTP id i8so8760659qcq.32 for ; Mon, 12 May 2014 16:31:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=JvB5cO2ZWTj13YEZaRWeeaUeCzBjek2s1vnJYaUmpoQ=; b=STbjHZvdfpd7s1uy9aQ6o93WiC+EgmFXF/pa29hjylalOEJNyaYc0D1n3ZOJnRsbmg 0NYqP7ID6a+tSNBfxwnsf+Sbf4G0W/xuYwvoz0jBWg3mVkCX44Fgh2arVU8eFZ17sP4Q tbrh5JKX2fv4uAcGG2EniT5jvC2vIALVlGPCQsCKBsbVdvB5KGu+dtL1rYuuKYiWCwqi 3YqM5J4ICxMJ3JuApYn0sZY7EFcwaIhaGMlVQi5DEt6V0xQB6cHbMp8cSy8VW4LNaf5s CBFhC7ZWcwO4F5bxvdsRxfdiudjbPBNbPmtLmNqljgy0F+Tl3H8dF600oGZy8k8FTJiW 2tvQ== X-Received: by 10.229.96.199 with SMTP id i7mr42945071qcn.20.1399937509916; Mon, 12 May 2014 16:31:49 -0700 (PDT) Received: from anchor.com (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by mx.google.com with ESMTPSA id m7sm23815931qae.35.2014.05.12.16.31.47 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 May 2014 16:31:48 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 12 May 2014 16:30:50 -0700 Message-Id: <1399937474-6530-3-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1399937474-6530-1-git-send-email-rth@twiddle.net> References: <1399937474-6530-1-git-send-email-rth@twiddle.net> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c01::22d Cc: peter.maydell@linaro.org Subject: [Qemu-devel] [PULL 02/26] tcg: Avoid stores to unaligned addresses X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Peter Maydell Avoid stores to unaligned addresses in TCG code generation, by using the usual memcpy() approach. (Using bswap.h would drag a lot of QEMU baggage into TCG, so it's simpler just to do direct memcpy() here.) Reviewed-by: Alex Bennée Signed-off-by: Peter Maydell Signed-off-by: Richard Henderson --- tcg/tcg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tcg/tcg.c b/tcg/tcg.c index e71f7a0..293f00b 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -125,21 +125,21 @@ static inline void tcg_out8(TCGContext *s, uint8_t v) static inline void tcg_out16(TCGContext *s, uint16_t v) { uint8_t *p = s->code_ptr; - *(uint16_t *)p = v; + memcpy(p, &v, sizeof(v)); s->code_ptr = p + 2; } static inline void tcg_out32(TCGContext *s, uint32_t v) { uint8_t *p = s->code_ptr; - *(uint32_t *)p = v; + memcpy(p, &v, sizeof(v)); s->code_ptr = p + 4; } static inline void tcg_out64(TCGContext *s, uint64_t v) { uint8_t *p = s->code_ptr; - *(uint64_t *)p = v; + memcpy(p, &v, sizeof(v)); s->code_ptr = p + 8; }