Skip to content

Enable Windows ARM64/ARM64EC #917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Enable Windows ARM64/ARM64EC #917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1256db1
Fix use-after-free in dispatch_select
anthony-linaro Oct 30, 2025
9f8329c
Enable Windows ARM64EC
anthony-linaro Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/firehose/firehose_buffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@

#define DISPATCH_INTERNAL_CRASH(ac, msg) ({ panic(msg); __builtin_trap(); })

#if defined(__x86_64__) || defined(__i386__)
#if (defined(__x86_64__) || defined(__i386__)) && !defined(__arm64ec__)
#define dispatch_hardware_pause() __asm__("pause")
#elif (defined(__arm__) && defined(_ARM_ARCH_7) && defined(__thumb__)) || \
defined(__arm64__)
defined(__arm64__) || defined(__arm64ec__)
#define dispatch_hardware_pause() __asm__("yield")
#define dispatch_hardware_wfe() __asm__("wfe")
#else
Expand Down
2 changes: 1 addition & 1 deletion src/shims/atomic_sfb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#ifndef __DISPATCH_SHIMS_ATOMIC_SFB__
#define __DISPATCH_SHIMS_ATOMIC_SFB__

#if defined(__x86_64__) || defined(__i386__)
#if (defined(__x86_64__) || defined(__i386__)) && !defined(__arm64ec__)

// Returns UINT_MAX if all the bits in p were already set.
DISPATCH_ALWAYS_INLINE
Expand Down
2 changes: 1 addition & 1 deletion src/shims/time.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ typedef enum {

void _dispatch_time_init(void);

#if defined(__i386__) || defined(__x86_64__) || !HAVE_MACH_ABSOLUTE_TIME
#if ((defined(__x86_64__) || defined(__i386__)) && !defined(__arm64ec__)) || !HAVE_MACH_ABSOLUTE_TIME
#define DISPATCH_TIME_UNIT_USES_NANOSECONDS 1
#else
#define DISPATCH_TIME_UNIT_USES_NANOSECONDS 0
Expand Down
2 changes: 1 addition & 1 deletion src/shims/tsd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ _dispatch_cpu_number(void)
{
#if __has_include(<os/tsd.h>)
return _os_cpu_number();
#elif defined(__x86_64__) || defined(__i386__)
#elif (defined(__x86_64__) || defined(__i386__)) && !defined(__arm64ec__)
struct { uintptr_t p1, p2; } p;
__asm__("sidt %[p]" : [p] "=&m" (p));
return (unsigned int)(p.p1 & 0xfff);
Expand Down
4 changes: 2 additions & 2 deletions src/shims/yield.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,10 @@ void *_dispatch_wait_for_enqueuer(void **ptr);
#pragma mark -
#pragma mark dispatch_hardware_pause

#if defined(__x86_64__) || defined(__i386__)
#if (defined(__x86_64__) || defined(__i386__)) && !defined(__arm64ec__)
#define dispatch_hardware_pause() __asm__("pause")
#elif (defined(__arm__) && defined(_ARM_ARCH_7) && defined(__thumb__)) || \
defined(__arm64__)
defined(__arm64__) || defined(__arm64ec__)
#define dispatch_hardware_pause() __asm__("yield")
#define dispatch_hardware_wfe() __asm__("wfe")
#else
Expand Down
10 changes: 5 additions & 5 deletions tests/Foundation/bench.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ static void __attribute__((noinline))
}
#endif

#if defined(__i386__) || defined(__x86_64__)
#if (defined(__x86_64__) || defined(__i386__)) && !defined(__arm64ec__)
static inline uint64_t
rdtsc(void)
{
Expand Down Expand Up @@ -229,7 +229,7 @@ static void __attribute__((noinline))

kr = mach_timebase_info(&tbi);
assert(kr == 0);
#if defined(__i386__) || defined(__x86_64__)
#if (defined(__x86_64__) || defined(__i386__)) && !defined(__arm64ec__)
assert(tbi.numer == tbi.denom); /* This will fail on PowerPC. */
#endif

Expand Down Expand Up @@ -269,7 +269,7 @@ static void __attribute__((noinline))
print_result2(s, "mach_absolute_time():");
#endif

#if defined(__i386__) || defined(__x86_64__)
#if (defined(__x86_64__) || defined(__i386__)) && !defined(__arm64ec__)
s = mach_absolute_time();
for (i = cnt; i; i--) {
rdtsc();
Expand Down Expand Up @@ -382,7 +382,7 @@ static void __attribute__((noinline))
}
print_result(s, "raw 'nop':");

#if defined(__i386__) || defined(__x86_64__)
#if (defined(__x86_64__) || defined(__i386__)) && !defined(__arm64ec__)
s = mach_absolute_time();
for (i = cnt; i; i--) {
__asm__ __volatile__ ("pause");
Expand Down Expand Up @@ -639,7 +639,7 @@ __asm__ __volatile__ ("svc 0x80" : "+r" (_r0)
for (i = cnt; i; i--) {
while (!__sync_bool_compare_and_swap(&global, 0, 1)) {
do {
#if defined(__i386__) || defined(__x86_64__)
#if (defined(__x86_64__) || defined(__i386__)) && !defined(__arm64ec__)
__asm__ __volatile__ ("pause");
#elif defined(__arm__) && defined _ARM_ARCH_7
__asm__ __volatile__ ("yield");
Expand Down
2 changes: 1 addition & 1 deletion tests/dispatch_select.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ stage2(void)
size_t buffer_size = 500*1024*sizeof(char);
char *buffer = malloc(buffer_size);
ssize_t sz = dispatch_test_fd_read(fd, buffer, buffer_size);
free(buffer);
actual += sz;
if (sz < (ssize_t)(buffer_size))
{
Expand All @@ -142,6 +141,7 @@ stage2(void)
test_long("EOF", sz, 0);
dispatch_source_cancel(source);
}
free(buffer);
});

dispatch_source_set_cancel_handler(source, ^{
Expand Down