diff options
Diffstat (limited to 'tapset')
| -rw-r--r-- | tapset/ChangeLog | 4 | ||||
| -rw-r--r-- | tapset/context.stp | 19 | ||||
| -rw-r--r-- | tapset/errno.stp | 2 |
3 files changed, 7 insertions, 18 deletions
diff --git a/tapset/ChangeLog b/tapset/ChangeLog index 42f97b46..63a125fe 100644 --- a/tapset/ChangeLog +++ b/tapset/ChangeLog @@ -1,3 +1,7 @@ +2006-05-03 Frank Ch. Eigler <fche@elastic.org> + + * context.stp, errno.stp: Note/eliminate some retval() duplication. + 2006-04-27 Martin Hunt <hunt@redhat.com> * endian.stp (set_endian): Remove "pure" to prevent diff --git a/tapset/context.stp b/tapset/context.stp index 221c853b..48ee423f 100644 --- a/tapset/context.stp +++ b/tapset/context.stp @@ -112,21 +112,4 @@ function target:long () %{ /* pure */ THIS->__retvalue = _stp_target; %} -function returnval:long () %{ /* pure */ - if (CONTEXT->regs) { -#if defined (__i386__) - THIS->__retvalue = CONTEXT->regs->eax; -#elif defined (__x86_64__) - THIS->__retvalue = CONTEXT->regs->rax; -#elif defined (__powerpc64__) - THIS->__retvalue = CONTEXT->regs->gpr[3]; -#elif defined (__ia64__) - THIS->__retvalue = CONTEXT->regs->r8; -#elif defined (__sparc64__) - THIS->__retvalue = CONTEXT->regs->u_regs[UREG_RETPC]; -#else - THIS->__retvalue = -1; -#endif - } else - THIS->__retvalue = -1; -%} +function returnval () { return retval () } # deprecated diff --git a/tapset/errno.stp b/tapset/errno.stp index 10c4532e..70625d1c 100644 --- a/tapset/errno.stp +++ b/tapset/errno.stp @@ -355,6 +355,8 @@ function errno_str:string (err:long) %{ /* pure */ function returnstr:string (returnp:long) %{ /* pure */ long ret; + /* XXX: unfortunate duplication with return.stp:retval() */ + if (CONTEXT->regs) { #if defined (__i386__) ret = CONTEXT->regs->eax; |