From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 57A8B5A76 for ; Thu, 5 Mar 2015 14:23:36 +0100 (CET) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP; 05 Mar 2015 05:22:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,347,1422950400"; d="scan'208";a="462910389" Received: from bricha3-mobl3.ger.corp.intel.com ([10.243.20.24]) by FMSMGA003.fm.intel.com with SMTP; 05 Mar 2015 05:17:13 -0800 Received: by (sSMTP sendmail emulation); Thu, 05 Mar 2015 13:23:32 +0025 Date: Thu, 5 Mar 2015 13:23:32 +0000 From: Bruce Richardson To: Michael Qiu Message-ID: <20150305132332.GC1504@bricha3-MOBL3> References: <1425561339-13300-1-git-send-email-michael.qiu@intel.com> <1425561339-13300-4-git-send-email-michael.qiu@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1425561339-13300-4-git-send-email-michael.qiu@intel.com> Organization: Intel Shannon Ltd. User-Agent: Mutt/1.5.23 (2014-03-12) Cc: dev@dpdk.org Subject: Re: [dpdk-dev] =?utf-8?q?=5BPATCH_3/3=5D_librte=5Feal/common=3A_Fix_r?= =?utf-8?q?edeclaration_of_enumerator_=E2=80=98REG=5FEAX=E2=80=99?= X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Mar 2015 13:23:37 -0000 On Thu, Mar 05, 2015 at 09:15:39PM +0800, Michael Qiu wrote: > include/rte_cpuflags.h:154:2: error: redeclaration of enumerator ‘REG_EAX’ > In file included from /usr/include/signal.h:358:0, > from /usr/include/sys/wait.h:30, > from /root/dpdk/app/test/test_mp_secondary.c:50: > /usr/include/sys/ucontext.h:180:3: note: previous definition of ‘REG_EAX’ was here > > In i686, from REG_EAX to REG_EDX are all defined in > /usr/include/sys/ucontext.h > > Rename to CPU_REG_EAX to avoid this issue. RTE_ prefix for consistency with other public DPDK symbols perhaps? /Bruce > > Signed-off-by: Michael Qou > --- > .../common/include/arch/x86/rte_cpuflags.h | 210 ++++++++++----------- > 1 file changed, 105 insertions(+), 105 deletions(-) > > diff --git a/lib/librte_eal/common/include/arch/x86/rte_cpuflags.h b/lib/librte_eal/common/include/arch/x86/rte_cpuflags.h > index a58dd7b..f367b91 100644 > --- a/lib/librte_eal/common/include/arch/x86/rte_cpuflags.h > +++ b/lib/librte_eal/common/include/arch/x86/rte_cpuflags.h > @@ -151,104 +151,104 @@ enum rte_cpu_flag_t { > }; > > enum cpu_register_t { > - REG_EAX = 0, > - REG_EBX, > - REG_ECX, > - REG_EDX, > + CPU_REG_EAX = 0, > + CPU_REG_EBX, > + CPU_REG_ECX, > + CPU_REG_EDX, > }; > > static const struct feature_entry cpu_feature_table[] = { > - FEAT_DEF(SSE3, 0x00000001, 0, REG_ECX, 0) > - FEAT_DEF(PCLMULQDQ, 0x00000001, 0, REG_ECX, 1) > - FEAT_DEF(DTES64, 0x00000001, 0, REG_ECX, 2) > - FEAT_DEF(MONITOR, 0x00000001, 0, REG_ECX, 3) > - FEAT_DEF(DS_CPL, 0x00000001, 0, REG_ECX, 4) > - FEAT_DEF(VMX, 0x00000001, 0, REG_ECX, 5) > - FEAT_DEF(SMX, 0x00000001, 0, REG_ECX, 6) > - FEAT_DEF(EIST, 0x00000001, 0, REG_ECX, 7) > - FEAT_DEF(TM2, 0x00000001, 0, REG_ECX, 8) > - FEAT_DEF(SSSE3, 0x00000001, 0, REG_ECX, 9) > - FEAT_DEF(CNXT_ID, 0x00000001, 0, REG_ECX, 10) > - FEAT_DEF(FMA, 0x00000001, 0, REG_ECX, 12) > - FEAT_DEF(CMPXCHG16B, 0x00000001, 0, REG_ECX, 13) > - FEAT_DEF(XTPR, 0x00000001, 0, REG_ECX, 14) > - FEAT_DEF(PDCM, 0x00000001, 0, REG_ECX, 15) > - FEAT_DEF(PCID, 0x00000001, 0, REG_ECX, 17) > - FEAT_DEF(DCA, 0x00000001, 0, REG_ECX, 18) > - FEAT_DEF(SSE4_1, 0x00000001, 0, REG_ECX, 19) > - FEAT_DEF(SSE4_2, 0x00000001, 0, REG_ECX, 20) > - FEAT_DEF(X2APIC, 0x00000001, 0, REG_ECX, 21) > - FEAT_DEF(MOVBE, 0x00000001, 0, REG_ECX, 22) > - FEAT_DEF(POPCNT, 0x00000001, 0, REG_ECX, 23) > - FEAT_DEF(TSC_DEADLINE, 0x00000001, 0, REG_ECX, 24) > - FEAT_DEF(AES, 0x00000001, 0, REG_ECX, 25) > - FEAT_DEF(XSAVE, 0x00000001, 0, REG_ECX, 26) > - FEAT_DEF(OSXSAVE, 0x00000001, 0, REG_ECX, 27) > - FEAT_DEF(AVX, 0x00000001, 0, REG_ECX, 28) > - FEAT_DEF(F16C, 0x00000001, 0, REG_ECX, 29) > - FEAT_DEF(RDRAND, 0x00000001, 0, REG_ECX, 30) > - > - FEAT_DEF(FPU, 0x00000001, 0, REG_EDX, 0) > - FEAT_DEF(VME, 0x00000001, 0, REG_EDX, 1) > - FEAT_DEF(DE, 0x00000001, 0, REG_EDX, 2) > - FEAT_DEF(PSE, 0x00000001, 0, REG_EDX, 3) > - FEAT_DEF(TSC, 0x00000001, 0, REG_EDX, 4) > - FEAT_DEF(MSR, 0x00000001, 0, REG_EDX, 5) > - FEAT_DEF(PAE, 0x00000001, 0, REG_EDX, 6) > - FEAT_DEF(MCE, 0x00000001, 0, REG_EDX, 7) > - FEAT_DEF(CX8, 0x00000001, 0, REG_EDX, 8) > - FEAT_DEF(APIC, 0x00000001, 0, REG_EDX, 9) > - FEAT_DEF(SEP, 0x00000001, 0, REG_EDX, 11) > - FEAT_DEF(MTRR, 0x00000001, 0, REG_EDX, 12) > - FEAT_DEF(PGE, 0x00000001, 0, REG_EDX, 13) > - FEAT_DEF(MCA, 0x00000001, 0, REG_EDX, 14) > - FEAT_DEF(CMOV, 0x00000001, 0, REG_EDX, 15) > - FEAT_DEF(PAT, 0x00000001, 0, REG_EDX, 16) > - FEAT_DEF(PSE36, 0x00000001, 0, REG_EDX, 17) > - FEAT_DEF(PSN, 0x00000001, 0, REG_EDX, 18) > - FEAT_DEF(CLFSH, 0x00000001, 0, REG_EDX, 19) > - FEAT_DEF(DS, 0x00000001, 0, REG_EDX, 21) > - FEAT_DEF(ACPI, 0x00000001, 0, REG_EDX, 22) > - FEAT_DEF(MMX, 0x00000001, 0, REG_EDX, 23) > - FEAT_DEF(FXSR, 0x00000001, 0, REG_EDX, 24) > - FEAT_DEF(SSE, 0x00000001, 0, REG_EDX, 25) > - FEAT_DEF(SSE2, 0x00000001, 0, REG_EDX, 26) > - FEAT_DEF(SS, 0x00000001, 0, REG_EDX, 27) > - FEAT_DEF(HTT, 0x00000001, 0, REG_EDX, 28) > - FEAT_DEF(TM, 0x00000001, 0, REG_EDX, 29) > - FEAT_DEF(PBE, 0x00000001, 0, REG_EDX, 31) > - > - FEAT_DEF(DIGTEMP, 0x00000006, 0, REG_EAX, 0) > - FEAT_DEF(TRBOBST, 0x00000006, 0, REG_EAX, 1) > - FEAT_DEF(ARAT, 0x00000006, 0, REG_EAX, 2) > - FEAT_DEF(PLN, 0x00000006, 0, REG_EAX, 4) > - FEAT_DEF(ECMD, 0x00000006, 0, REG_EAX, 5) > - FEAT_DEF(PTM, 0x00000006, 0, REG_EAX, 6) > - > - FEAT_DEF(MPERF_APERF_MSR, 0x00000006, 0, REG_ECX, 0) > - FEAT_DEF(ACNT2, 0x00000006, 0, REG_ECX, 1) > - FEAT_DEF(ENERGY_EFF, 0x00000006, 0, REG_ECX, 3) > - > - FEAT_DEF(FSGSBASE, 0x00000007, 0, REG_EBX, 0) > - FEAT_DEF(BMI1, 0x00000007, 0, REG_EBX, 2) > - FEAT_DEF(HLE, 0x00000007, 0, REG_EBX, 4) > - FEAT_DEF(AVX2, 0x00000007, 0, REG_EBX, 5) > - FEAT_DEF(SMEP, 0x00000007, 0, REG_EBX, 6) > - FEAT_DEF(BMI2, 0x00000007, 0, REG_EBX, 7) > - FEAT_DEF(ERMS, 0x00000007, 0, REG_EBX, 8) > - FEAT_DEF(INVPCID, 0x00000007, 0, REG_EBX, 10) > - FEAT_DEF(RTM, 0x00000007, 0, REG_EBX, 11) > - > - FEAT_DEF(LAHF_SAHF, 0x80000001, 0, REG_ECX, 0) > - FEAT_DEF(LZCNT, 0x80000001, 0, REG_ECX, 4) > - > - FEAT_DEF(SYSCALL, 0x80000001, 0, REG_EDX, 11) > - FEAT_DEF(XD, 0x80000001, 0, REG_EDX, 20) > - FEAT_DEF(1GB_PG, 0x80000001, 0, REG_EDX, 26) > - FEAT_DEF(RDTSCP, 0x80000001, 0, REG_EDX, 27) > - FEAT_DEF(EM64T, 0x80000001, 0, REG_EDX, 29) > - > - FEAT_DEF(INVTSC, 0x80000007, 0, REG_EDX, 8) > + FEAT_DEF(SSE3, 0x00000001, 0, CPU_REG_ECX, 0) > + FEAT_DEF(PCLMULQDQ, 0x00000001, 0, CPU_REG_ECX, 1) > + FEAT_DEF(DTES64, 0x00000001, 0, CPU_REG_ECX, 2) > + FEAT_DEF(MONITOR, 0x00000001, 0, CPU_REG_ECX, 3) > + FEAT_DEF(DS_CPL, 0x00000001, 0, CPU_REG_ECX, 4) > + FEAT_DEF(VMX, 0x00000001, 0, CPU_REG_ECX, 5) > + FEAT_DEF(SMX, 0x00000001, 0, CPU_REG_ECX, 6) > + FEAT_DEF(EIST, 0x00000001, 0, CPU_REG_ECX, 7) > + FEAT_DEF(TM2, 0x00000001, 0, CPU_REG_ECX, 8) > + FEAT_DEF(SSSE3, 0x00000001, 0, CPU_REG_ECX, 9) > + FEAT_DEF(CNXT_ID, 0x00000001, 0, CPU_REG_ECX, 10) > + FEAT_DEF(FMA, 0x00000001, 0, CPU_REG_ECX, 12) > + FEAT_DEF(CMPXCHG16B, 0x00000001, 0, CPU_REG_ECX, 13) > + FEAT_DEF(XTPR, 0x00000001, 0, CPU_REG_ECX, 14) > + FEAT_DEF(PDCM, 0x00000001, 0, CPU_REG_ECX, 15) > + FEAT_DEF(PCID, 0x00000001, 0, CPU_REG_ECX, 17) > + FEAT_DEF(DCA, 0x00000001, 0, CPU_REG_ECX, 18) > + FEAT_DEF(SSE4_1, 0x00000001, 0, CPU_REG_ECX, 19) > + FEAT_DEF(SSE4_2, 0x00000001, 0, CPU_REG_ECX, 20) > + FEAT_DEF(X2APIC, 0x00000001, 0, CPU_REG_ECX, 21) > + FEAT_DEF(MOVBE, 0x00000001, 0, CPU_REG_ECX, 22) > + FEAT_DEF(POPCNT, 0x00000001, 0, CPU_REG_ECX, 23) > + FEAT_DEF(TSC_DEADLINE, 0x00000001, 0, CPU_REG_ECX, 24) > + FEAT_DEF(AES, 0x00000001, 0, CPU_REG_ECX, 25) > + FEAT_DEF(XSAVE, 0x00000001, 0, CPU_REG_ECX, 26) > + FEAT_DEF(OSXSAVE, 0x00000001, 0, CPU_REG_ECX, 27) > + FEAT_DEF(AVX, 0x00000001, 0, CPU_REG_ECX, 28) > + FEAT_DEF(F16C, 0x00000001, 0, CPU_REG_ECX, 29) > + FEAT_DEF(RDRAND, 0x00000001, 0, CPU_REG_ECX, 30) > + > + FEAT_DEF(FPU, 0x00000001, 0, CPU_REG_EDX, 0) > + FEAT_DEF(VME, 0x00000001, 0, CPU_REG_EDX, 1) > + FEAT_DEF(DE, 0x00000001, 0, CPU_REG_EDX, 2) > + FEAT_DEF(PSE, 0x00000001, 0, CPU_REG_EDX, 3) > + FEAT_DEF(TSC, 0x00000001, 0, CPU_REG_EDX, 4) > + FEAT_DEF(MSR, 0x00000001, 0, CPU_REG_EDX, 5) > + FEAT_DEF(PAE, 0x00000001, 0, CPU_REG_EDX, 6) > + FEAT_DEF(MCE, 0x00000001, 0, CPU_REG_EDX, 7) > + FEAT_DEF(CX8, 0x00000001, 0, CPU_REG_EDX, 8) > + FEAT_DEF(APIC, 0x00000001, 0, CPU_REG_EDX, 9) > + FEAT_DEF(SEP, 0x00000001, 0, CPU_REG_EDX, 11) > + FEAT_DEF(MTRR, 0x00000001, 0, CPU_REG_EDX, 12) > + FEAT_DEF(PGE, 0x00000001, 0, CPU_REG_EDX, 13) > + FEAT_DEF(MCA, 0x00000001, 0, CPU_REG_EDX, 14) > + FEAT_DEF(CMOV, 0x00000001, 0, CPU_REG_EDX, 15) > + FEAT_DEF(PAT, 0x00000001, 0, CPU_REG_EDX, 16) > + FEAT_DEF(PSE36, 0x00000001, 0, CPU_REG_EDX, 17) > + FEAT_DEF(PSN, 0x00000001, 0, CPU_REG_EDX, 18) > + FEAT_DEF(CLFSH, 0x00000001, 0, CPU_REG_EDX, 19) > + FEAT_DEF(DS, 0x00000001, 0, CPU_REG_EDX, 21) > + FEAT_DEF(ACPI, 0x00000001, 0, CPU_REG_EDX, 22) > + FEAT_DEF(MMX, 0x00000001, 0, CPU_REG_EDX, 23) > + FEAT_DEF(FXSR, 0x00000001, 0, CPU_REG_EDX, 24) > + FEAT_DEF(SSE, 0x00000001, 0, CPU_REG_EDX, 25) > + FEAT_DEF(SSE2, 0x00000001, 0, CPU_REG_EDX, 26) > + FEAT_DEF(SS, 0x00000001, 0, CPU_REG_EDX, 27) > + FEAT_DEF(HTT, 0x00000001, 0, CPU_REG_EDX, 28) > + FEAT_DEF(TM, 0x00000001, 0, CPU_REG_EDX, 29) > + FEAT_DEF(PBE, 0x00000001, 0, CPU_REG_EDX, 31) > + > + FEAT_DEF(DIGTEMP, 0x00000006, 0, CPU_REG_EAX, 0) > + FEAT_DEF(TRBOBST, 0x00000006, 0, CPU_REG_EAX, 1) > + FEAT_DEF(ARAT, 0x00000006, 0, CPU_REG_EAX, 2) > + FEAT_DEF(PLN, 0x00000006, 0, CPU_REG_EAX, 4) > + FEAT_DEF(ECMD, 0x00000006, 0, CPU_REG_EAX, 5) > + FEAT_DEF(PTM, 0x00000006, 0, CPU_REG_EAX, 6) > + > + FEAT_DEF(MPERF_APERF_MSR, 0x00000006, 0, CPU_REG_ECX, 0) > + FEAT_DEF(ACNT2, 0x00000006, 0, CPU_REG_ECX, 1) > + FEAT_DEF(ENERGY_EFF, 0x00000006, 0, CPU_REG_ECX, 3) > + > + FEAT_DEF(FSGSBASE, 0x00000007, 0, CPU_REG_EBX, 0) > + FEAT_DEF(BMI1, 0x00000007, 0, CPU_REG_EBX, 2) > + FEAT_DEF(HLE, 0x00000007, 0, CPU_REG_EBX, 4) > + FEAT_DEF(AVX2, 0x00000007, 0, CPU_REG_EBX, 5) > + FEAT_DEF(SMEP, 0x00000007, 0, CPU_REG_EBX, 6) > + FEAT_DEF(BMI2, 0x00000007, 0, CPU_REG_EBX, 7) > + FEAT_DEF(ERMS, 0x00000007, 0, CPU_REG_EBX, 8) > + FEAT_DEF(INVPCID, 0x00000007, 0, CPU_REG_EBX, 10) > + FEAT_DEF(RTM, 0x00000007, 0, CPU_REG_EBX, 11) > + > + FEAT_DEF(LAHF_SAHF, 0x80000001, 0, CPU_REG_ECX, 0) > + FEAT_DEF(LZCNT, 0x80000001, 0, CPU_REG_ECX, 4) > + > + FEAT_DEF(SYSCALL, 0x80000001, 0, CPU_REG_EDX, 11) > + FEAT_DEF(XD, 0x80000001, 0, CPU_REG_EDX, 20) > + FEAT_DEF(1GB_PG, 0x80000001, 0, CPU_REG_EDX, 26) > + FEAT_DEF(RDTSCP, 0x80000001, 0, CPU_REG_EDX, 27) > + FEAT_DEF(EM64T, 0x80000001, 0, CPU_REG_EDX, 29) > + > + FEAT_DEF(INVTSC, 0x80000007, 0, CPU_REG_EDX, 8) > }; > > static inline void > @@ -257,18 +257,18 @@ rte_cpu_get_features(uint32_t leaf, uint32_t subleaf, cpuid_registers_t out) > #if defined(__i386__) && defined(__PIC__) > /* %ebx is a forbidden register if we compile with -fPIC or -fPIE */ > asm volatile("movl %%ebx,%0 ; cpuid ; xchgl %%ebx,%0" > - : "=r" (out[REG_EBX]), > - "=a" (out[REG_EAX]), > - "=c" (out[REG_ECX]), > - "=d" (out[REG_EDX]) > + : "=r" (out[CPU_REG_EBX]), > + "=a" (out[CPU_REG_EAX]), > + "=c" (out[CPU_REG_ECX]), > + "=d" (out[CPU_REG_EDX]) > : "a" (leaf), "c" (subleaf)); > #else > > asm volatile("cpuid" > - : "=a" (out[REG_EAX]), > - "=b" (out[REG_EBX]), > - "=c" (out[REG_ECX]), > - "=d" (out[REG_EDX]) > + : "=a" (out[CPU_REG_EAX]), > + "=b" (out[CPU_REG_EBX]), > + "=c" (out[CPU_REG_ECX]), > + "=d" (out[CPU_REG_EDX]) > : "a" (leaf), "c" (subleaf)); > > #endif > @@ -292,8 +292,8 @@ rte_cpu_get_flag_enabled(enum rte_cpu_flag_t feature) > return -EFAULT; > > rte_cpu_get_features(feat->leaf & 0xffff0000, 0, regs); > - if (((regs[REG_EAX] ^ feat->leaf) & 0xffff0000) || > - regs[REG_EAX] < feat->leaf) > + if (((regs[CPU_REG_EAX] ^ feat->leaf) & 0xffff0000) || > + regs[CPU_REG_EAX] < feat->leaf) > return 0; > > /* get the cpuid leaf containing the desired feature */ > -- > 1.9.3 >