[prev in list] [next in list] [prev in thread] [next in thread] 

List:       oprofile-commits
Subject:    [oprof-cvs] CVS: oprofile/libop op_cpu_type.c, 1.44,
From:       John Levon <movement () users ! sourceforge ! net>
Date:       2007-05-24 17:08:38
Message-ID: E1HrGnm-0000R6-CE () sc8-pr-cvs3 ! sourceforge ! net
[Download RAW message or body]

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

Modified Files:
	op_cpu_type.c op_cpu_type.h op_events.c 
Log Message:
Various patches from Richard Purdie


Index: op_cpu_type.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libop/op_cpu_type.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -d -r1.44 -r1.45
--- op_cpu_type.c	23 May 2007 14:02:34 -0000	1.44
+++ op_cpu_type.c	24 May 2007 17:08:35 -0000	1.45
@@ -70,7 +70,7 @@ static struct cpu_descr const cpu_descrs
 	{ "AMD64 family10", "x86-64/family10", CPU_FAMILY10, 4 },
 	{ "ppc64 PA6T", "ppc64/pa6t", CPU_PPC64_PA6T, 6 },
 	{ "ARM MPCore", "arm/mpcore", CPU_ARM_MPCORE, 2 },
-	{ "ARM11 PMU", "arm/armv6", CPU_ARM_ARM11, 3 },
+	{ "ARM V6 PMU", "arm/armv6", CPU_ARM_V6, 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.37
retrieving revision 1.38
diff -u -p -d -r1.37 -r1.38
--- op_cpu_type.h	23 May 2007 14:02:34 -0000	1.37
+++ op_cpu_type.h	24 May 2007 17:08:35 -0000	1.38
@@ -68,7 +68,7 @@ typedef enum {
 	CPU_FAMILY10, /**< AMD family 10 */
  	CPU_PPC64_PA6T, /**< ppc64 PA6T */
 	CPU_ARM_MPCORE, /**< ARM MPCore */
-	CPU_ARM_ARM11, /**< ARM11 */
+	CPU_ARM_V6, /**< ARM V6 */
 	MAX_CPU_TYPE
 } op_cpu;
 

Index: op_events.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libop/op_events.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -d -r1.81 -r1.82
--- op_events.c	23 May 2007 14:02:34 -0000	1.81
+++ op_events.c	24 May 2007 17:08:35 -0000	1.82
@@ -786,6 +786,7 @@ void op_default_event(op_cpu cpu_type, s
 		case CPU_ARM_XSCALE1:
 		case CPU_ARM_XSCALE2:
 		case CPU_ARM_MPCORE:
+		case CPU_ARM_V6:
 			descr->name = "CPU_CYCLES";
 			break;
 
@@ -842,10 +843,6 @@ void op_default_event(op_cpu cpu_type, s
 			descr->name = "CPU_CLK";
 			break;
 
-		case CPU_ARM_ARM11:
-			descr->name = "CPU_CYCLES";
-			break;
-             
 		// don't use default, if someone add a cpu he wants a compiler
 		// warning if he forgets to handle it here.
 		case CPU_TIMER_INT:


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Oprofile-commits mailing list
Oprofile-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/oprofile-commits
[prev in list] [next in list] [prev in thread] [next in thread]