diff options
| author | Dave Brolley <brolley@redhat.com> | 2009-04-23 14:16:36 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2009-04-23 14:16:36 -0400 |
| commit | fb6d28283bd7ea63364a008d32c53687a694642f (patch) | |
| tree | aa2d8faf381be8ba016cf4fb18a4d01da464ac60 /runtime/syscall.h | |
| parent | e8aa2f848123598fa8c2110804b250cba1286271 (diff) | |
| parent | 819ec23db74427d0249596959c938673f424f831 (diff) | |
| download | systemtap-steved-fb6d28283bd7ea63364a008d32c53687a694642f.tar.gz systemtap-steved-fb6d28283bd7ea63364a008d32c53687a694642f.tar.xz systemtap-steved-fb6d28283bd7ea63364a008d32c53687a694642f.zip | |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Conflicts:
Makefile.in
Diffstat (limited to 'runtime/syscall.h')
| -rw-r--r-- | runtime/syscall.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/runtime/syscall.h b/runtime/syscall.h index ffc21efc..38b523e1 100644 --- a/runtime/syscall.h +++ b/runtime/syscall.h @@ -345,6 +345,10 @@ struct syscall_get_set_args { int rw; }; +#define CFM_SOF(cfm) ((cfm) & 0x7f) /* Size of frame */ +#define CFM_SOL(cfm) (((cfm) >> 7) & 0x7f) /* Size of locals */ +#define CFM_OUT(cfm) (CFM_SOF(cfm) - CFM_SOL(cfm)) /* Size of outputs */ + static void syscall_get_set_args_cb(struct unw_frame_info *info, void *data) { struct syscall_get_set_args *args = data; @@ -361,15 +365,18 @@ static void syscall_get_set_args_cb(struct unw_frame_info *info, void *data) count = 0; if (in_syscall(pt)) - count = min_t(int, args->n, cfm & 0x7f); + /* args->i + args->n must be less equal than nr outputs */ + count = min_t(int, args->n, CFM_OUT(cfm) - args->i); for (i = 0; i < count; i++) { + /* Skips dirties and locals */ if (args->rw) - *ia64_rse_skip_regs(krbs, ndirty + i + args->i) = + *ia64_rse_skip_regs(krbs, + ndirty + CFM_SOL(cfm) + args->i + i) = args->args[i]; else args->args[i] = *ia64_rse_skip_regs(krbs, - ndirty + i + args->i); + ndirty + CFM_SOL(cfm) + args->i + i); } if (!args->rw) { |