Skip to content

Commit 04accc2

Browse files
cfillioncfillion
committed
Merge branch 'arm64ec'
Closes #88
2 parents 46c179a + 5cfa341 commit 04accc2

File tree

6 files changed

+130
-89
lines changed

6 files changed

+130
-89
lines changed

‎.appveyor.yml

+13-6
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ build_script:
1414
- cmake --build build
1515

1616
test_script:
17-
- '[ "$ARCH" = "arm64" ] || cmake --build build --target test'
17+
- sh: '[[ "$ARCH" = arm64 ]] || cmake --build build --target test'
18+
- cmd: 'if NOT "%ARCH%" == "arm64ec" cmake --build build --target test'
1819

1920
for:
2021
- matrix: { only: [ appveyor_build_worker_image: &linux Ubuntu1804 ] }
@@ -113,11 +114,14 @@ for:
113114

114115
- matrix: { only: [ appveyor_build_worker_image: &windows Visual Studio 2022 ] }
115116
cache:
116-
- build\vcpkg_installed -> vcpkg.json
117+
- build\vcpkg_installed -> vcpkg.json, cmake\vcpkg-triplets\arm64ec-windows-static.cmake
117118
install:
118-
- if "%ARCH%" == "x64" call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
119-
- if "%ARCH%" == "x86" call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars32.bat"
119+
- if "%ARCH%" == "x64" call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
120+
- if "%ARCH%" == "x86" call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars32.bat"
121+
- if "%ARCH%" == "arm64ec" call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsamd64_arm64.bat"
122+
- if "%ARCH%" == "arm64ec" set CFLAGS=-arm64EC & set CXXFLAGS=-arm64EC
120123
build_script:
124+
- set VCPKG_OVERLAY_TRIPLETS=cmake\vcpkg-triplets
121125
- cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo
122126
-DVCPKG_TARGET_TRIPLET=%ARCH%-windows-static
123127
-DCMAKE_TOOLCHAIN_FILE=C:\Tools\vcpkg\scripts\buildsystems\vcpkg.cmake
@@ -128,12 +132,15 @@ for:
128132

129133
environment:
130134
matrix:
131-
- job_name: Windows 64-bit
135+
- job_name: Windows x86 64-bit
132136
appveyor_build_worker_image: *windows
133137
ARCH: x64
134-
- job_name: Windows 32-bit
138+
- job_name: Windows x86 32-bit
135139
appveyor_build_worker_image: *windows
136140
ARCH: x86
141+
- job_name: Windows ARM 64-bit EC
142+
appveyor_build_worker_image: *windows
143+
ARCH: arm64ec
137144
- job_name: macOS x86 64-bit
138145
appveyor_build_worker_image: macos-mojave
139146
ARCH: x86_64

‎cmake/vcpkg-triplets/arm64ec-windows-static.cmake

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
set(VCPKG_TARGET_ARCHITECTURE arm64ec)
2+
set(VCPKG_CRT_LINKAGE static)
3+
set(VCPKG_LIBRARY_LINKAGE static)

‎src/index_v1.cpp

+21-8
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222

2323
#include <sstream>
2424

25-
static void LoadMetadataV1(XmlNode , Metadata *);
26-
static void LoadCategoryV1(XmlNode , Index *);
27-
static void LoadPackageV1(XmlNode , Category *);
28-
static void LoadVersionV1(XmlNode , Package *);
29-
static void LoadSourceV1(XmlNode , Version *);
25+
static void LoadMetadataV1(XmlNode, Metadata *);
26+
static void LoadCategoryV1(XmlNode, Index *);
27+
static void LoadPackageV1(XmlNode, Category *);
28+
static void LoadVersionV1(XmlNode, Package *);
29+
static void LoadSourceV1(XmlNode, Version *, bool hasArm64Ec);
3030

3131
void Index::loadV1(XmlNode root, Index *ri)
3232
{
@@ -117,8 +117,21 @@ void LoadVersionV1(XmlNode verNode, Package *pkg)
117117

118118
XmlNode node = verNode.firstChild("source");
119119

120+
bool hasArm64Ec = false;
121+
#if defined(_WIN32) && defined(_M_ARM64EC)
120122
while(node) {
121-
LoadSourceV1(node, ver);
123+
const char *platform = *node.attribute("platform");
124+
if(platform && Platform(platform) == Platform::Windows_arm64ec) {
125+
hasArm64Ec = true;
126+
break;
127+
}
128+
node = node.nextSibling("source");
129+
}
130+
node = verNode.firstChild("source");
131+
#endif
132+
133+
while(node) {
134+
LoadSourceV1(node, ver, hasArm64Ec);
122135
node = node.nextSibling("source");
123136
}
124137

@@ -133,7 +146,7 @@ void LoadVersionV1(XmlNode verNode, Package *pkg)
133146
ptr.release();
134147
}
135148

136-
void LoadSourceV1(XmlNode node, Version *ver)
149+
void LoadSourceV1(XmlNode node, Version *ver, const bool hasArm64Ec)
137150
{
138151
const XmlString &platform = node.attribute("platform"),
139152
&type = node.attribute("type"),
@@ -146,7 +159,7 @@ void LoadSourceV1(XmlNode node, Version *ver)
146159
std::unique_ptr<Source> ptr(src);
147160

148161
src->setChecksum(checksum.value_or(""));
149-
src->setPlatform(platform.value_or("all"));
162+
src->setPlatform(Platform(platform.value_or("all"), hasArm64Ec));
150163
src->setTypeOverride(Package::getType(type.value_or("")));
151164

152165
int sections = 0;

‎src/platform.cpp

+12-6
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ const Platform::Enum Platform::Current = Platform::
4646
# endif
4747

4848
#elif _WIN32
49-
# ifdef _WIN64
49+
# ifdef _M_ARM64EC
50+
Windows_arm64ec
51+
# elif _M_X64
5052
Windows_x64
5153
# else
5254
Windows_x86
@@ -60,7 +62,7 @@ const Platform::Enum Platform::Current = Platform::
6062
static_assert(Platform::Current != Platform::Unknown,
6163
"The current operating system or architecture is not supported.");
6264

63-
auto Platform::parse(const char *platform) -> Enum
65+
auto Platform::parse(const char *platform, const bool hasArm64Ec) -> Enum
6466
{
6567
constexpr std::pair<const char *, Enum> map[] {
6668
{ "all", Generic },
@@ -76,14 +78,18 @@ auto Platform::parse(const char *platform) -> Enum
7678
{ "linux-armv7l", Linux_armv7l },
7779
{ "linux-aarch64", Linux_aarch64 },
7880

79-
{ "windows", Windows_Any },
80-
{ "win32", Windows_x86 },
81-
{ "win64", Windows_x64 },
81+
{ "windows", Windows_Any },
82+
{ "win32", Windows_x86 },
83+
{ "win64", Windows_x64 },
84+
{ "windows-arm64ec", Windows_arm64ec },
8285
};
8386

8487
for(auto &[key, value] : map) {
85-
if(!strcmp(platform, key))
88+
if(!strcmp(platform, key)) {
89+
if(!hasArm64Ec && value == Windows_x64)
90+
return Windows_x64_arm64ec;
8691
return value;
92+
}
8793
}
8894

8995
return Unknown;

‎src/platform.hpp

+8-6
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,20 @@ class Platform {
3434
Linux_aarch64 = 1<<6,
3535
Linux_Any = Linux_i686 | Linux_x86_64 | Linux_armv7l | Linux_aarch64,
3636

37-
Windows_x86 = 1<<7,
38-
Windows_x64 = 1<<8,
39-
Windows_Any = Windows_x86 | Windows_x64,
37+
Windows_x86 = 1<<7,
38+
Windows_x64 = 1<<8,
39+
Windows_arm64ec = 1<<9,
40+
Windows_Any = Windows_x86 | Windows_x64 | Windows_arm64ec,
41+
Windows_x64_arm64ec = Windows_x64 | Windows_arm64ec,
4042

41-
Generic = Darwin_Any | Linux_Any | Windows_Any,
43+
Generic = Darwin_Any | Linux_Any | Windows_Any,
4244
};
4345

4446
static const Enum Current;
4547

4648
Platform() : m_value(Generic) {}
4749
Platform(Enum val) : m_value(val) {}
48-
Platform(const char *str) : m_value(parse(str)) {}
50+
Platform(const char *str, bool hasArm64Ec = true) : m_value(parse(str, hasArm64Ec)) {}
4951

5052
Enum value() const { return m_value; }
5153
bool test() const;
@@ -54,7 +56,7 @@ class Platform {
5456
Platform &operator=(Enum n) { m_value = n; return *this; }
5557

5658
private:
57-
static Enum parse(const char *);
59+
static Enum parse(const char *, bool hasArm64Ec);
5860

5961
Enum m_value;
6062
};

‎test/platform.cpp

+73-63
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@ TEST_CASE("platform from string", M) {
2020
REQUIRE(Platform("all") == Platform::Generic);
2121

2222
SECTION("windows") {
23-
REQUIRE(Platform("windows") == Platform::Windows_Any);
24-
REQUIRE(Platform("win32") == Platform::Windows_x86);
25-
REQUIRE(Platform("win64") == Platform::Windows_x64);
23+
REQUIRE(Platform("windows") == Platform::Windows_Any);
24+
REQUIRE(Platform("win32") == Platform::Windows_x86);
25+
REQUIRE(Platform("win64") == Platform::Windows_x64);
26+
REQUIRE(Platform("win64", false) == Platform::Windows_x64_arm64ec);
27+
REQUIRE(Platform("windows-arm64ec") == Platform::Windows_arm64ec);
2628
}
2729

2830
SECTION("macOS") {
@@ -47,84 +49,92 @@ TEST_CASE("test platform", M) {
4749
{Platform::Generic, true },
4850

4951
#ifdef __APPLE__
50-
{Platform::Linux_Any, false},
51-
{Platform::Linux_x86_64, false},
52-
{Platform::Linux_i686, false},
53-
{Platform::Linux_armv7l, false},
54-
{Platform::Linux_aarch64, false},
55-
{Platform::Windows_Any, false},
56-
{Platform::Windows_x64, false},
57-
{Platform::Windows_x86, false},
58-
59-
{Platform::Darwin_Any, true },
52+
{Platform::Linux_Any, false},
53+
{Platform::Linux_x86_64, false},
54+
{Platform::Linux_i686, false},
55+
{Platform::Linux_armv7l, false},
56+
{Platform::Linux_aarch64, false},
57+
{Platform::Windows_Any, false},
58+
{Platform::Windows_x64, false},
59+
{Platform::Windows_x86, false},
60+
{Platform::Windows_arm64ec, false},
61+
62+
{Platform::Darwin_Any, true },
6063
# ifdef __x86_64__
61-
{Platform::Darwin_i386, false},
62-
{Platform::Darwin_x86_64, true },
63-
{Platform::Darwin_arm64, false},
64+
{Platform::Darwin_i386, false},
65+
{Platform::Darwin_x86_64, true },
66+
{Platform::Darwin_arm64, false},
6467
# elif __i386__
65-
{Platform::Darwin_i386, true },
66-
{Platform::Darwin_x86_64, false},
67-
{Platform::Darwin_arm64, false},
68+
{Platform::Darwin_i386, true },
69+
{Platform::Darwin_x86_64, false},
70+
{Platform::Darwin_arm64, false},
6871
# elif __arm64__
69-
{Platform::Darwin_i386, false},
70-
{Platform::Darwin_x86_64, false},
71-
{Platform::Darwin_arm64, true },
72+
{Platform::Darwin_i386, false},
73+
{Platform::Darwin_x86_64, false},
74+
{Platform::Darwin_arm64, true },
7275
# else
7376
# error Untested architecture
7477
# endif
7578

7679
#elif __linux__
77-
{Platform::Darwin_Any, false},
78-
{Platform::Darwin_i386, false},
79-
{Platform::Darwin_x86_64, false},
80-
{Platform::Darwin_arm64, false},
81-
{Platform::Windows_Any, false},
82-
{Platform::Windows_x86, false},
83-
{Platform::Windows_x64, false},
84-
85-
{Platform::Linux_Any, true },
80+
{Platform::Darwin_Any, false},
81+
{Platform::Darwin_i386, false},
82+
{Platform::Darwin_x86_64, false},
83+
{Platform::Darwin_arm64, false},
84+
{Platform::Windows_Any, false},
85+
{Platform::Windows_x86, false},
86+
{Platform::Windows_x64, false},
87+
{Platform::Windows_arm64ec, false},
88+
89+
{Platform::Linux_Any, true },
8690
# ifdef __x86_64__
87-
{Platform::Linux_i686, false},
88-
{Platform::Linux_x86_64, true },
89-
{Platform::Linux_armv7l, false},
90-
{Platform::Linux_aarch64, false},
91+
{Platform::Linux_i686, false},
92+
{Platform::Linux_x86_64, true },
93+
{Platform::Linux_armv7l, false},
94+
{Platform::Linux_aarch64, false},
9195
# elif __i686__
92-
{Platform::Linux_i686, true },
93-
{Platform::Linux_x86_64, false},
94-
{Platform::Linux_armv7l, false},
95-
{Platform::Linux_aarch64, false},
96+
{Platform::Linux_i686, true },
97+
{Platform::Linux_x86_64, false},
98+
{Platform::Linux_armv7l, false},
99+
{Platform::Linux_aarch64, false},
96100
# elif __ARM_ARCH_7A__
97-
{Platform::Linux_i686, false},
98-
{Platform::Linux_x86_64, false},
99-
{Platform::Linux_armv7l, true },
100-
{Platform::Linux_aarch64, false},
101+
{Platform::Linux_i686, false},
102+
{Platform::Linux_x86_64, false},
103+
{Platform::Linux_armv7l, true },
104+
{Platform::Linux_aarch64, false},
101105
# elif __aarch64__
102-
{Platform::Linux_i686, false},
103-
{Platform::Linux_x86_64, false},
104-
{Platform::Linux_armv7l, false},
105-
{Platform::Linux_aarch64, true },
106+
{Platform::Linux_i686, false},
107+
{Platform::Linux_x86_64, false},
108+
{Platform::Linux_armv7l, false},
109+
{Platform::Linux_aarch64, true },
106110
# else
107111
# error Untested architecture
108112
# endif
109113

110114
#elif _WIN32
111-
{Platform::Darwin_Any, false},
112-
{Platform::Darwin_i386, false},
113-
{Platform::Darwin_x86_64, false},
114-
{Platform::Darwin_arm64, false},
115-
{Platform::Linux_Any, false},
116-
{Platform::Linux_x86_64, false},
117-
{Platform::Linux_i686, false},
118-
{Platform::Linux_armv7l, false},
119-
{Platform::Linux_aarch64, false},
120-
121-
{Platform::Windows_Any, true },
122-
# ifdef _WIN64
123-
{Platform::Windows_x86, false},
124-
{Platform::Windows_x64, true },
115+
{Platform::Darwin_Any, false},
116+
{Platform::Darwin_i386, false},
117+
{Platform::Darwin_x86_64, false},
118+
{Platform::Darwin_arm64, false},
119+
{Platform::Linux_Any, false},
120+
{Platform::Linux_x86_64, false},
121+
{Platform::Linux_i686, false},
122+
{Platform::Linux_armv7l, false},
123+
{Platform::Linux_aarch64, false},
124+
125+
{Platform::Windows_Any, true },
126+
# ifdef _M_ARM64EC
127+
{Platform::Windows_x86, false},
128+
{Platform::Windows_x64, false},
129+
{Platform::Windows_arm64ec, true },
130+
# elif _M_X64
131+
{Platform::Windows_x86, false},
132+
{Platform::Windows_x64, true },
133+
{Platform::Windows_arm64ec, false},
125134
# else
126-
{Platform::Windows_x86, true },
127-
{Platform::Windows_x64, false},
135+
{Platform::Windows_x86, true },
136+
{Platform::Windows_x64, false},
137+
{Platform::Windows_arm64ec, false},
128138
# endif
129139

130140
#else

0 commit comments

Comments
 (0)