WIP: CI

.azure-pipeline.yml

@@ -0,0 +1,115 @@
+# Documentation: https://wiki.unvanquished.net/wiki/Continuous_integration
+
+trigger:
+  branches:
+    include:
+      - master
+
+pr:
+  branches:
+    include:
+      - '*'
+  paths:
+    include:
+      - .azure-pipelines.yml
+      - src/
+      - include-hax/
+      - cmake/
+      - CMakeLists.txt
+
+strategy:
+  matrix:
+    Linux amd64 GCC:
+      VM_IMAGE: 'ubuntu-22.04'
+      APT_PACKAGES: ninja-build g++-10
+      C_COMPILER: gcc-10
+      CXX_COMPILER: g++-10
+    Linux i686 GCC:
+      VM_IMAGE: 'ubuntu-22.04'
+      APT_PACKAGES: ninja-build g++-i686-linux-gnu
+      C_COMPILER: i686-linux-gnu-gcc
+      CXX_COMPILER: i686-linux-gnu-g++
+      COMPILER_FLAGS: -mfpmath=sse -msse
+    Linux armhf GCC:
+      # There is an IO bug in qemu-arm from ubuntu-22.04.
+      VM_IMAGE: 'ubuntu-24.04'
+      APT_PACKAGES: ninja-build g++-arm-linux-gnueabihf qemu-user
+      C_COMPILER: arm-linux-gnueabihf-gcc
+      CXX_COMPILER: arm-linux-gnueabihf-g++
+      EXE_RUNNER: qemu-arm -L /usr/arm-linux-gnueabihf
+    Linux amd64 Clang:
+      VM_IMAGE: 'ubuntu-22.04'
+      APT_PACKAGES: ninja-build
+      C_COMPILER: clang
+      CXX_COMPILER: clang++
+    Windows amd64 MinGW:
+      VM_IMAGE: 'ubuntu-22.04'
+      APT_PACKAGES: ninja-build g++-mingw-w64-x86-64 mingw-w64-x86-64-dev gcc-mingw-w64-x86-64-posix-runtime wine
+      SETUP_COMMANDS: sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
+      TOOLCHAIN_FILE: cmake/cross-toolchain-mingw64.cmake
+      EXE_RUNNER: wine
+      EXE_EXT: .exe
+      WITH_JWASM: true
+    Windows i686 MinGW:
+      VM_IMAGE: 'ubuntu-22.04'
+      APT_ARCHITECTURE: i386
+      APT_PACKAGES: ninja-build g++-mingw-w64-i686 mingw-w64-i686-dev gcc-mingw-w64-i686-posix-runtime wine wine32
+      SETUP_COMMANDS: sudo update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix
+      TOOLCHAIN_FILE: cmake/cross-toolchain-mingw32.cmake
+      COMPILER_FLAGS: -mfpmath=sse -msse
+      EXE_RUNNER: wine
+      EXE_EXT: .exe
+      WITH_JWASM: true
+    macOS amd64 AppleClang:
+      VM_IMAGE: 'macOS-14'
+      CMAKE_GENERATOR: Unix Makefiles
+      NPROC_COMMAND: sysctl -n hw.logicalcpu
+
+pool:
+  vmImage: $(VM_IMAGE)
+
+steps:
+- bash: |
+    set -xue
+    if [ -n "${APT_ARCHITECTURE:-}" ]; then
+      sudo dpkg --add-architecture "${APT_ARCHITECTURE}"
+    fi
+    if [ -n "${APT_PACKAGES:-}" ]; then
+      sudo apt-get update && sudo apt-get -y -q --no-install-recommends install ${APT_PACKAGES}
+    fi
+    if [ -n "${SETUP_COMMANDS:-}" ]; then
+     $(SETUP_COMMANDS)
+    fi
+  displayName: 'Setup'
+- bash: |
+    set -xue
+    export CMAKE_BUILD_PARALLEL_LEVEL="$(${NPROC_COMMAND:-nproc})"
+    echo "${CMAKE_BUILD_PARALLEL_LEVEL}"
+    cmake_args=(-G"${CMAKE_GENERATOR:-Ninja}")
+    if "${WITH_JWASM:-false}"; then
+        git clone https://github.com/JWasm/JWasm.git build/jwasm
+        cmake -Sbuild/jwasm -Bbuild/jwasm/build
+        cmake --build build/jwasm/build --config Release
+        # No EXE_EXT, this is a native tool.
+        cmake_args+=(-DCMAKE_ASM_MASM_COMPILER="$(realpath build/jwasm/build/jwasm)")
+    fi
+    if [ -n "${TOOLCHAIN_FILE:-}" ]; then
+        cmake_args+=(-DCMAKE_TOOLCHAIN_FILE="${TOOLCHAIN_FILE}")
+    fi
+    if [ -n "${C_COMPILER:-}" ]; then
+        cmake_args+=(-DCMAKE_C_COMPILER="${C_COMPILER}")
+    fi
+    if [ -n "${CXX_COMPILER:-}" ]; then
+        cmake_args+=(-DCMAKE_CXX_COMPILER="${CXX_COMPILER}")
+    fi
+    if [ -n "${COMPILER_FLAGS:-}" ]; then
+        cmake_args+=(-DCMAKE_C_FLAGS="${COMPILER_FLAGS}" -DCMAKE_CXX_FLAGS="${COMPILER_FLAGS}")
+    fi
+    cmake -S. -Bbuild "${cmake_args[@]}"
+    cmake --build build --config Release
+  displayName: 'Build'
+- bash: |
+    set -xue
+    # TODO
+    true
+  displayName: 'Test'

.gitignore

@@ -24,11 +24,12 @@ testserver.log
 /toolchain_build/src/
 
 # Ignore these absolute directories (relative to native_client directory)
-/build/Debug/
-/build/Release/
+/tools/build/Debug/
+/tools/build/Release/
 /chromebinaries/
 /scons-out/
 /toolchain/
+/toolchain
 /tools/BUILD/
 /tools/out/
 /tools/perf_expectations/
@@ -51,3 +52,6 @@ testserver.log
 
 # Ignore the hermetic cygwin used on windows toolchain builds.
 /cygwin/
+
+# It is common practice with CMake to build in build/
+/build/

CMakeLists.txt

@@ -0,0 +1,118 @@
+cmake_minimum_required(VERSION 3.12)
+
+if (COMPILER_TARGET)
+	set(CMAKE_C_COMPILER_TARGET "${COMPILER_TARGET}")
+	set(CMAKE_CXX_COMPILER_TARGET "${COMPILER_TARGET}")
+	set(CMAKE_ASM_COMPILER_TARGET "${COMPILER_TARGET}")
+endif()
+
+project(native_client C CXX ASM)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+
+include(Yokai/Detection)
+include(NaClFlags)
+
+if (NOT CMAKE_BUILD_TYPE)
+	set(CMAKE_BUILD_TYPE RelWithDebInfo)
+endif()
+
+option(BUILD_NACL_LOADER "Build the sel_ldr program." ON)
+
+if (YOKAI_TARGET_SYSTEM_LINUX_COMPATIBILITY)
+	option(BUILD_NACL_HELPER_BOOTSTRAP "Build the nacl_helper_bootstrap program on platforms requiring it." ON)
+endif()
+
+# TODO(arbenson): remove this once binutils bug is fixed (see
+# src/trusted/service_runtime/arch/x86_64/sel_addrspace_posix_x86_64.c)
+if (BUILD_NACL_LOADER AND YOKAI_TARGET_ARCH_AMD64 AND NOT YOKAI_TARGET_SYSTEM_WINDOWS)
+	option(USE_AMD64_ZERO_BASED_SANDBOX "Allow the zero-based sandbox model to run insecurely." OFF)
+endif()
+
+if (BUILD_NACL_LOADER AND YOKAI_TARGET_SYSTEM_WINDOWS)
+	option(FORCE_NO_TRUSTED_BUILD "Prevent use of trusted toolchain." OFF)
+endif()
+
+if (BUILD_NACL_LOADER AND YOKAI_TARGET_SYSTEM_WINDOWS)
+	set(REQUIRE_MASM ON)
+endif()
+
+if (BUILD_NACL_LOADER AND YOKAI_TARGET_SYSTEM_MACOS)
+	set(REQUIRE_PYTHON ON)
+endif()
+
+if (BUILD_NACL_HELPER_BOOTSTRAP)
+	set(REQUIRE_PYTHON ON)
+endif()
+
+if (REQUIRE_PYTHON)
+	if (NOT PYTHON)
+		find_program(PATH_PYTHON NAMES "python3" DOC "Path to the python3 executable." REQUIRED)
+	endif()
+endif()
+
+if (REQUIRE_MASM)
+	if (YOKAI_CXX_COMPILER_MINGW)
+		if (NOT CMAKE_ASM_MASM_COMPILER)
+			find_program(PATH_JWASM NAMES "jwasm" DOC "Path to the JWasm executable." REQUIRED)
+
+			set(CMAKE_ASM_MASM_COMPILER "${PATH_JWASM}")
+		endif()
+
+		include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include-hax/fake_masm")
+
+		if (YOKAI_TARGET_ARCH_I686)
+			list(APPEND CMAKE_ASM_MASM_FLAGS "-coff")
+		elseif(YOKAI_TARGET_ARCH_AMD64)
+			list(APPEND CMAKE_ASM_MASM_FLAGS "-win64")
+		endif()
+	endif()
+
+	enable_language(ASM_MASM)
+endif()
+
+include_directories("include-hax")
+
+if (YOKAI_TARGET_ARCH_I686)
+	set(VALIDATOR_ARCH_SUFFIX "_x86_32")
+elseif (YOKAI_TARGET_ARCH_AMD64)
+	set(VALIDATOR_ARCH_SUFFIX "_x86_64")
+elseif (YOKAI_TARGET_ARCH_ARMHF OR YOKAI_TARGET_ARCH_ARMEL)
+	set(VALIDATOR_ARCH_SUFFIX "_arm")
+elseif (YOKAI_TARGET_ARCH_MIPSEL)
+	set(VALIDATOR_ARCH_SUFFIX "_mips32")
+endif()
+
+if (BUILD_NACL_LOADER)
+	add_subdirectory(src/shared/gio)
+	add_subdirectory(src/shared/imc)
+	add_subdirectory(src/shared/platform)
+	add_subdirectory(src/trusted/cpu_features)
+	add_subdirectory(src/trusted/debug_stub)
+	add_subdirectory(src/trusted/desc)
+	add_subdirectory(src/trusted/fault_injection)
+	add_subdirectory(src/trusted/interval_multiset)
+	add_subdirectory(src/trusted/nacl_base)
+	add_subdirectory(src/trusted/perf_counter)
+	add_subdirectory(src/trusted/platform_qualify)
+	add_subdirectory(src/trusted/validator)
+
+	if (YOKAI_TARGET_ARCH_I686 OR YOKAI_TARGET_ARCH_AMD64)
+		add_subdirectory(src/trusted/validator_x86)
+		add_subdirectory(src/trusted/validator_ragel)
+	elseif (YOKAI_TARGET_ARCH_ARMHF OR YOKAI_TARGET_ARCH_ARMEL)
+		add_subdirectory(src/trusted/validator_arm)
+	elseif (YOKAI_TARGET_ARCH_MIPSEL)
+		add_subdirectory(src/trusted/validator_mips)
+	endif()
+endif()
+
+if (BUILD_NACL_LOADER)
+	add_subdirectory(src/trusted/service_runtime)
+endif()
+
+if (BUILD_NACL_HELPER_BOOTSTRAP)
+	add_subdirectory(src/trusted/service_runtime/linux)
+endif()