Update match_entry_t to remove internal codes and bits

Remove brand_code, model_bits and model_code fields, add a new brand sub-struct.

There fields were complicated to manage, adding complex functions to make it work.
amd_bits_t and intel_bits_t enums were truncated, I had to replace them with #define in 2e01aa0.

Some of these #define were conflicting with other C headers (ctype.h on OpenBSD, corecrt_wctype.h on Windows), that is why I wanted to get rid of it.

I updated some CPU codenames meanwhile for more consistency.

Fix #212.

Author: TheTumultuousUnicornOfDarkness

CMakeLists.txt

@@ -31,12 +31,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "DragonFly" OR ${CMAKE_SYSTEM_NAME} STREQUAL "N
   find_package(Threads REQUIRED)
 endif()
 
-# check if popcount64 is available
 include(CheckSymbolExists)
-check_symbol_exists(popcount64 "string.h" HAVE_POPCOUNT64)
-if(HAVE_POPCOUNT64)
-  add_definitions(-DHAVE_POPCOUNT64)
-endif(HAVE_POPCOUNT64)
 
 # check if auxiliary vector is available
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")

configure.ac

@@ -51,7 +51,6 @@ LT_INIT
 AM_CPPFLAGS="$CPPFLAGS"
 
 AC_CHECK_HEADERS([stdint.h])
-AC_CHECK_FUNCS([popcount64])
 
 AC_CHECK_PROGS([DOXYGEN], [doxygen])
 AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"])

libcpuid/Doxyfile.in

@@ -990,7 +990,6 @@ RECURSIVE              = NO
 # run.
 
 EXCLUDE                = @top_srcdir@/libcpuid/libcpuid_internal.h \
-                         @top_srcdir@/libcpuid/libcpuid_ctype.h \
                          @top_srcdir@/libcpuid/libcpuid_util.h
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or

libcpuid/Makefile.am

@@ -32,12 +32,8 @@ libcpuidinclude_HEADERS = 	\
 	libcpuid_types.h
 
 noinst_HEADERS = 		\
-	amd_code_t.h		\
 	asm-bits.h		\
-	centaur_code_t.h	\
-	intel_code_t.h		\
 	libcpuid_arm_driver.h	\
-	libcpuid_ctype.h	\
 	libcpuid_internal.h	\
 	libcpuid_util.h		\
 	recog_amd.h		\

libcpuid/amd_code_t.h

@@ -160,7 +160,7 @@ def checkEnumSize(enumName, constantName):
 #   - Codenames should not exceed 31 characters
 #   - Check for common typos
 definitions = 0
-match_entry_fields = 12 # this number needs to change if the definition of match_entry_t ever changes
+match_entry_fields = 11 # this number needs to change if the definition of match_entry_t ever changes
 codename_str_max = 64-1 # this number needs to change if the value of CODENAME_STR_MAX ever changes
 common_cache_sizes = ["8", "16", "32", "64", "128", "256", "512", "1024", "2048", "3072", "4096", "6144", "8192", "12288", "16384"]
 for fn in glob.glob("%s/*.c" % sys.argv[1]):
@@ -177,7 +177,7 @@ def checkEnumSize(enumName, constantName):
 		if not has_matchtable:
 			continue
 		i = line.find("{")
-		j = line.find("}")
+		j = line.rfind("}")
 		if i == -1 or j == -1 or i > j:
 			continue
 		inner = line[i+1:j]