diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
index 14c0e0f47e..e99e72fc63 100644
--- a/src/cpu/cpu_map.xml
+++ b/src/cpu/cpu_map.xml
@@ -6,186 +6,186 @@
 
     <!-- standard features, EDX -->
     <feature name='fpu'> <!-- CPUID_FP87 -->
-      <cpuid eax_in='0x00000001' edx='0x00000001'/>
+      <cpuid eax_in='0x01' edx='0x00000001'/>
     </feature>
     <feature name='vme'> <!-- CPUID_VME -->
-      <cpuid eax_in='0x00000001' edx='0x00000002'/>
+      <cpuid eax_in='0x01' edx='0x00000002'/>
     </feature>
     <feature name='de'> <!-- CPUID_DE -->
-      <cpuid eax_in='0x00000001' edx='0x00000004'/>
+      <cpuid eax_in='0x01' edx='0x00000004'/>
     </feature>
     <feature name='pse'> <!-- CPUID_PSE -->
-      <cpuid eax_in='0x00000001' edx='0x00000008'/>
+      <cpuid eax_in='0x01' edx='0x00000008'/>
     </feature>
     <feature name='tsc'> <!-- CPUID_TSC -->
-      <cpuid eax_in='0x00000001' edx='0x00000010'/>
+      <cpuid eax_in='0x01' edx='0x00000010'/>
     </feature>
     <feature name='msr'> <!-- CPUID_MSR -->
-      <cpuid eax_in='0x00000001' edx='0x00000020'/>
+      <cpuid eax_in='0x01' edx='0x00000020'/>
     </feature>
     <feature name='pae'> <!-- CPUID_PAE -->
-      <cpuid eax_in='0x00000001' edx='0x00000040'/>
+      <cpuid eax_in='0x01' edx='0x00000040'/>
     </feature>
     <feature name='mce'> <!-- CPUID_MCE -->
-      <cpuid eax_in='0x00000001' edx='0x00000080'/>
+      <cpuid eax_in='0x01' edx='0x00000080'/>
     </feature>
     <feature name='cx8'> <!-- CPUID_CX8 -->
-      <cpuid eax_in='0x00000001' edx='0x00000100'/>
+      <cpuid eax_in='0x01' edx='0x00000100'/>
     </feature>
     <feature name='apic'> <!-- CPUID_APIC -->
-      <cpuid eax_in='0x00000001' edx='0x00000200'/>
+      <cpuid eax_in='0x01' edx='0x00000200'/>
     </feature>
     <feature name='sep'> <!-- CPUID_SEP -->
-      <cpuid eax_in='0x00000001' edx='0x00000800'/>
+      <cpuid eax_in='0x01' edx='0x00000800'/>
     </feature>
     <feature name='mtrr'> <!-- CPUID_MTRR -->
-      <cpuid eax_in='0x00000001' edx='0x00001000'/>
+      <cpuid eax_in='0x01' edx='0x00001000'/>
     </feature>
     <feature name='pge'> <!-- CPUID_PGE -->
-      <cpuid eax_in='0x00000001' edx='0x00002000'/>
+      <cpuid eax_in='0x01' edx='0x00002000'/>
     </feature>
     <feature name='mca'> <!-- CPUID_MCA -->
-      <cpuid eax_in='0x00000001' edx='0x00004000'/>
+      <cpuid eax_in='0x01' edx='0x00004000'/>
     </feature>
     <feature name='cmov'> <!-- CPUID_CMOV -->
-      <cpuid eax_in='0x00000001' edx='0x00008000'/>
+      <cpuid eax_in='0x01' edx='0x00008000'/>
     </feature>
     <feature name='pat'> <!-- CPUID_PAT -->
-      <cpuid eax_in='0x00000001' edx='0x00010000'/>
+      <cpuid eax_in='0x01' edx='0x00010000'/>
     </feature>
     <feature name='pse36'> <!-- CPUID_PSE36 -->
-      <cpuid eax_in='0x00000001' edx='0x00020000'/>
+      <cpuid eax_in='0x01' edx='0x00020000'/>
     </feature>
     <feature name='pn'> <!-- CPUID_PN -->
-      <cpuid eax_in='0x00000001' edx='0x00040000'/>
+      <cpuid eax_in='0x01' edx='0x00040000'/>
     </feature>
     <feature name='clflush'> <!-- CPUID_CLFLUSH -->
-      <cpuid eax_in='0x00000001' edx='0x00080000'/>
+      <cpuid eax_in='0x01' edx='0x00080000'/>
     </feature>
     <feature name='ds'> <!-- CPUID_DTS -->
-      <cpuid eax_in='0x00000001' edx='0x00200000'/>
+      <cpuid eax_in='0x01' edx='0x00200000'/>
     </feature>
     <feature name='acpi'> <!-- CPUID_ACPI -->
-      <cpuid eax_in='0x00000001' edx='0x00400000'/>
+      <cpuid eax_in='0x01' edx='0x00400000'/>
     </feature>
     <feature name='mmx'> <!-- CPUID_MMX -->
-      <cpuid eax_in='0x00000001' edx='0x00800000'/>
+      <cpuid eax_in='0x01' edx='0x00800000'/>
     </feature>
     <feature name='fxsr'> <!-- CPUID_FXSR -->
-      <cpuid eax_in='0x00000001' edx='0x01000000'/>
+      <cpuid eax_in='0x01' edx='0x01000000'/>
     </feature>
     <feature name='sse'> <!-- CPUID_SSE -->
-      <cpuid eax_in='0x00000001' edx='0x02000000'/>
+      <cpuid eax_in='0x01' edx='0x02000000'/>
     </feature>
     <feature name='sse2'> <!-- CPUID_SSE2 -->
-      <cpuid eax_in='0x00000001' edx='0x04000000'/>
+      <cpuid eax_in='0x01' edx='0x04000000'/>
     </feature>
     <feature name='ss'> <!-- CPUID_SS -->
-      <cpuid eax_in='0x00000001' edx='0x08000000'/>
+      <cpuid eax_in='0x01' edx='0x08000000'/>
     </feature>
     <feature name='ht'> <!-- CPUID_HT -->
-      <cpuid eax_in='0x00000001' edx='0x10000000'/>
+      <cpuid eax_in='0x01' edx='0x10000000'/>
     </feature>
     <feature name='tm'> <!-- CPUID_TM -->
-      <cpuid eax_in='0x00000001' edx='0x20000000'/>
+      <cpuid eax_in='0x01' edx='0x20000000'/>
     </feature>
     <feature name='ia64'> <!-- CPUID_IA64 -->
-      <cpuid eax_in='0x00000001' edx='0x40000000'/>
+      <cpuid eax_in='0x01' edx='0x40000000'/>
     </feature>
     <feature name='pbe'> <!-- CPUID_PBE -->
-      <cpuid eax_in='0x00000001' edx='0x80000000'/>
+      <cpuid eax_in='0x01' edx='0x80000000'/>
     </feature>
 
     <!-- standard features, ECX -->
     <feature name='pni'> <!-- CPUID_EXT_SSE3 -->
-      <cpuid eax_in='0x00000001' ecx='0x00000001'/>
+      <cpuid eax_in='0x01' ecx='0x00000001'/>
     </feature>
     <feature name='pclmuldq'>
-      <cpuid eax_in='0x00000001' ecx='0x00000002'/>
+      <cpuid eax_in='0x01' ecx='0x00000002'/>
     </feature>
     <feature name='dtes64'>
-      <cpuid eax_in='0x00000001' ecx='0x00000004'/>
+      <cpuid eax_in='0x01' ecx='0x00000004'/>
     </feature>
     <feature name='monitor'> <!-- CPUID_EXT_MONITOR -->
-      <cpuid eax_in='0x00000001' ecx='0x00000008'/>
+      <cpuid eax_in='0x01' ecx='0x00000008'/>
     </feature>
     <feature name='ds_cpl'> <!-- CPUID_EXT_DSCPL -->
-      <cpuid eax_in='0x00000001' ecx='0x00000010'/>
+      <cpuid eax_in='0x01' ecx='0x00000010'/>
     </feature>
     <feature name='vmx'> <!-- CPUID_EXT_VMX -->
-      <cpuid eax_in='0x00000001' ecx='0x00000020'/>
+      <cpuid eax_in='0x01' ecx='0x00000020'/>
     </feature>
      <feature name='smx'>
-      <cpuid eax_in='0x00000001' ecx='0x00000040'/>
+      <cpuid eax_in='0x01' ecx='0x00000040'/>
     </feature>
     <feature name='est'> <!-- CPUID_EXT_EST -->
-      <cpuid eax_in='0x00000001' ecx='0x00000080'/>
+      <cpuid eax_in='0x01' ecx='0x00000080'/>
     </feature>
     <feature name='tm2'> <!-- CPUID_EXT_TM2 -->
-      <cpuid eax_in='0x00000001' ecx='0x00000100'/>
+      <cpuid eax_in='0x01' ecx='0x00000100'/>
     </feature>
     <feature name='ssse3'> <!-- CPUID_EXT_SSSE3 -->
-      <cpuid eax_in='0x00000001' ecx='0x00000200'/>
+      <cpuid eax_in='0x01' ecx='0x00000200'/>
     </feature>
     <feature name='cid'> <!-- CPUID_EXT_CID -->
-      <cpuid eax_in='0x00000001' ecx='0x00000400'/>
+      <cpuid eax_in='0x01' ecx='0x00000400'/>
     </feature>
     <feature name='fma'>
-      <cpuid eax_in='0x00000001' ecx='0x00001000'/>
+      <cpuid eax_in='0x01' ecx='0x00001000'/>
     </feature>
     <feature name='cx16'> <!-- CPUID_EXT_CX16 -->
-      <cpuid eax_in='0x00000001' ecx='0x00002000'/>
+      <cpuid eax_in='0x01' ecx='0x00002000'/>
     </feature>
     <feature name='xtpr'> <!-- CPUID_EXT_XTPR -->
-      <cpuid eax_in='0x00000001' ecx='0x00004000'/>
+      <cpuid eax_in='0x01' ecx='0x00004000'/>
     </feature>
     <feature name='pdcm'>
-      <cpuid eax_in='0x00000001' ecx='0x00008000'/>
+      <cpuid eax_in='0x01' ecx='0x00008000'/>
     </feature>
     <feature name='pcid'>
-      <cpuid eax_in='0x00000001' ecx='0x00020000'/>
+      <cpuid eax_in='0x01' ecx='0x00020000'/>
     </feature>
     <feature name='dca'> <!-- CPUID_EXT_DCA -->
-      <cpuid eax_in='0x00000001' ecx='0x00040000'/>
+      <cpuid eax_in='0x01' ecx='0x00040000'/>
     </feature>
     <feature name='sse4.1'> <!-- CPUID_EXT_SSE41 -->
-      <cpuid eax_in='0x00000001' ecx='0x00080000'/>
+      <cpuid eax_in='0x01' ecx='0x00080000'/>
     </feature>
     <feature name='sse4.2'> <!-- CPUID_EXT_SSE42 -->
-      <cpuid eax_in='0x00000001' ecx='0x00100000'/>
+      <cpuid eax_in='0x01' ecx='0x00100000'/>
     </feature>
     <feature name='x2apic'> <!-- CPUID_EXT_X2APIC -->
-      <cpuid eax_in='0x00000001' ecx='0x00200000'/>
+      <cpuid eax_in='0x01' ecx='0x00200000'/>
     </feature>
     <feature name='movbe'>
-      <cpuid eax_in='0x00000001' ecx='0x00400000'/>
+      <cpuid eax_in='0x01' ecx='0x00400000'/>
     </feature>
     <feature name='popcnt'> <!-- CPUID_EXT_POPCNT -->
-      <cpuid eax_in='0x00000001' ecx='0x00800000'/>
+      <cpuid eax_in='0x01' ecx='0x00800000'/>
     </feature>
     <feature name='tsc-deadline'>
-      <cpuid eax_in='0x00000001' ecx='0x01000000'/>
+      <cpuid eax_in='0x01' ecx='0x01000000'/>
     </feature>
     <feature name='aes'>
-      <cpuid eax_in='0x00000001' ecx='0x02000000'/>
+      <cpuid eax_in='0x01' ecx='0x02000000'/>
     </feature>
     <feature name='xsave'>
-      <cpuid eax_in='0x00000001' ecx='0x04000000'/>
+      <cpuid eax_in='0x01' ecx='0x04000000'/>
     </feature>
     <feature name='osxsave'>
-      <cpuid eax_in='0x00000001' ecx='0x08000000'/>
+      <cpuid eax_in='0x01' ecx='0x08000000'/>
     </feature>
     <feature name='avx'>
-      <cpuid eax_in='0x00000001' ecx='0x10000000'/>
+      <cpuid eax_in='0x01' ecx='0x10000000'/>
     </feature>
     <feature name='f16c'>
-      <cpuid eax_in='0x00000001' ecx='0x20000000'/>
+      <cpuid eax_in='0x01' ecx='0x20000000'/>
     </feature>
     <feature name='rdrand'>
-      <cpuid eax_in='0x00000001' ecx='0x40000000'/>
+      <cpuid eax_in='0x01' ecx='0x40000000'/>
     </feature>
     <feature name='hypervisor'> <!-- CPUID_EXT_HYPERVISOR -->
-      <cpuid eax_in='0x00000001' ecx='0x80000000'/>
+      <cpuid eax_in='0x01' ecx='0x80000000'/>
     </feature>
 
     <!-- extended features, EDX -->
@@ -290,61 +290,61 @@
 
     <!-- cpuid function 0x7 ecx 0x0 features -->
     <feature name='fsgsbase'>
-      <cpuid eax_in='0x00000007' ebx='0x00000001'/>
+      <cpuid eax_in='0x07' ebx='0x00000001'/>
     </feature>
     <feature name='tsc_adjust'>
-      <cpuid eax_in='0x00000007' ebx='0x00000002'/>
+      <cpuid eax_in='0x07' ebx='0x00000002'/>
     </feature>
     <feature name='bmi1'>
-      <cpuid eax_in='0x00000007' ebx='0x00000008'/>
+      <cpuid eax_in='0x07' ebx='0x00000008'/>
     </feature>
     <feature name='hle'>
-      <cpuid eax_in='0x00000007' ebx='0x00000010'/>
+      <cpuid eax_in='0x07' ebx='0x00000010'/>
     </feature>
     <feature name='avx2'>
-      <cpuid eax_in='0x00000007' ebx='0x00000020'/>
+      <cpuid eax_in='0x07' ebx='0x00000020'/>
     </feature>
     <feature name='smep'>
-      <cpuid eax_in='0x00000007' ebx='0x00000080'/>
+      <cpuid eax_in='0x07' ebx='0x00000080'/>
     </feature>
     <feature name='bmi2'>
-      <cpuid eax_in='0x00000007' ebx='0x00000100'/>
+      <cpuid eax_in='0x07' ebx='0x00000100'/>
     </feature>
     <feature name='erms'>
-      <cpuid eax_in='0x00000007' ebx='0x00000200'/>
+      <cpuid eax_in='0x07' ebx='0x00000200'/>
     </feature>
     <feature name='invpcid'>
-      <cpuid eax_in='0x00000007' ebx='0x00000400'/>
+      <cpuid eax_in='0x07' ebx='0x00000400'/>
     </feature>
     <feature name='rtm'>
-      <cpuid eax_in='0x00000007' ebx='0x00000800'/>
+      <cpuid eax_in='0x07' ebx='0x00000800'/>
     </feature>
     <feature name='mpx'>
-      <cpuid eax_in='0x00000007' ebx='0x00004000'/>
+      <cpuid eax_in='0x07' ebx='0x00004000'/>
     </feature>
     <feature name='avx512f'> <!-- AVX-512 Foundation -->
-      <cpuid eax_in='0x00000007' ebx='0x00010000'/>
+      <cpuid eax_in='0x07' ebx='0x00010000'/>
     </feature>
     <feature name='rdseed'>
-      <cpuid eax_in='0x00000007' ebx='0x00040000'/>
+      <cpuid eax_in='0x07' ebx='0x00040000'/>
     </feature>
     <feature name='adx'>
-      <cpuid eax_in='0x00000007' ebx='0x00080000'/>
+      <cpuid eax_in='0x07' ebx='0x00080000'/>
     </feature>
     <feature name='smap'>
-      <cpuid eax_in='0x00000007' ebx='0x00100000'/>
+      <cpuid eax_in='0x07' ebx='0x00100000'/>
     </feature>
     <feature name='clflushopt'>
-      <cpuid eax_in='0x00000007' ebx='0x00800000'/>
+      <cpuid eax_in='0x07' ebx='0x00800000'/>
     </feature>
     <feature name='avx512pf'> <!-- AVX-512 Prefetch -->
-      <cpuid eax_in='0x00000007' ebx='0x04000000'/>
+      <cpuid eax_in='0x07' ebx='0x04000000'/>
     </feature>
     <feature name='avx512er'> <!-- AVX-512 Exponential and Reciprocal -->
-      <cpuid eax_in='0x00000007' ebx='0x08000000'/>
+      <cpuid eax_in='0x07' ebx='0x08000000'/>
     </feature>
     <feature name='avx512cd'> <!-- AVX-512 Conflict Detection -->
-      <cpuid eax_in='0x00000007' ebx='0x10000000'/>
+      <cpuid eax_in='0x07' ebx='0x10000000'/>
     </feature>
 
     <!-- Advanced Power Management edx features -->