[oprof-cvs] CVS: oprofile/libop op_cpu_type.c, 1.41, 1.42 op_cpu_type.h, 1.34, 1.35

[William C. <wc...@us...>]

Update of /cvsroot/oprofile/oprofile/libop
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5477/libop

Modified Files:
	op_cpu_type.c op_cpu_type.h 
Log Message:
2007-04-13  Will Cohen  <wc...@re...>

	* libop/op_cpu_type.c:
	* libop/op_cpu_type.h: Move new entries to end of list
	to improve backward compatibility with enum values.



Index: op_cpu_type.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libop/op_cpu_type.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -d -r1.41 -r1.42
--- op_cpu_type.c	23 Mar 2007 19:28:59 -0000	1.41
+++ op_cpu_type.c	13 Apr 2007 19:43:01 -0000	1.42
@@ -34,7 +34,6 @@ static struct cpu_descr const cpu_descrs
 	{ "Itanium", "ia64/itanium", CPU_IA64_1, 4 },
 	{ "Itanium 2", "ia64/itanium2", CPU_IA64_2, 4 },
 	{ "AMD64 processors", "x86-64/hammer", CPU_HAMMER, 4 },
-	{ "AMD64 family10", "x86-64/family10", CPU_FAMILY10, 4 },
 	{ "P4 / Xeon with 2 hyper-threads", "i386/p4-ht", CPU_P4_HT2, 4 },
 	{ "Alpha EV4", "alpha/ev4", CPU_AXP_EV4, 2 },
 	{ "Alpha EV5", "alpha/ev5", CPU_AXP_EV5, 3 },
@@ -47,10 +46,7 @@ static struct cpu_descr const cpu_descrs
 	{ "ppc64 POWER4", "ppc64/power4", CPU_PPC64_POWER4, 8 },
 	{ "ppc64 POWER5", "ppc64/power5", CPU_PPC64_POWER5, 6 },
 	{ "ppc64 POWER5+", "ppc64/power5+", CPU_PPC64_POWER5p, 6 },
-	{ "ppc64 POWER6", "ppc64/power6", CPU_PPC64_POWER6, 4 },
 	{ "ppc64 970", "ppc64/970", CPU_PPC64_970, 8 },
-	{ "ppc64 970MP", "ppc64/970MP", CPU_PPC64_970MP, 8 },
-	{ "ppc64 Cell Broadband Engine", "ppc64/cell-be", CPU_PPC64_CELL, 8 },
 	{ "MIPS 20K", "mips/20K", CPU_MIPS_20K, 1},
 	{ "MIPS 24K", "mips/24K", CPU_MIPS_24K, 2},
 	{ "MIPS 25K", "mips/25K", CPU_MIPS_25K, 2},
@@ -68,6 +64,10 @@ static struct cpu_descr const cpu_descrs
 	{ "Core Solo / Duo", "i386/core", CPU_CORE, 2 },
 	{ "PowerPC G4", "ppc/7450",  CPU_PPC_7450, 6 },
  	{ "Core 2", "i386/core_2", CPU_CORE_2, 2 },
+	{ "ppc64 POWER6", "ppc64/power6", CPU_PPC64_POWER6, 4 },
+	{ "ppc64 970MP", "ppc64/970MP", CPU_PPC64_970MP, 8 },
+	{ "ppc64 Cell Broadband Engine", "ppc64/cell-be", CPU_PPC64_CELL, 8 },
+	{ "AMD64 family10", "x86-64/family10", CPU_FAMILY10, 4 },
 };
  
 static size_t const nr_cpu_descrs = sizeof(cpu_descrs) / sizeof(struct cpu_descr);

Index: op_cpu_type.h
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libop/op_cpu_type.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -d -r1.34 -r1.35
--- op_cpu_type.h	23 Mar 2007 19:28:59 -0000	1.34
+++ op_cpu_type.h	13 Apr 2007 19:43:01 -0000	1.35
@@ -30,7 +30,6 @@ typedef enum {
 	CPU_IA64_1, /**< IA64 Merced */
 	CPU_IA64_2, /**< IA64 McKinley */
 	CPU_HAMMER, /**< AMD Hammer family */
-	CPU_FAMILY10, /**< AMD family 10 */
 	CPU_P4_HT2, /**< Pentium 4 / Xeon series with 2 hyper-threads */
 	CPU_AXP_EV4, /**< Alpha EV4 family */
 	CPU_AXP_EV5, /**< Alpha EV5 family */
@@ -43,10 +42,7 @@ typedef enum {
 	CPU_PPC64_POWER4, /**< ppc64 POWER4 family */
 	CPU_PPC64_POWER5, /**< ppc64 POWER5 family */
 	CPU_PPC64_POWER5p, /**< ppc64 Power5+ family */
-	CPU_PPC64_POWER6, /**< ppc64 POWER6 family */
 	CPU_PPC64_970, /**< ppc64 970 family */
-	CPU_PPC64_970MP, /**< ppc64 970MP */
-	CPU_PPC64_CELL, /**< ppc64 Cell Broadband Engine*/
 	CPU_MIPS_20K, /**< MIPS 20K */
 	CPU_MIPS_24K, /**< MIPS 24K */
 	CPU_MIPS_25K, /**< MIPS 25K */
@@ -64,6 +60,10 @@ typedef enum {
 	CPU_CORE, /**< Core Solo / Duo series */
 	CPU_PPC_7450, /**< PowerPC G4 */
 	CPU_CORE_2, /**< Intel Core 2 */
+	CPU_PPC64_POWER6, /**< ppc64 POWER6 family */
+	CPU_PPC64_970MP, /**< ppc64 970MP */
+	CPU_PPC64_CELL, /**< ppc64 Cell Broadband Engine*/
+	CPU_FAMILY10, /**< AMD family 10 */
 	MAX_CPU_TYPE
 } op_cpu;