aboutsummaryrefslogtreecommitdiff
path: root/risu_aarch64.c
diff options
context:
space:
mode:
authorClaudio Fontana <claudio.fontana@huawei.com>2013-09-20 17:54:05 +0200
committerPeter Maydell <peter.maydell@linaro.org>2014-04-25 13:07:15 +0100
commitee7a43e9f0830dc567eddb7d9fe1bb748e03776f (patch)
tree7c3fb56ac23460ef87032beab888bba626225ee6 /risu_aarch64.c
parent5a640eb89d64e510fd6929994197a92fd58ceb31 (diff)
risu_aarch64, risu_arm: do not use NULL in subtraction either.
Signed-off-by: Claudio Fontana <claudio.fontana@huawei.com>
Diffstat (limited to 'risu_aarch64.c')
-rw-r--r--risu_aarch64.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/risu_aarch64.c b/risu_aarch64.c
index d4678b5..80f39f9 100644
--- a/risu_aarch64.c
+++ b/risu_aarch64.c
@@ -66,7 +66,7 @@ int send_register_info(int sock, void *uc)
memblock = (void *)ri.regs[0];
break;
case OP_GETMEMBLOCK:
- set_x0(uc, ri.regs[0] + (memblock - NULL));
+ set_x0(uc, ri.regs[0] + (uintptr_t)memblock);
break;
case OP_COMPAREMEM:
return send_data_pkt(sock, memblock, MEMBLOCKLEN);
@@ -114,7 +114,7 @@ int recv_and_compare_register_info(int sock, void *uc)
memblock = (void *)master_ri.regs[0];
break;
case OP_GETMEMBLOCK:
- set_x0(uc, master_ri.regs[0] + (memblock - NULL));
+ set_x0(uc, master_ri.regs[0] + (uintptr_t)memblock);
break;
case OP_COMPAREMEM:
mem_used = 1;