diff options
| author | Michael W. Hudson <mwh@python.net> | 2004-08-12 18:19:17 (GMT) |
|---|---|---|
| committer | Michael W. Hudson <mwh@python.net> | 2004-08-12 18:19:17 (GMT) |
| commit | 800ba2375a970ca6095465021aa4d8e72279cd9f (patch) | |
| tree | f85f478e14f2da10f2104fee9e7106bc30cc5c54 /Python | |
| parent | d459f536c50256e66bedf999c063d49f2a59fcc6 (diff) | |
| download | cpython-800ba2375a970ca6095465021aa4d8e72279cd9f.zip cpython-800ba2375a970ca6095465021aa4d8e72279cd9f.tar.gz cpython-800ba2375a970ca6095465021aa4d8e72279cd9f.tar.bz2 | |
This is my patch:
[ 1005891 ] support --with-tsc on PPC
plus a trivial change to settscdump's docstring and a Misc/NEWS entry.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/ceval.c | 34 | ||||
| -rw-r--r-- | Python/sysmodule.c | 2 |
2 files changed, 34 insertions, 2 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index 4c9bded..ba452f9 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -17,10 +17,38 @@ #include <ctype.h> #ifdef WITH_TSC -#include <asm/msr.h> typedef unsigned long long uint64; +#if defined(__ppc__) /* <- Don't know if this is the correct symbol; this + section should work for GCC on any PowerPC platform, + irrespective of OS. POWER? Who knows :-) */ + +#define rdtscll(var) ppc_getcounter(&var) + +static void +ppc_getcounter(uint64 *v) +{ + register unsigned long tbu, tb, tbu2; + + loop: + asm volatile ("mftbu %0" : "=r" (tbu) ); + asm volatile ("mftb %0" : "=r" (tb) ); + asm volatile ("mftbu %0" : "=r" (tbu2)); + if (__builtin_expect(tbu != tbu2, 0)) goto loop; + + /* The slightly peculiar way of writing the next lines is + compiled better by GCC than any other way I tried. */ + ((long*)(v))[0] = tbu; + ((long*)(v))[1] = tb; +} + +#else /* this section is for linux/x86 */ + +#include <asm/msr.h> + +#endif + void dump_tsc(int opcode, int ticked, uint64 inst0, uint64 inst1, uint64 loop0, uint64 loop1, uint64 intr0, uint64 intr1) { @@ -34,6 +62,7 @@ void dump_tsc(int opcode, int ticked, uint64 inst0, uint64 inst1, fprintf(stderr, "opcode=%03d t=%d inst=%06lld loop=%06lld\n", opcode, ticked, inst, loop); } + #endif /* Turn this on if your compiler chokes on the big switch: */ @@ -545,6 +574,9 @@ PyEval_EvalFrame(PyFrameObject *f) rdtscll(inst1); rdtscll(loop0); rdtscll(loop1); + + /* shut up the compiler */ + opcode = 0; #endif /* Code access macros */ diff --git a/Python/sysmodule.c b/Python/sysmodule.c index c62b22d..d246a59 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -465,7 +465,7 @@ PyDoc_STRVAR(settscdump_doc, \n\ If true, tell the Python interpreter to dump VM measurements to\n\ stderr. If false, turn off dump. The measurements are based on the\n\ -Pentium time-stamp counter." +processor's time-stamp counter." ); #endif /* TSC */ |