diff --git a/subprojects/libdemangle.wrap b/subprojects/libdemangle.wrap
index 54cd8a4acb..6555daf50c 100644
--- a/subprojects/libdemangle.wrap
+++ b/subprojects/libdemangle.wrap
@@ -1,3 +1,3 @@
 [wrap-git]
 url = https://github.com/rizinorg/rz-libdemangle.git
-revision = de95fa539431de045ab1a32476b5712975b9b62d
+revision = cde2257302e9afe46a73ecc2ad1349ac45d573d6
diff --git a/test/db/cmd/cmd_i b/test/db/cmd/cmd_i
index 2339d0967e..306eb1b607 100644
--- a/test/db/cmd/cmd_i
+++ b/test/db/cmd/cmd_i
@@ -1288,12 +1288,12 @@ pthread_mutex_unlock
 0x000149a4 2 typeinfo name for unsigned long
 0x000149a8 3 typeinfo name for unsigned long*
 0x000149ac 4 typeinfo name for unsigned long const*
-0x000149b0 2 typeinfo name for long long
-0x000149b4 3 typeinfo name for long long*
-0x000149b8 4 typeinfo name for long long const*
-0x000149bc 2 typeinfo name for unsigned long long
-0x000149c0 3 typeinfo name for unsigned long long*
-0x000149c4 4 typeinfo name for unsigned long long const*
+0x000149b0 2 typeinfo name for int64_t
+0x000149b4 3 typeinfo name for int64_t*
+0x000149b8 4 typeinfo name for int64_t const*
+0x000149bc 2 typeinfo name for uint64_t
+0x000149c0 3 typeinfo name for uint64_t*
+0x000149c4 4 typeinfo name for uint64_t const*
 0x000149c8 2 typeinfo name for float
 0x000149cc 3 typeinfo name for float*
 0x000149d0 4 typeinfo name for float const*
@@ -1337,12 +1337,12 @@ pthread_mutex_unlock
 0x00016938 16 typeinfo for float const*
 0x00016958 8 typeinfo for float
 0x00016948 16 typeinfo for float*
-0x00016960 16 typeinfo for unsigned long long const*
-0x00016980 8 typeinfo for unsigned long long
-0x00016970 16 typeinfo for unsigned long long*
-0x00016988 16 typeinfo for long long const*
-0x000169a8 8 typeinfo for long long
-0x00016998 16 typeinfo for long long*
+0x00016960 16 typeinfo for uint64_t const*
+0x00016980 8 typeinfo for uint64_t
+0x00016970 16 typeinfo for uint64_t*
+0x00016988 16 typeinfo for int64_t const*
+0x000169a8 8 typeinfo for int64_t
+0x00016998 16 typeinfo for int64_t*
 0x000169b0 16 typeinfo for unsigned long const*
 0x000169d0 8 typeinfo for unsigned long
 0x000169c0 16 typeinfo for unsigned long*
diff --git a/test/db/formats/mach0/relocs b/test/db/formats/mach0/relocs
index d0850506b4..9f67ec94b4 100644
--- a/test/db/formats/mach0/relocs
+++ b/test/db/formats/mach0/relocs
@@ -115,7 +115,7 @@ vaddr      paddr      target     type    name
 0x000012a8 0x000012a8 0x0000d298 UNKNOWN IORegistryEntry::setProperty(char const*, OSObject*)
 0x000012b0 0x000012b0 0x0000d2a0 UNKNOWN IORegistryEntry::setProperty(char const*, char const*)
 0x000012b8 0x000012b8 0x0000d2a8 UNKNOWN IORegistryEntry::setProperty(char const*, bool)
-0x000012c0 0x000012c0 0x0000d2b0 UNKNOWN IORegistryEntry::setProperty(char const*, unsigned long long, unsigned int)
+0x000012c0 0x000012c0 0x0000d2b0 UNKNOWN IORegistryEntry::setProperty(char const*, uint64_t, unsigned int)
 0x000012c8 0x000012c8 0x0000d2b8 UNKNOWN IORegistryEntry::setProperty(char const*, void*, unsigned int)
 0x000012d0 0x000012d0 0x0000d2c0 UNKNOWN IORegistryEntry::removeProperty(OSSymbol const*)
 0x000012d8 0x000012d8 0x0000d2c8 UNKNOWN IORegistryEntry::removeProperty(OSString const*)
@@ -165,7 +165,7 @@ vaddr      paddr      target     type    name
 0x00001438 0x00001438 0x0000d428 UNKNOWN IOService::requestTerminate(IOService*, unsigned int)
 0x00001440 0x00001440 0x0000d430 UNKNOWN IOService::willTerminate(IOService*, unsigned int)
 0x00001448 0x00001448 0x0000d438 UNKNOWN IOService::didTerminate(IOService*, unsigned int, bool*)
-0x00001450 0x00001450 0x0000d440 UNKNOWN IOService::nextIdleTimeout(unsigned long long, unsigned long long, unsigned int)
+0x00001450 0x00001450 0x0000d440 UNKNOWN IOService::nextIdleTimeout(uint64_t, uint64_t, unsigned int)
 0x00001458 0x00001458 0x0000d448 UNKNOWN IOService::systemWillShutdown(unsigned int)
 0x00001460 0x00001460 0x0000d450 UNKNOWN IOService::copyClientWithCategory(OSSymbol const*)
 0x00001468 0x00001468 0x0000d458 UNKNOWN IOService::configureReport(IOReportChannelList*, unsigned int, void*, void*)
@@ -464,7 +464,7 @@ vaddr      paddr      target     type    name
 0x000012a8 0x000012a8 0x0000d298 UNKNOWN IORegistryEntry::setProperty(char const*, OSObject*)
 0x000012b0 0x000012b0 0x0000d2a0 UNKNOWN IORegistryEntry::setProperty(char const*, char const*)
 0x000012b8 0x000012b8 0x0000d2a8 UNKNOWN IORegistryEntry::setProperty(char const*, bool)
-0x000012c0 0x000012c0 0x0000d2b0 UNKNOWN IORegistryEntry::setProperty(char const*, unsigned long long, unsigned int)
+0x000012c0 0x000012c0 0x0000d2b0 UNKNOWN IORegistryEntry::setProperty(char const*, uint64_t, unsigned int)
 0x000012c8 0x000012c8 0x0000d2b8 UNKNOWN IORegistryEntry::setProperty(char const*, void*, unsigned int)
 0x000012d0 0x000012d0 0x0000d2c0 UNKNOWN IORegistryEntry::removeProperty(OSSymbol const*)
 0x000012d8 0x000012d8 0x0000d2c8 UNKNOWN IORegistryEntry::removeProperty(OSString const*)
@@ -514,7 +514,7 @@ vaddr      paddr      target     type    name
 0x00001438 0x00001438 0x0000d428 UNKNOWN IOService::requestTerminate(IOService*, unsigned int)
 0x00001440 0x00001440 0x0000d430 UNKNOWN IOService::willTerminate(IOService*, unsigned int)
 0x00001448 0x00001448 0x0000d438 UNKNOWN IOService::didTerminate(IOService*, unsigned int, bool*)
-0x00001450 0x00001450 0x0000d440 UNKNOWN IOService::nextIdleTimeout(unsigned long long, unsigned long long, unsigned int)
+0x00001450 0x00001450 0x0000d440 UNKNOWN IOService::nextIdleTimeout(uint64_t, uint64_t, unsigned int)
 0x00001458 0x00001458 0x0000d448 UNKNOWN IOService::systemWillShutdown(unsigned int)
 0x00001460 0x00001460 0x0000d450 UNKNOWN IOService::copyClientWithCategory(OSSymbol const*)
 0x00001468 0x00001468 0x0000d458 UNKNOWN IOService::configureReport(IOReportChannelList*, unsigned int, void*, void*)
@@ -809,7 +809,7 @@ vaddr      paddr      target     type    name
 0x0000c308 0x0000c308 0x0001c2c8 UNKNOWN IORegistryEntry::setProperty(char const*, OSObject*)
 0x0000c310 0x0000c310 0x0001c2d0 UNKNOWN IORegistryEntry::setProperty(char const*, char const*)
 0x0000c318 0x0000c318 0x0001c2d8 UNKNOWN IORegistryEntry::setProperty(char const*, bool)
-0x0000c320 0x0000c320 0x0001c2e0 UNKNOWN IORegistryEntry::setProperty(char const*, unsigned long long, unsigned int)
+0x0000c320 0x0000c320 0x0001c2e0 UNKNOWN IORegistryEntry::setProperty(char const*, uint64_t, unsigned int)
 0x0000c328 0x0000c328 0x0001c2e8 UNKNOWN IORegistryEntry::setProperty(char const*, void*, unsigned int)
 0x0000c330 0x0000c330 0x0001c2f0 UNKNOWN IORegistryEntry::removeProperty(OSSymbol const*)
 0x0000c338 0x0000c338 0x0001c2f8 UNKNOWN IORegistryEntry::removeProperty(OSString const*)
@@ -859,7 +859,7 @@ vaddr      paddr      target     type    name
 0x0000c498 0x0000c498 0x0001c458 UNKNOWN IOService::requestTerminate(IOService*, unsigned int)
 0x0000c4a0 0x0000c4a0 0x0001c460 UNKNOWN IOService::willTerminate(IOService*, unsigned int)
 0x0000c4a8 0x0000c4a8 0x0001c468 UNKNOWN IOService::didTerminate(IOService*, unsigned int, bool*)
-0x0000c4b0 0x0000c4b0 0x0001c470 UNKNOWN IOService::nextIdleTimeout(unsigned long long, unsigned long long, unsigned int)
+0x0000c4b0 0x0000c4b0 0x0001c470 UNKNOWN IOService::nextIdleTimeout(uint64_t, uint64_t, unsigned int)
 0x0000c4b8 0x0000c4b8 0x0001c478 UNKNOWN IOService::systemWillShutdown(unsigned int)
 0x0000c4c0 0x0000c4c0 0x0001c480 UNKNOWN IOService::copyClientWithCategory(OSSymbol const*)
 0x0000c4c8 0x0000c4c8 0x0001c488 UNKNOWN IOService::configureReport(IOReportChannelList*, unsigned int, void*, void*)
@@ -1153,7 +1153,7 @@ vaddr      paddr      target     type    name
 0x0000c308 0x0000c308 0x0001c2c8 UNKNOWN IORegistryEntry::setProperty(char const*, OSObject*)
 0x0000c310 0x0000c310 0x0001c2d0 UNKNOWN IORegistryEntry::setProperty(char const*, char const*)
 0x0000c318 0x0000c318 0x0001c2d8 UNKNOWN IORegistryEntry::setProperty(char const*, bool)
-0x0000c320 0x0000c320 0x0001c2e0 UNKNOWN IORegistryEntry::setProperty(char const*, unsigned long long, unsigned int)
+0x0000c320 0x0000c320 0x0001c2e0 UNKNOWN IORegistryEntry::setProperty(char const*, uint64_t, unsigned int)
 0x0000c328 0x0000c328 0x0001c2e8 UNKNOWN IORegistryEntry::setProperty(char const*, void*, unsigned int)
 0x0000c330 0x0000c330 0x0001c2f0 UNKNOWN IORegistryEntry::removeProperty(OSSymbol const*)
 0x0000c338 0x0000c338 0x0001c2f8 UNKNOWN IORegistryEntry::removeProperty(OSString const*)
@@ -1203,7 +1203,7 @@ vaddr      paddr      target     type    name
 0x0000c498 0x0000c498 0x0001c458 UNKNOWN IOService::requestTerminate(IOService*, unsigned int)
 0x0000c4a0 0x0000c4a0 0x0001c460 UNKNOWN IOService::willTerminate(IOService*, unsigned int)
 0x0000c4a8 0x0000c4a8 0x0001c468 UNKNOWN IOService::didTerminate(IOService*, unsigned int, bool*)
-0x0000c4b0 0x0000c4b0 0x0001c470 UNKNOWN IOService::nextIdleTimeout(unsigned long long, unsigned long long, unsigned int)
+0x0000c4b0 0x0000c4b0 0x0001c470 UNKNOWN IOService::nextIdleTimeout(uint64_t, uint64_t, unsigned int)
 0x0000c4b8 0x0000c4b8 0x0001c478 UNKNOWN IOService::systemWillShutdown(unsigned int)
 0x0000c4c0 0x0000c4c0 0x0001c480 UNKNOWN IOService::copyClientWithCategory(OSSymbol const*)
 0x0000c4c8 0x0000c4c8 0x0001c488 UNKNOWN IOService::configureReport(IOReportChannelList*, unsigned int, void*, void*)