summaryrefslogtreecommitdiffstats
path: root/tapset/signal.stp
diff options
context:
space:
mode:
Diffstat (limited to 'tapset/signal.stp')
-rw-r--r--tapset/signal.stp17
1 files changed, 6 insertions, 11 deletions
diff --git a/tapset/signal.stp b/tapset/signal.stp
index da220bab..33a2202c 100644
--- a/tapset/signal.stp
+++ b/tapset/signal.stp
@@ -450,19 +450,14 @@ probe signal.procmask = kernel.function("sigprocmask")
}
function get_sigset:long(sigset:long) %{ /* pure */
-
+ int i;
sigset_t *sigset = (sigset_t *)((long)THIS->sigset);
-
-if(_NSIG_BPW == 64)
- THIS->__retvalue = deref(sizeof(sigset_t), sigset);
-else if(_NSIG_BPW == 32)
- THIS->__retvalue = deref(sizeof(int), &(sigset->sig[0])) |
- ((u_int64_t)deref(sizeof(int), &(sigset->sig[1])))<<32;
-
- if(0) {
-deref_fault:
- CONTEXT->last_error = "pointer deref error";
+ THIS->__retvalue = kread(&(sigset->sig[0]));
+ for (i=1; i<_NSIG_WORDS; ++i) {
+ uint64_t part = kread(&(sigset->sig[i]));
+ THIS->__retvalue |= part << (_NSIG_BPW*i);
}
+ CATCH_DEREF_FAULT();
%}
probe signal.procmask.return = kernel.function("sigprocmask").return