[oprof-cvs] CVS: oprofile/libop op_cpu_type.c, 1.46, 1.47 op_cpu_type.h, 1.39, 1.40 op_events.c, 1.85, 1.86

[John L. <mov...@us...>]

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

Modified Files:
	op_cpu_type.c op_cpu_type.h op_events.c 
Log Message:
e300, avr32 support. oparchive fixes


Index: op_cpu_type.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libop/op_cpu_type.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -d -r1.46 -r1.47
--- op_cpu_type.c	13 Jun 2007 15:04:12 -0000	1.46
+++ op_cpu_type.c	22 Feb 2008 16:17:48 -0000	1.47
@@ -72,6 +72,8 @@ static struct cpu_descr const cpu_descrs
 	{ "ARM MPCore", "arm/mpcore", CPU_ARM_MPCORE, 2 },
 	{ "ARM V6 PMU", "arm/armv6", CPU_ARM_V6, 3 },
 	{ "ppc64 POWER5++", "ppc64/power5++", CPU_PPC64_POWER5pp, 6 },
+	{ "e300", "ppc/e300", CPU_PPC_E300, 4 },
+	{ "AVR32", "avr32", CPU_AVR32, 3 },
 };
  
 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.39
retrieving revision 1.40
diff -u -p -d -r1.39 -r1.40
--- op_cpu_type.h	13 Jun 2007 15:04:12 -0000	1.39
+++ op_cpu_type.h	22 Feb 2008 16:17:48 -0000	1.40
@@ -70,6 +70,8 @@ typedef enum {
 	CPU_ARM_MPCORE, /**< ARM MPCore */
 	CPU_ARM_V6, /**< ARM V6 */
 	CPU_PPC64_POWER5pp,  /**< ppc64 Power5++ family */
+	CPU_PPC_E300, /**< e300 */
+	CPU_AVR32, /**< AVR32 */
 	MAX_CPU_TYPE
 } op_cpu;
 

Index: op_events.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libop/op_events.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -d -r1.85 -r1.86
--- op_events.c	19 Oct 2007 15:08:39 -0000	1.85
+++ op_events.c	22 Feb 2008 16:17:48 -0000	1.86
@@ -793,6 +793,7 @@ void op_default_event(op_cpu cpu_type, s
 		case CPU_ARM_XSCALE2:
 		case CPU_ARM_MPCORE:
 		case CPU_ARM_V6:
+		case CPU_AVR32:
 			descr->name = "CPU_CYCLES";
 			break;
 
@@ -847,6 +848,7 @@ void op_default_event(op_cpu cpu_type, s
 
 		case CPU_PPC_E500:
 		case CPU_PPC_E500_2:
+		case CPU_PPC_E300:
 			descr->name = "CPU_CLK";
 			break;