diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2008-02-29 10:45:25 -0500 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2008-02-29 10:45:25 -0500 |
| commit | 378f9227b04b876ff06af099715e7d60cdc49903 (patch) | |
| tree | 5a3a3bc2147cbb4740ea78888220b8c94cc6fbd4 /tapset | |
| parent | 9badcdf13130313c19a489e7703988effb4f7cea (diff) | |
| parent | 9ceec314dfc92c5d69442966dd386aaefee90bea (diff) | |
| download | systemtap-steved-378f9227b04b876ff06af099715e7d60cdc49903.tar.gz systemtap-steved-378f9227b04b876ff06af099715e7d60cdc49903.tar.xz systemtap-steved-378f9227b04b876ff06af099715e7d60cdc49903.zip | |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Diffstat (limited to 'tapset')
| -rw-r--r-- | tapset/ChangeLog | 5 | ||||
| -rw-r--r-- | tapset/errno.stp | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/tapset/ChangeLog b/tapset/ChangeLog index e198b9e5..4c65ccc0 100644 --- a/tapset/ChangeLog +++ b/tapset/ChangeLog @@ -1,3 +1,8 @@ +2008-02-28 Will Cohen <wcohen@redhat.com> + + PR433780 + * errno.stp (returnstr): Handle unified i386/x86_64 reg names. + 2008-02-27 Masami Hiramatsu <mhiramat@redhat.com> * x86_64/syscalls.stp (syscall.iopl): Use new_iopl instead of level diff --git a/tapset/errno.stp b/tapset/errno.stp index a6b2c9cf..550e5d4f 100644 --- a/tapset/errno.stp +++ b/tapset/errno.stp @@ -358,7 +358,9 @@ function returnstr:string (returnp:long) %{ /* pure */ /* XXX: unfortunate duplication with return.stp:retval() */ if (CONTEXT->regs) { -#if defined (__i386__) +#if defined (STAPCONF_X86_UNIREGS) && (defined (__x86_64__) || defined (__i386__)) + ret = CONTEXT->regs->ax; +#elif defined (__i386__) ret = CONTEXT->regs->eax; #elif defined (__x86_64__) ret = CONTEXT->regs->rax; |