commit b3de9598a3e811ea2c63c4abe25b501208495eca
author Tri Vo <trong@google.com> Mon Nov 23 11:26:05 2020 -0800
committer Tri Vo <trong@google.com> Mon Nov 23 11:29:37 2020 -0800
tree f07ac8d95dc2641bd4fa40778d68a0a1ebe72ff5
parent a347c0c8709ed7600fa850783b25e4e0436b290c

Fix -Wvoid-pointer-to-int-cast warnings

user_addr_t is 32-bit, and void* is 64-bit inside the kernel of arm64u32 build.
Newer versions of clang will complain about casting void* to a smaller
interger type. So, cast to uintptr_t first.

Bug: None
Change-Id: I2a1ea47c033ab4890a7aea45fb2390880423785d

app/usercopytest/usercopytest.c

diff --git a/app/usercopytest/usercopytest.c b/app/usercopytest/usercopytest.c
index d0d1bf7..e49d16c 100644
--- a/app/usercopytest/usercopytest.c
+++ b/app/usercopytest/usercopytest.c
@@ -56,7 +56,7 @@
 
 #define START_PAGE_ADDR ((void*)(PAGE_SIZE * 0x10))
 #define TEST_BUF_ADDR \
-    ((user_addr_t)(START_PAGE_ADDR + PAGE_SIZE - TEST_BUF1_SIZE))
+    ((user_addr_t)((uintptr_t)(START_PAGE_ADDR + PAGE_SIZE - TEST_BUF1_SIZE)))
 
 static inline user_addr_t get_addr_param() {
     const void* const* param_arr = GetParam();

lib/trusty/memref.c

diff --git a/lib/trusty/memref.c b/lib/trusty/memref.c
index 9036b3b..6674b3b 100644
--- a/lib/trusty/memref.c
+++ b/lib/trusty/memref.c
@@ -161,7 +161,7 @@
         return rc;
     }
 
-    *addr = (user_addr_t)vaddr;
+    *addr = (user_addr_t)((uintptr_t)vaddr);
 
     LTRACEF("success\n");
     return NO_ERROR;