From patchwork Mon Sep 2 16:29:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 272006 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AECDB2C0082 for ; Tue, 3 Sep 2013 02:39:55 +1000 (EST) Received: from localhost ([::1]:41039 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGXAP-0000Re-Rb for incoming@patchwork.ozlabs.org; Mon, 02 Sep 2013 12:39:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40085) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGX0r-0003CZ-MU for qemu-devel@nongnu.org; Mon, 02 Sep 2013 12:30:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VGX0m-0005pH-N9 for qemu-devel@nongnu.org; Mon, 02 Sep 2013 12:30:01 -0400 Received: from mail-pa0-x233.google.com ([2607:f8b0:400e:c03::233]:60860) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGX0m-0005ov-Gh for qemu-devel@nongnu.org; Mon, 02 Sep 2013 12:29:56 -0400 Received: by mail-pa0-f51.google.com with SMTP id lf1so5345394pab.24 for ; Mon, 02 Sep 2013 09:29:55 -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; bh=7c5xuJOp9mKu4PE83XyZnsvS7W9bKaQfdbrJ/0njjEU=; b=uv58dTP3BANZK7aQQPJpBxAQjR7LuFEstkY3g2jCKKVZ2cHfhR78FW4mFq8r30A9bk ZXyoFNPq/84P16rnsMXRU3ZSDMd6FHbyoGdANhLxxz4LBqsDEOyvBvavZcGRY6HyOCEw w/tJ3cd/yDGYQjb4fbj2utPz+8nNeshGFeInEmeTZT6JxaVHlgiq8tqTAy/ba9+mzytS KUa27kIY/mBulHAgNRUnbzAOCaJOJIsqm65AS9DhJc9S6Hh3gsDFxyMu9CHnR8W2d09q ZeHC8alznriaqN0ciYu/1ibHgavXmtcXjTisWKioBMCVaC0ECtCeKdoOODRutEfXkqni 9Mkw== X-Received: by 10.68.189.5 with SMTP id ge5mr26784510pbc.42.1378139395539; Mon, 02 Sep 2013 09:29:55 -0700 (PDT) Received: from anchor.twiddle.net (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by mx.google.com with ESMTPSA id ia5sm16821148pbc.42.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 02 Sep 2013 09:29:54 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 2 Sep 2013 09:29:10 -0700 Message-Id: <1378139354-28602-26-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1378139354-28602-1-git-send-email-rth@twiddle.net> References: <1378139354-28602-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::233 Cc: aurelien@aurel32.net, anthony@codemonkey.ws Subject: [Qemu-devel] [PULL 25/29] exec: Rename USUFFIX to LSUFFIX 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 In a following patch, there will be confusion between multiple "unsigned" suffixes; rename this one so as to imply "load". Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson --- include/exec/softmmu_template.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/exec/softmmu_template.h b/include/exec/softmmu_template.h index 2fc6ea3..f9922e2 100644 --- a/include/exec/softmmu_template.h +++ b/include/exec/softmmu_template.h @@ -28,19 +28,19 @@ #if DATA_SIZE == 8 #define SUFFIX q -#define USUFFIX q +#define LSUFFIX q #define DATA_TYPE uint64_t #elif DATA_SIZE == 4 #define SUFFIX l -#define USUFFIX l +#define LSUFFIX l #define DATA_TYPE uint32_t #elif DATA_SIZE == 2 #define SUFFIX w -#define USUFFIX uw +#define LSUFFIX uw #define DATA_TYPE uint16_t #elif DATA_SIZE == 1 #define SUFFIX b -#define USUFFIX ub +#define LSUFFIX ub #define DATA_TYPE uint8_t #else #error unsupported data size @@ -147,7 +147,7 @@ glue(glue(helper_ret_ld, SUFFIX), MMUSUFFIX)(CPUArchState *env, #endif haddr = addr + env->tlb_table[mmu_idx][index].addend; - return glue(glue(ld, USUFFIX), _raw)((uint8_t *)haddr); + return glue(glue(ld, LSUFFIX), _raw)((uint8_t *)haddr); } DATA_TYPE @@ -264,6 +264,6 @@ glue(glue(helper_st, SUFFIX), MMUSUFFIX)(CPUArchState *env, target_ulong addr, #undef SHIFT #undef DATA_TYPE #undef SUFFIX -#undef USUFFIX +#undef LSUFFIX #undef DATA_SIZE #undef ADDR_READ