diff options
| author | florian <florian@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2015-01-02 17:32:40 +0000 |
|---|---|---|
| committer | florian <florian@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2015-01-02 17:32:40 +0000 |
| commit | f466eef8e53aafcb617997e1ca18b7c829168db8 (patch) | |
| tree | 6f8c7b88d614ae0ab4ba8e2804d0af87269bf844 /exp-sgcheck | |
| parent | 2d4ba292361ad6d72dc0c1297e3e11bb857d0dc5 (diff) | |
| download | valgrind-f466eef8e53aafcb617997e1ca18b7c829168db8.tar.gz | |
Track the IMark changes in VEX r3055.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14844 a5019735-40e9-0310-863c-91ae7b9d1cf9
Diffstat (limited to 'exp-sgcheck')
| -rw-r--r-- | exp-sgcheck/h_main.c | 2 | ||||
| -rw-r--r-- | exp-sgcheck/sg_main.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/exp-sgcheck/h_main.c b/exp-sgcheck/h_main.c index ed1ac1dcc..fc2650d2b 100644 --- a/exp-sgcheck/h_main.c +++ b/exp-sgcheck/h_main.c @@ -628,7 +628,7 @@ IRSB* h_instrument ( VgCallbackClosure* closure, tl_assert(sizeof(Addr) == sizeof(void*)); tl_assert(sizeof(ULong) == 8); tl_assert(sizeof(Long) == 8); - tl_assert(sizeof(Addr64) == 8); + tl_assert(sizeof(Addr) == sizeof(void*)); tl_assert(sizeof(UInt) == 4); tl_assert(sizeof(Int) == 4); diff --git a/exp-sgcheck/sg_main.c b/exp-sgcheck/sg_main.c index f6f5fc418..22c1000d3 100644 --- a/exp-sgcheck/sg_main.c +++ b/exp-sgcheck/sg_main.c @@ -2063,7 +2063,7 @@ static void shadowStack_unwind ( ThreadId tid, Addr sp_now ) struct _SGEnv { /* the current insn's IP */ - Addr64 curr_IP; + Addr curr_IP; /* whether the above is actually known */ Bool curr_IP_known; /* if we find a mem ref, is it the first for this insn? Used for @@ -2224,7 +2224,7 @@ void sg_instrument_IRStmt ( /*MOD*/struct _SGEnv * env, case Ist_IMark: env->curr_IP_known = True; - env->curr_IP = (Addr)st->Ist.IMark.addr; + env->curr_IP = st->Ist.IMark.addr; env->firstRef = True; break; |