This is the mail archive of the
systemtap@sourceware.org
mailing list for the systemtap project.
[PATCH 3/4] powerpc: Adjust registers.stp for ppc32
- From: Anton Vorontsov <avorontsov at ru dot mvista dot com>
- To: systemtap at sourceware dot org
- Cc: Jim Keniston <jkenisto at us dot ibm dot com>, ananth at in dot ibm dot com, linuxppc-dev at ozlabs dot org
- Date: Fri, 4 Dec 2009 02:32:02 +0300
- Subject: [PATCH 3/4] powerpc: Adjust registers.stp for ppc32
- References: <20091203233059.GA28186@oksana.dev.rtsoft.ru>
registers.stp is missing a few small bits when running on ppc32:
* Divide register offsets by 2;
* There is 'mq' register instead of 'softe';
* long_arg() should sign-extend the result on ppc32.
Suggested-by: Jim Keniston <jkenisto@us.ibm.com>
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
---
tapset/powerpc/registers.stp | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/tapset/powerpc/registers.stp b/tapset/powerpc/registers.stp
index 2403272..4e77c7a 100644
--- a/tapset/powerpc/registers.stp
+++ b/tapset/powerpc/registers.stp
@@ -1,5 +1,13 @@
/* Dwarfless register access for powerpc */
+function is_powerpc32() %{ /* pure */
+#ifdef __powerpc64__
+ THIS->__retvalue = 0;
+#else
+ THIS->__retvalue = 1;
+#endif
+%}
+
global _reg_offsets, _stp_regs_registered
function _stp_register_regs() {
@@ -43,23 +51,24 @@ function _stp_register_regs() {
_reg_offsets["link"] = 288
_reg_offsets["xer"] = 296
_reg_offsets["ccr"] = 304
- _reg_offsets["softe"] = 312
+ if (is_powerpc32())
+ _reg_offsets["mq"] = 312
+ else
+ _reg_offsets["softe"] = 312
_reg_offsets["trap"] = 320
_reg_offsets["dar"] = 328
_reg_offsets["dsisr"] = 336
_reg_offsets["result"] = 344
- /*
- * If we ever need to support 32bit powerpc, we can
- * get to the register offsets by using just a
- * reg32_offset = _reg_offsets["reg"]/2
- * or somesuch
- */
_stp_regs_registered = 1
}
function probing_32bit_app() %{ /* pure */
+#ifdef __powerpc64__
THIS->__retvalue = _stp_probing_32bit_app(CONTEXT->regs);
+#else
+ THIS->__retvalue = 1;
+#endif
%}
function _stp_get_register_by_offset:long (offset:long) %{ /* pure */
@@ -91,7 +100,11 @@ function _stp_register:long (name:string, sign_extend:long) {
}
if (!_stp_regs_registered)
_stp_register_regs()
+
offset = _reg_offsets[name]
+ if (is_powerpc32())
+ offset /= 2
+
if (offset == 0 && !(name in _reg_offsets)) {
error("Unknown register: " . name)
return 0
@@ -170,7 +183,7 @@ function uint_arg:long (argnum:long) {
}
function long_arg:long (argnum:long) {
- return _stp_arg(argnum, 1, 0)
+ return _stp_arg(argnum, 1, is_powerpc32())
}
function ulong_arg:long (argnum:long) {
--
1.6.3.3