aboutsummaryrefslogtreecommitdiffstats
path: root/executor/executor.cc
diff options
context:
space:
mode:
authormunjinoo <2jwdream7029@naver.com>2019-05-06 13:55:50 +0900
committerDmitry Vyukov <dvyukov@google.com>2019-05-07 08:48:35 +0200
commit001e36bc7862e1663aa5e6608882e78f08ebab41 (patch)
tree68f14264f40fe4a08b765ea4e3a225077307dec3 /executor/executor.cc
parent04e9d8cedd9dc356d116c5387eac8c1ea9d547f7 (diff)
executor: change syscall argument type to intptr_t
The type size of long depends on compiler. Therefore, changing to intptr_t makes it depends on architecture.
Diffstat (limited to 'executor/executor.cc')
-rw-r--r--executor/executor.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/executor/executor.cc b/executor/executor.cc
index fad53657c..492cb314d 100644
--- a/executor/executor.cc
+++ b/executor/executor.cc
@@ -172,7 +172,7 @@ static const uint64 arg_csum_inet = 0;
static const uint64 arg_csum_chunk_data = 0;
static const uint64 arg_csum_chunk_const = 1;
-typedef long(SYSCALLAPI* syscall_t)(long, long, long, long, long, long, long, long, long);
+typedef intptr_t(SYSCALLAPI* syscall_t)(intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t);
struct call_t {
const char* name;
@@ -199,8 +199,8 @@ struct thread_t {
int call_index;
int call_num;
int num_args;
- long args[kMaxArgs];
- long res;
+ intptr_t args[kMaxArgs];
+ intptr_t res;
uint32 reserrno;
bool fault_injected;
cover_t cov;
@@ -847,7 +847,7 @@ void handle_completion(thread_t* th)
if (event_isset(&th->ready) || !event_isset(&th->done) || !th->executing)
fail("bad thread state in completion: ready=%d done=%d executing=%d",
event_isset(&th->ready), event_isset(&th->done), th->executing);
- if (th->res != (long)-1)
+ if (th->res != (intptr_t)-1)
copyout_call_results(th);
if (!collide && !th->colliding) {
write_call_output(th, true);