Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NcFgb-0002jy-Ko for qemu-devel@nongnu.org; Tue, 02 Feb 2010 05:08:45 -0500 Received: from [199.232.76.173] (port=38601 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NcFgZ-0002iB-NO for qemu-devel@nongnu.org; Tue, 02 Feb 2010 05:08:43 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NcFgP-0006tk-KK for qemu-devel@nongnu.org; Tue, 02 Feb 2010 05:08:43 -0500 Received: from va3ehsobe003.messaging.microsoft.com ([216.32.180.13]:34260 helo=VA3EHSOBE003.bigfish.com) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_ARCFOUR_MD5:16) (Exim 4.60) (envelope-from ) id 1NcFgP-0006tT-6C for qemu-devel@nongnu.org; Tue, 02 Feb 2010 05:08:33 -0500 From: Andre Przywara Date: Tue, 2 Feb 2010 11:08:16 +0100 Message-ID: <1265105301-3455-9-git-send-email-andre.przywara@amd.com> In-Reply-To: <1265105301-3455-1-git-send-email-andre.przywara@amd.com> References: <1265105301-3455-1-git-send-email-andre.przywara@amd.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH 08/13] cpuid: simplify CPUID flag search function List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: john.cooper@redhat.com, Andre Przywara avoid code duplication and handle the CPUID flag name search in a loop. Signed-off-by: Andre Przywara --- target-i386/cpuid.c | 38 +++++++++++++------------------------- 1 files changed, 13 insertions(+), 25 deletions(-) diff --git a/target-i386/cpuid.c b/target-i386/cpuid.c index 3f56c50..635c2f4 100644 --- a/target-i386/cpuid.c +++ b/target-i386/cpuid.c @@ -90,34 +90,22 @@ static void add_flagname_to_bitmaps(const char *flagname, uint32_t *features, uint32_t *ext3_features, uint32_t *kvm_features) { - int i; + int i, j; int found = 0; - - for ( i = 0 ; i < 32 ; i++ ) - if (feature_name[i] && !strcmp (flagname, feature_name[i])) { - *features |= 1 << i; - found = 1; - } - for ( i = 0 ; i < 32 ; i++ ) - if (ext_feature_name[i] && !strcmp (flagname, ext_feature_name[i])) { - *ext_features |= 1 << i; - found = 1; - } - for ( i = 0 ; i < 32 ; i++ ) - if (ext2_feature_name[i] && !strcmp (flagname, ext2_feature_name[i])) { - *ext2_features |= 1 << i; - found = 1; - } - for ( i = 0 ; i < 32 ; i++ ) - if (ext3_feature_name[i] && !strcmp (flagname, ext3_feature_name[i])) { - *ext3_features |= 1 << i; - found = 1; - } - for ( i = 0 ; i < 32 ; i++ ) - if (kvm_feature_name[i] && !strcmp (flagname, kvm_feature_name[i])) { - *kvm_features |= 1 << i; - found = 1; + const char ** feature_names[5] = {feature_name, ext_feature_name, + ext2_feature_name, ext3_feature_name, + kvm_feature_name}; + uint32_t* feature_flags[5] = {features, ext_features, ext2_features, + ext3_features, kvm_features}; + + for (j = 0; j < 5; j++) { + for ( i = 0 ; i < 32 ; i++ ) { + if (feature_names[j][i] && !strcmp(flagname, feature_names[j][i])) { + *feature_flags[j] |= 1 << i; + found = 1; + } } + } if (!found) { fprintf(stderr, "CPU feature %s not found\n", flagname); -- 1.6.4