WIP: build on macos/linux

Author: mrexodia

.devcontainer/devcontainer.json

@@ -0,0 +1,5 @@
+{
+    "name": "riscy-business",
+    "image": "ubuntu:22.04",
+    "runArgs": ["--platform=linux/amd64"]
+}

.devcontainer/packages.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+apt update && apt upgrade -y
+apt install -y git build-essential curl wget lsb-release software-properties-common gnupg cmake ninja-build ripgrep gdb
+wget https://apt.llvm.org/llvm.sh
+chmod +x llvm.sh
+./llvm.sh 19

.gitignore

@@ -13,6 +13,7 @@ build*/
 *.exe
 *.dll
 *.pdb
+*.trace
 
 __pycache__/
 

payload/CMakeLists.txt

@@ -0,0 +1,23 @@
+# payload
+
+## Build (macos)
+
+Install `lld` and `llvm` via homebrew:
+
+```sh
+brew install lld llvm
+```
+
+Configure the build:
+
+```sh
+cmake -B build --toolchain ~/zig-cross/x86_64-windows-gnu.cmake -DCLANG_EXECUTABLE=$(brew --prefix llvm)/bin/clang -DLLD_EXECUTABLE=$(brew --prefix lld)/bin/ld.lld -DOBJCOPY_EXECUTABLE=$(brew --prefix llvm)/bin/llvm-objcopy
+```
+
+## Build (Windows)
+
+Install the LLVM toolset in with the Visual Studio Installer and use the following command line to configure:
+
+```sh
+cmake -B build -T ClangCL -DCLANG_EXECUTABLE=D:\CodeBlocks\llvm-project-19.1.6.src\install\bin\clang.exe -DLLD_EXECUTABLE=D:\CodeBlocks\llvm-project-19.1.6.src\install\bin\ld.lld.exe -DOBJCOPY_EXECUTABLE=D:\CodeBlocks\llvm-project-19.1.6.src\install\bin\llvm-objcopy.exe
+```

payload/README.md

@@ -12,8 +12,9 @@ msvc-runtime = "static"
 [template.riscvm]
 type = "executable"
 add-function = "add_riscvm_executable"
-compile-options = ["/GR-", "/EHs-"]
-compile-definitions = ["_HAS_EXCEPTIONS=0"]
+msvc.compile-options = ["/GR-", "/EHs-"]
+clang.compile-options = ["-fno-exceptions", "-fno-rtti"]
+compile-definitions = ["_HAS_EXCEPTIONS=0"] # TODO: MSVC only?
 
 # Windows implementation of the riscvm syscalls (for debugging only)
 [target.riscvm-crt0]
@@ -23,9 +24,9 @@ sources = ["crt/riscvm-crt0.cpp"]
 [target.payload]
 type = "riscvm"
 sources = [
-    "src/main.cpp",
+    "src/main.c",
     "crt/minicrt.c",
-    "crt/minicrt.cpp",
+    #"crt/minicrt.cpp",
 ]
 headers = [
     "include/phnt.h",

payload/cmake.toml

@@ -2,7 +2,7 @@ include_guard()
 
 # Change these defaults to point to your infrastructure if desired
 set(CMKR_REPO "https://github.com/build-cpp/cmkr" CACHE STRING "cmkr git repository" FORCE)
-set(CMKR_TAG "v0.2.33" CACHE STRING "cmkr git tag (this needs to be available forever)" FORCE)
+set(CMKR_TAG "v0.2.44" CACHE STRING "cmkr git tag (this needs to be available forever)" FORCE)
 set(CMKR_COMMIT_HASH "" CACHE STRING "cmkr git commit hash (optional)" FORCE)
 
 # To bootstrap/generate a cmkr project: cmake -P cmkr.cmake

payload/cmake/cmkr.cmake

@@ -11,23 +11,26 @@ set(EMBED_TYPE "post-merge-pre-opt") # post-merge-pre-opt/optimized
 if(CMAKE_CXX_COMPILER_FRONTEND_VARIANT MATCHES "^MSVC$") # clang-cl
     add_compile_options(-flto)
     add_link_options(/mllvm:-lto-embed-bitcode=${EMBED_TYPE})
-elseif(WIN32) # clang (Windows)
+elseif(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES "Windows") # clang (Windows)
     add_compile_options(-fuse-ld=lld-link -flto)
     add_link_options(-Wl,/mllvm:-lto-embed-bitcode=${EMBED_TYPE})
 else() # clang (unix)
     add_compile_options(-fuse-ld=lld-link -flto)
-    add_link_options(-mllvm -lto-embed-bitcode=${EMBED_TYPE})
+    add_link_options(-Wl,--plugin-opt=-lto-embed-bitcode=${EMBED_TYPE} -static)
 endif()
 
 # Some common annoying warnings when including Windows.h
 add_compile_options(-Wno-pragma-pack -Wno-microsoft-enum-forward-reference)
 
 # Find the regular LLVM toolchain
+# TODO: support zig cross-compilation toolchain
 get_filename_component(LLVM_DIR "${CMAKE_CXX_COMPILER}" DIRECTORY)
 find_program(CLANG_EXECUTABLE clang PATHS "${LLVM_DIR}" NO_DEFAULT_PATH REQUIRED)
 message(STATUS "Found clang: ${CLANG_EXECUTABLE}")
+# TODO: can we use the clang executable itself as a fallback?
 find_program(LLD_EXECUTABLE ld.lld PATHS "${LLVM_DIR}" NO_DEFAULT_PATH REQUIRED)
 message(STATUS "Found lld: ${LLD_EXECUTABLE}")
+# TODO: is there a cmake variable for this?
 find_program(OBJCOPY_EXECUTABLE llvm-objcopy PATHS "${LLVM_DIR}" NO_DEFAULT_PATH REQUIRED)
 message(STATUS "Found llvm-objcopy: ${OBJCOPY_EXECUTABLE}")
 

payload/cmake/riscvm.cmake

@@ -1,25 +1,48 @@
 #include <assert.h>
-#include <phnt.h>
+// #include <phnt.h>
 #include <malloc.h>
+#include <windows.h>
+
+NTSYSAPI
+void* NTAPI RtlGetCurrentPeb(VOID);
+
+NTSYSAPI
+PVOID
+NTAPI
+RtlAllocateHeap(_In_ HANDLE HeapHandle, _In_opt_ ULONG Flags, _In_ SIZE_T Size);
+
+NTSYSAPI
+PVOID
+NTAPI
+RtlReAllocateHeap(_In_ HANDLE HeapHandle, _In_ ULONG Flags, _Frees_ptr_opt_ PVOID BaseAddress, _In_ SIZE_T Size);
+
+NTSYSAPI
+ULONG
+NTAPI
+RtlFreeHeap(_In_ HANDLE HeapHandle, _In_opt_ ULONG Flags, _Frees_ptr_opt_ _Post_invalid_ PVOID BaseAddress);
+
+static HANDLE GetHeapHandle()
+{
+    HANDLE heap;
+    memcpy(&heap, (char*)RtlGetCurrentPeb() + 0x30, sizeof(HANDLE));
+    return heap;
+}
 
 void* __cdecl malloc(size_t size)
 {
-    HANDLE heap = RtlGetCurrentPeb()->ProcessHeap;
-    return RtlAllocateHeap(heap, HEAP_ZERO_MEMORY, size);
+    return RtlAllocateHeap(GetHeapHandle(), HEAP_ZERO_MEMORY, size);
 }
 
 #ifndef _DEBUG
 void* __cdecl _expand(void* block, size_t size)
 {
-    HANDLE heap = RtlGetCurrentPeb()->ProcessHeap;
-    return RtlReAllocateHeap(heap, HEAP_ZERO_MEMORY, block, size);
+    return RtlReAllocateHeap(GetHeapHandle(), HEAP_ZERO_MEMORY, block, size);
 }
 #endif
 
 void __cdecl free(void* block)
 {
-    HANDLE heap = RtlGetCurrentPeb()->ProcessHeap;
-    RtlFreeHeap(heap, 0, block);
+    RtlFreeHeap(GetHeapHandle(), 0, block);
 }
 
 void* __cdecl calloc(size_t num, size_t size)

payload/crt/minicrt.c

@@ -1,4 +1,4 @@
-#include <phnt.h>
+#include <windows.h>
 #include <stdlib.h>
 #include <exception>
 
@@ -65,6 +65,8 @@ void __cdecl _Throw_Cpp_error(int Code)
     DebugBreak();
 }
 
+#if 0 // TODO: libcpp
+
 _Prhand _Raise_handler = [](const stdext::exception&)
 {
     DebugBreak();
@@ -81,5 +83,6 @@ _Lockit::_Lockit(int _Kind) noexcept
 _Lockit::~_Lockit() noexcept
 {
 }
+#endif
 
 } // namespace std