From 9e7d7f95ecfe0dd94b17c8dddff0e9f4934c2ad2 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Sun, 3 Nov 2024 06:35:51 +0100 Subject: [PATCH] examples: make glue and demo code compatible with 64-bit Commit f9886bc60f42 ("Added arm64 assembly for examples/api crt0") added a 64-bit target for the examples but did not adjust the demo code to be 64-bit compatible. Change variable size for pointers. Use %p to print pointers. Signed-off-by: Heinrich Schuchardt --- examples/api/demo.c | 9 ++++----- examples/api/glue.c | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/examples/api/demo.c b/examples/api/demo.c index 677d13b307..9a55f76c50 100644 --- a/examples/api/demo.c +++ b/examples/api/demo.c @@ -43,12 +43,11 @@ int main(int argc, char *const argv[]) if (sig->version > API_SIG_VERSION) return -3; - printf("API signature found @%x\n", (unsigned int)sig); + printf("API signature found @%p\n", sig); test_dump_sig(sig); printf("\n*** Consumer API test ***\n"); - printf("syscall ptr 0x%08x@%08x\n", (unsigned int)syscall_ptr, - (unsigned int)&syscall_ptr); + printf("syscall ptr 0x%p@%p\n", syscall_ptr, &syscall_ptr); /* console activities */ ub_putc('B'); @@ -203,7 +202,7 @@ void test_dump_sig(struct api_signature *sig) printf("signature:\n"); printf(" version\t= %d\n", sig->version); printf(" checksum\t= 0x%08x\n", sig->checksum); - printf(" sc entry\t= 0x%08x\n", (unsigned int)sig->syscall); + printf(" sc entry\t= 0x%p\n", sig->syscall); } void test_dump_si(struct sys_info *si) @@ -296,7 +295,7 @@ void test_dump_di(int handle) struct device_info *di = ub_dev_get(handle); printf("device info (%d):\n", handle); - printf(" cookie\t= 0x%08x\n", (uint32_t)di->cookie); + printf(" cookie\t= 0x%p\n", di->cookie); printf(" type\t\t= 0x%08x\n", di->type); if (di->type == DEV_TYP_NET) { diff --git a/examples/api/glue.c b/examples/api/glue.c index 0aaa82bccb..478f7b6cfb 100644 --- a/examples/api/glue.c +++ b/examples/api/glue.c @@ -41,8 +41,8 @@ static int valid_sig(struct api_signature *sig) int api_search_sig(struct api_signature **sig) { unsigned char *sp; - uint32_t search_start = 0; - uint32_t search_end = 0; + uintptr_t search_start = 0; + uintptr_t search_end = 0; if (sig == NULL) return 0; -- 2.39.5