diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index b7891eb..b57ecc4 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -93,26 +93,30 @@ jobs: - name: Smoke test — compile hello.pe env: - # arm64 构建用 --arch arm 产出 arm64 Mach-O；x64 用默认 AMD64。 - # x64 产物在 macos-14 (arm64) 上经 Rosetta 2 运行。 ARCH_FLAG: ${{ matrix.arch == 'arm64' && '--arch arm' || '' }} run: | BIN="staging/paze-${{ steps.meta.outputs.version }}-macos-${{ matrix.arch }}/bin" - if [ -f "$BIN/paze" ]; then - "$BIN/paze" tests/hello.pe --target macos $ARCH_FLAG -o /tmp/hello.macos - file /tmp/hello.macos - chmod +x /tmp/hello.macos - # macOS 上执行编译产物（Mach-O 原生可执行；x64 经 Rosetta 2） - /tmp/hello.macos || true - elif [ -f "$BIN/paze.dll" ]; then - dotnet "$BIN/paze.dll" tests/hello.pe --target macos $ARCH_FLAG -o /tmp/hello.macos - file /tmp/hello.macos - chmod +x /tmp/hello.macos - /tmp/hello.macos || true - else - echo "WARN: paze binary not found, listing bin/:" - ls -la "$BIN" + PAZE="$BIN/paze" + if [ -f "$BIN/paze.dll" ] && [ ! -f "$PAZE" ]; then PAZE="dotnet $BIN/paze.dll"; fi + if [ -z "$PAZE" ] || [ ! -f "$BIN/paze" ]; then + echo "WARN: paze binary not found, listing bin/:"; ls -la "$BIN"; exit 0 fi + $PAZE tests/hello.pe --target macos $ARCH_FLAG -o /tmp/hello.macos + file /tmp/hello.macos + chmod +x /tmp/hello.macos + # 诊断代码签名 + echo "=== codesign display ===" + codesign -dv --verbose=4 /tmp/hello.macos 2>&1 || true + echo "=== codesign verify ===" + codesign --verify --deep --strict /tmp/hello.macos 2>&1 && echo "SIGNATURE OK" || echo "SIGNATURE FAILED" + echo "=== spctl assessment ===" + spctl --assess --type execute /tmp/hello.macos 2>&1 || true + echo "=== try run ===" + /tmp/hello.macos 2>&1; echo "exit code: $?" + + - name: Dump Mach-O load commands + run: | + otool -l /tmp/hello.macos 2>&1 | head -120 || true - name: Upload artifact uses: actions/upload-artifact@v4 diff --git a/src/PazeE.Compiler/Binary/MachOWriter.cs b/src/PazeE.Compiler/Binary/MachOWriter.cs index e2066c5..253b7a0 100644 --- a/src/PazeE.Compiler/Binary/MachOWriter.cs +++ b/src/PazeE.Compiler/Binary/MachOWriter.cs @@ -29,6 +29,7 @@ public sealed class MachOWriter : IExecutableWriter private const uint LC_DYSYMTAB = 0x0B; private const uint LC_MAIN = 0x80000028; private const uint LC_CODE_SIGNATURE = 0x1D; + private const uint LC_BUILD_VERSION = 0x32; private const int VM_PROT_READ = 1, VM_PROT_WRITE = 2, VM_PROT_EXECUTE = 4; private const int S_NON_LAZY_SYMBOL_POINTERS = 0x06; // nlist n_type @@ -160,8 +161,9 @@ public sealed class MachOWriter : IExecutableWriter int lcSymtab = 24; int lcDysymtab = 80; int lcCodeSig = 16; // linkedit_data_command（cmd+cmdsize+dataoff+datasize） - int sizeofcmds = segTextCmd + segDataCmd + segLinkCmd + lcDylinker + lcDylib + lcMain + lcSymtab + lcDysymtab + lcCodeSig; - int ncmds = 9; + int lcBuildVer = 24; // build_version_command（cmd+cmdsize+platform+minos+sdk+ntools） + int sizeofcmds = segTextCmd + segDataCmd + segLinkCmd + lcDylinker + lcDylib + lcMain + lcSymtab + lcDysymtab + lcCodeSig + lcBuildVer; + int ncmds = 10; int headerSize = 32; int textFileOff = headerSize + sizeofcmds; // __text 文件偏移 @@ -331,6 +333,14 @@ public sealed class MachOWriter : IExecutableWriter Write32At(f2, 0); Write32At(f2, 0); // extreloff, nextrel Write32At(f2, 0); Write32At(f2, 0); // locreloff, nlocrel + // ---- LC_BUILD_VERSION ---- + Write32At(f2, LC_BUILD_VERSION); + Write32At(f2, 24); // cmdsize + Write32At(f2, 1); // platform = PLATFORM_MACOS + Write32At(f2, 0x000B0000); // minos = macOS 11.0.0 + Write32At(f2, 0x000E0000); // sdk = macOS 14.0.0 + Write32At(f2, 0); // ntools = 0 + // ---- LC_CODE_SIGNATURE ---- Write32At(f2, LC_CODE_SIGNATURE); Write32At(f2, 16); // cmdsize (linkedit_data_command) diff --git a/src/PazeE.Compiler/Binary/MachOWriterArm64.cs b/src/PazeE.Compiler/Binary/MachOWriterArm64.cs index 9e46591..f0cddaa 100644 --- a/src/PazeE.Compiler/Binary/MachOWriterArm64.cs +++ b/src/PazeE.Compiler/Binary/MachOWriterArm64.cs @@ -32,6 +32,7 @@ public sealed class MachOWriterArm64 : IExecutableWriter private const uint LC_DYSYMTAB = 0x0B; private const uint LC_MAIN = 0x80000028; private const uint LC_CODE_SIGNATURE = 0x1D; + private const uint LC_BUILD_VERSION = 0x32; private const int VM_PROT_READ = 1, VM_PROT_WRITE = 2, VM_PROT_EXECUTE = 4; private const int S_NON_LAZY_SYMBOL_POINTERS = 0x06; private const byte N_EXT = 0x01, N_SECT = 0x0e; @@ -139,8 +140,9 @@ public sealed class MachOWriterArm64 : IExecutableWriter int lcSymtab = 24; int lcDysymtab = 80; int lcCodeSig = 16; // linkedit_data_command（cmd+cmdsize+dataoff+datasize） - int sizeofcmds = segTextCmd + segDataCmd + segLinkCmd + lcDylinker + lcDylib + lcMain + lcSymtab + lcDysymtab + lcCodeSig; - int ncmds = 9; + int lcBuildVer = 24; // build_version_command（cmd+cmdsize+platform+minos+sdk+ntools） + int sizeofcmds = segTextCmd + segDataCmd + segLinkCmd + lcDylinker + lcDylib + lcMain + lcSymtab + lcDysymtab + lcCodeSig + lcBuildVer; + int ncmds = 10; int headerSize = 32; int textFileOff = headerSize + sizeofcmds; @@ -329,6 +331,14 @@ public sealed class MachOWriterArm64 : IExecutableWriter Write32At(f2, 0); Write32At(f2, 0); Write32At(f2, 0); Write32At(f2, 0); + // ---- LC_BUILD_VERSION ---- + Write32At(f2, LC_BUILD_VERSION); + Write32At(f2, 24); // cmdsize + Write32At(f2, 1); // platform = PLATFORM_MACOS + Write32At(f2, 0x000B0000); // minos = macOS 11.0.0 + Write32At(f2, 0x000E0000); // sdk = macOS 14.0.0 + Write32At(f2, 0); // ntools = 0 + // ---- LC_CODE_SIGNATURE ---- Write32At(f2, LC_CODE_SIGNATURE); Write32At(f2, 16); // cmdsize (linkedit_data_command)