Allow accessing of pointer values in mathematical expressions

Clang on macos already defines is_integral and is_signed for 128 bit types

.github/workflows/build.yml

@@ -0,0 +1,138 @@
+name: Build
+
+on:
+  push:
+  pull_request:
+
+env:
+  BUILD_TYPE: Release
+
+jobs:
+
+  linux:
+    runs-on: ubuntu-20.04
+    name: 🐧 Ubuntu 20.04
+    steps:
+
+    - name: 🧰 Checkout
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: ⬇️ Install dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y \
+          build-essential       \
+          gcc-10                \
+          g++-10                \
+          pkg-config            \
+          cmake                 \
+          make                  \
+          libglfw3-dev          \
+          libglm-dev            \
+          libmagic-dev          \
+          libssl-dev            \
+          libcapstone-dev       \
+          nlohmann-json3-dev    \
+          python3-dev           \
+          libfreetype-dev       \
+
+    - name: ✋ Build
+      run: |
+        mkdir build
+        cd build
+        CC=gcc-10 CXX=g++-10 cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE ..
+        make -j 4
+
+    - name: 📦 Uploading artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: Linux ELF
+        path: build/imhex
+
+
+  win-manual:
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { msystem: MINGW64, arch: x86_64 }
+          #- { msystem: MINGW32, arch: i686   } # currently fail
+    name: 🟦 ${{ matrix.msystem }} · ${{ matrix.arch }}
+    defaults:
+      run:
+        shell: msys2 {0}
+    env:
+      MINGW_INSTALLS: ${{ matrix.msystem }}
+    steps:
+
+    - name: 🧰 Checkout
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: ⬇️ Install dependencies
+      uses: msys2/setup-msys2@v2
+      with:
+        msystem: ${{ matrix.msystem }}
+        update: true
+        install: >
+          mingw-w64-${{ matrix.arch }}-gcc
+          mingw-w64-${{ matrix.arch }}-cmake
+          mingw-w64-${{ matrix.arch }}-make
+          mingw-w64-${{ matrix.arch }}-capstone
+          mingw-w64-${{ matrix.arch }}-glfw
+          mingw-w64-${{ matrix.arch }}-glm
+          mingw-w64-${{ matrix.arch }}-file
+          mingw-w64-${{ matrix.arch }}-nlohmann-json
+          mingw-w64-${{ matrix.arch }}-openssl
+          mingw-w64-${{ matrix.arch }}-polly
+          mingw-w64-${{ matrix.arch }}-python
+          mingw-w64-${{ matrix.arch }}-dlfcn
+          mingw-w64-${{ matrix.arch }}-freetype
+
+    - name: ✋ Build
+      run: |
+        mkdir build
+        cd build
+        ls -1 C:/hostedtoolcache/windows/Python/3.9.1/x64/python39.dll | xargs -L1 -I{} cp {} .
+        ls -1 D:/a/_temp/msys/msys64/mingw64/bin/libwinpthread-?.dll | xargs -L1 -I{} cp {} .
+        cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=$BUILD_TYPE ..
+        mingw32-make -j 4
+    - name: 📦 Uploading artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: Windows EXE
+        path: |
+          build/*.exe
+          build/python39.dll
+          build/libwinpthread-?.dll
+
+  macos-build:
+    runs-on: macos-11.0
+    name: 🍎 macOS 11.0
+    steps:
+
+    - name: 🧰 Checkout
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: ⬇️ Install dependencies
+      run: |
+        brew bundle --no-lock --file dist/Brewfile
+
+    - name: ✋ Build
+      run: |
+        mkdir build
+        cd build
+        CC=$(brew --prefix llvm)/bin/clang CXX=$(brew --prefix llvm)/bin/clang++ PKG_CONFIG_PATH="$(brew --prefix openssl)/lib/pkgconfig":"$(brew --prefix)/lib/pkgconfig" cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCREATE_BUNDLE=ON -DCREATE_PACKAGE=ON ..
+        make -j 4 package
+
+    - name: 📦 Uploading artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: macOS DMG
+        path: build/*.dmg

.github/workflows/build_linux.yml

@@ -1,44 +0,0 @@
-name: build-linux
-
-on:
-  push:
-  pull_request:
-
-env:
-  BUILD_TYPE: Release
-
-jobs:
-  build:
-    runs-on: ubuntu-20.04
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-
-    - name: Setup
-      shell: bash
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y build-essential    \
-                           gcc-10                  \
-                           g++-10                  \
-                           pkg-config              \
-                           cmake                   \
-                           make                    \
-                           libglfw3-dev            \
-                           libglm-dev              \
-                           libmagic-dev            \
-                           libssl-dev              \
-                           libcapstone-dev         \
-                           llvm-dev                \
-                           nlohmann-json3-dev      \
-                           python3-dev             \
-
-    - name: Build
-      shell: bash
-      run: |
-        mkdir build
-        cd build
-        CC=gcc-10 CXX=g++-10 cmake ..
-        make -j 4

.github/workflows/build_win.yml

@@ -1,40 +0,0 @@
-name: build-win
-
-on:
-  push:
-  pull_request:
-
-env:
-  BUILD_TYPE: Release
-
-jobs:
-  build:
-    runs-on: windows-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        include: [
-          { msystem: MINGW64, arch: x86_64 },
-          # currently fail
-          #{ msystem: MINGW32, arch: i686   }
-        ]
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-
-    - name: Setup
-      uses: msys2/setup-msys2@v2
-      with:
-        msystem: ${{ matrix.msystem }}
-        install: mingw-w64-${{ matrix.arch }}-gcc mingw-w64-${{ matrix.arch }}-cmake mingw-w64-${{ matrix.arch }}-make mingw-w64-${{ matrix.arch }}-capstone mingw-w64-${{ matrix.arch }}-glfw mingw-w64-${{ matrix.arch }}-glm mingw-w64-${{ matrix.arch }}-file mingw-w64-${{ matrix.arch }}-llvm mingw-w64-${{ matrix.arch }}-nlohmann-json mingw-w64-${{ matrix.arch }}-openssl mingw-w64-${{ matrix.arch }}-polly mingw-w64-${{ matrix.arch }}-python
-        update: true
-
-    - name: Build
-      shell: msys2 {0}
-      run: |
-        mkdir build
-        cd build
-        cmake -G "MinGW Makefiles" ..
-        mingw32-make -j 4

.gitignore

@@ -1,3 +1,5 @@
+.vscode/
+.idea/
 
 cmake-build-debug/
 
@@ -8,3 +10,4 @@ build/
 
 *.mgc
 imgui.ini
+.DS_Store

.idea/.name

@@ -0,0 +1 @@
+imhex

.idea/imhex.iml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module classpath="CMake" type="CPP_MODULE" version="4" />

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/imhex.iml" filepath="$PROJECT_DIR$/.idea/imhex.iml" />
+    </modules>
+  </component>
+</project>

CMakeLists.txt

@@ -1,63 +1,141 @@
 cmake_minimum_required(VERSION 3.16)
-project(HexEditor)
 
-SET(CMAKE_FIND_PACKAGE_SORT_ORDER NATURAL)
-SET(CMAKE_FIND_PACKAGE_SORT_DIRECTION DEC)
+project(imhex VERSION 1.5.0)
 
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE "Release" CACHE FORCE)
+endif(NOT CMAKE_BUILD_TYPE)
+
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
+
+option (CREATE_PACKAGE "Create a package with CPack" OFF)
+
+if (APPLE)
+    option (CREATE_BUNDLE "Create a bundle on macOS" OFF)
+endif()
+
+set(CMAKE_FIND_PACKAGE_SORT_ORDER NATURAL)
+set(CMAKE_FIND_PACKAGE_SORT_DIRECTION DEC)
 set(CMAKE_CXX_STANDARD 20)
 
+# Enforce that we use non system Python 3 on macOS.
+set(Python_FIND_FRAMEWORK NEVER)
 
+# Find packages
 find_package(PkgConfig REQUIRED)
-pkg_search_module(GLFW REQUIRED glfw3)
-pkg_search_module(GLM REQUIRED glm)
 pkg_search_module(CRYPTO REQUIRED libcrypto)
 pkg_search_module(CAPSTONE REQUIRED capstone)
 find_package(OpenGL REQUIRED)
-find_package(LLVM REQUIRED CONFIG)
 find_package(nlohmann_json REQUIRED)
-find_package(Python COMPONENTS Interpreter Development)
+find_package(Python COMPONENTS Development)
+
+add_subdirectory(external/llvm)
+add_subdirectory(plugins/libimhex)
+
 
 if(Python_VERSION LESS 3)
     message(STATUS ${PYTHON_VERSION_MAJOR_MINOR})
     message(FATAL_ERROR "No valid version of Python 3 was found.")
 endif()
 
-llvm_map_components_to_libnames(_llvm_libs demangle)
-llvm_expand_dependencies(llvm_libs ${_llvm_libs})
+pkg_search_module(MAGIC libmagic)
+if(NOT MAGIC_FOUND)
+    find_library(MAGIC magic REQUIRED)
+endif()
 
-include_directories(include ${GLFW_INCLUDE_DIRS} ${CAPSTONE_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS} libs/ImGui/include libs/glad/include ${Python_INCLUDE_DIRS})
+# Add include directories
+include_directories(include ${CRYPTO_INCLUDE_DIRS} ${CAPSTONE_INCLUDE_DIRS} ${MAGIC_INCLUDE_DIRS} ${Python_INCLUDE_DIRS})
 
 # Get Python major and minor
 string(REPLACE "." ";" PYTHON_VERSION_MAJOR_MINOR ${Python_VERSION})
 list(REMOVE_AT PYTHON_VERSION_MAJOR_MINOR 2)
 list(JOIN PYTHON_VERSION_MAJOR_MINOR "." PYTHON_VERSION_MAJOR_MINOR)
 
-SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -DIMGUI_IMPL_OPENGL_LOADER_GLAD -DPYTHON_VERSION_MAJOR_MINOR=\"\\\"${PYTHON_VERSION_MAJOR_MINOR}\"\\\"")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS} -DPYTHON_VERSION_MAJOR_MINOR=\"\\\"${PYTHON_VERSION_MAJOR_MINOR}\"\\\"")
+
+# Detect current OS / System
+if (WIN32)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DOS_WINDOWS -static-libstdc++ -static-libgcc -Wl,--allow-multiple-definition -static")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wl,-subsystem,windows")
+elseif(APPLE)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DOS_MACOS")
+elseif(UNIX AND NOT APPLE)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DOS_LINUX")
+else()
+    message(FATAL_ERROR "Unknown / unsupported system!")
+endif()
+
+# Detect 32 vs. 64 bit system
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DARCH_64_BIT")
+elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DARCH_32_BIT")
+endif()
+
+# Get the current working branch
+execute_process(
+        COMMAND git rev-parse --abbrev-ref HEAD
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        OUTPUT_VARIABLE GIT_BRANCH
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+# Get the latest abbreviated commit hash of the working branch
+execute_process(
+        COMMAND git log -1 --format=%h
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        OUTPUT_VARIABLE GIT_COMMIT_HASH
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGIT_COMMIT_HASH=\"\\\"${GIT_COMMIT_HASH}\"\\\"")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGIT_BRANCH=\"\\\"${GIT_BRANCH}\"\\\"")
+
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DRELEASE -DIMHEX_VERSION=\"\\\"${PROJECT_VERSION}\"\\\"")
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG -DIMHEX_VERSION=\"\\\"${PROJECT_VERSION}-Debug\"\\\"")
 
 if (WIN32)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libstdc++ -static-libgcc -static")
-    SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wl,-subsystem,windows")
-endif (WIN32)
+    set(application_type WIN32)
+    set(imhex_icon resource.rc)
+elseif (APPLE)
+    set (imhex_icon "${PROJECT_SOURCE_DIR}/res/mac/AppIcon.icns")
 
-SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DRELEASE")
-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
+    if (CREATE_BUNDLE)
+        set(application_type MACOSX_BUNDLE)
+        set_source_files_properties(${imhex_icon} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+        set(MACOSX_BUNDLE_ICON_FILE "AppIcon.icns")
+        set(MACOSX_BUNDLE_INFO_STRING "WerWolv")
+        set(MACOSX_BUNDLE_BUNDLE_NAME "ImHex")
+        set(MACOSX_BUNDLE_BUNDLE_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
+        set(MACOSX_BUNDLE_GUI_IDENTIFIER "WerWolv.ImHex")
+        set(MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_VERSION}-${GIT_COMMIT_HASH}")
+        set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+        set(MACOSX_BUNDLE_COPYRIGHT "Copyright © 2020 WerWolv and Thog. All rights reserved." )
+        if ("${CMAKE_GENERATOR}" STREQUAL "Xcode")
+            set ( bundle_path "${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/imhex.app" )
+        else ()
+            set ( bundle_path "${CMAKE_BINARY_DIR}/imhex.app" )
+        endif()
+    endif()
+endif()
 
-add_executable(ImHex
+add_executable(imhex ${application_type}
         source/main.cpp
         source/window.cpp
 
-        source/helpers/utils.cpp
         source/helpers/crypto.cpp
         source/helpers/patches.cpp
         source/helpers/math_evaluator.cpp
         source/helpers/project_file_handler.cpp
         source/helpers/loader_script_handler.cpp
+        source/helpers/plugin_handler.cpp
 
         source/lang/preprocessor.cpp
         source/lang/lexer.cpp
         source/lang/parser.cpp
         source/lang/validator.cpp
         source/lang/evaluator.cpp
+        source/lang/builtin_functions.cpp
 
         source/providers/file_provider.cpp
 
@@ -73,27 +151,43 @@ add_executable(ImHex
         source/views/view_disassembler.cpp
         source/views/view_bookmarks.cpp
         source/views/view_patches.cpp
+        source/views/view_command_palette.cpp
 
-        libs/glad/source/glad.c
-
-        libs/ImGui/source/imgui.cpp
-        libs/ImGui/source/imgui_draw.cpp
-        libs/ImGui/source/imgui_widgets.cpp
-        libs/ImGui/source/imgui_demo.cpp
-        libs/ImGui/source/imgui_impl_glfw.cpp
-        libs/ImGui/source/imgui_impl_opengl3.cpp
-        libs/ImGui/source/ImGuiFileBrowser.cpp
-        libs/ImGui/source/TextEditor.cpp
-
-        resource.rc
+        ${imhex_icon}
         )
 
-target_link_directories(ImHex PRIVATE ${LLVM_LIBRARY_DIR})
+set_target_properties(imhex PROPERTIES CXX_VISIBILITY_PRESET hidden)
+
+target_link_directories(imhex PRIVATE ${CRYPTO_LIBRARY_DIRS} ${CAPSTONE_LIBRARY_DIRS} ${MAGIC_LIBRARY_DIRS})
 
 if (WIN32)
-    target_link_libraries(ImHex libglfw3.a libgcc.a libstdc++.a libmagic.a libgnurx.a libtre.a libintl.a libiconv.a shlwapi.lib libcrypto.a libwinpthread.a libcapstone.a ${llvm_libs} ${Python_LIBRARIES} nlohmann_json::nlohmann_json)
-endif (WIN32)
+    target_link_libraries(imhex libdl.a libmagic.a libgnurx.a libtre.a libintl.a libiconv.a libshlwapi.a libcrypto.a libwinpthread.a libcapstone.a LLVMDemangle imgui libimhex ${Python_LIBRARIES} nlohmann_json::nlohmann_json)
+elseif (UNIX)
+    target_link_libraries(imhex magic crypto ${CMAKE_DL_LIBS} capstone LLVMDemangle imgui libimhex ${Python_LIBRARIES} nlohmann_json::nlohmann_json dl)
+endif()
 
-if (UNIX)
-    target_link_libraries(ImHex libglfw.so libmagic.so libcrypto.so libdl.so libcapstone.so ${llvm_libs} ${Python_LIBRARIES} nlohmann_json::nlohmann_json)
-endif (UNIX)
+if (CREATE_BUNDLE)
+    include(PostprocessBundle)
+
+    # Fix rpath
+    add_custom_command(TARGET imhex POST_BUILD COMMAND ${CMAKE_INSTALL_NAME_TOOL} -add_rpath "@executable_path/../Frameworks/" $<TARGET_FILE:imhex>)
+
+    # FIXME: Remove this once we move/integrate the plugins directory.
+    add_custom_target(build-time-make-plugins-directory ALL COMMAND ${CMAKE_COMMAND} -E make_directory "${bundle_path}/Contents/MacOS/plugins")
+
+    # Update library references to make the bundle portable
+    postprocess_bundle(imhex)
+
+    # Enforce DragNDrop packaging.
+    set(CPACK_GENERATOR "DragNDrop")
+
+    install(TARGETS imhex BUNDLE DESTINATION .)
+else()
+    install(TARGETS imhex RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
+
+
+if (CREATE_PACKAGE)
+    include(apple)
+    include(CPack)
+endif()

README.md

@@ -1,14 +1,21 @@
-# ImHex
+<h1 align="center">:mag: ImHex</h1>
 
-A Hex Editor for Reverse Engineers, Programmers and people that value their eye sight when working at 3 AM.
+<p align="center">A Hex Editor for Reverse Engineers, Programmers and people that value their eye sight when working at 3 AM.</p>
+
+<p align="center">
+  <a title="'Build' workflow Status" href="https://github.com/WerWolv/ImHex/actions?query=workflow%3ABuild"><img alt="'Build' workflow Status" src="https://img.shields.io/github/workflow/status/WerWolv/ImHex/Build?longCache=true&style=for-the-badge&label=Build&logoColor=fff&logo=GitHub%20Actions"></a>
+   <a title="Discord Server" href="https://discord.gg/X63jZ36xBY"><img alt="Discord Server" src="https://img.shields.io/discord/789833418631675954?label=Discord&logo=Discord&style=for-the-badge"></a>
+</p>
 
 ## Supporting
 
-If you like my work, consider supporting me on GitHub Sponsors, Patreon or PayPal. Thanks a lot!
+If you like my work, please consider supporting me on GitHub Sponsors, Patreon or PayPal. Thanks a lot!
 
+<p align="center">
 <a href="https://github.com/sponsors/WerWolv"><img src="https://werwolv.net/assets/github_banner.png" alt="GitHub donate button" /> </a>
 <a href="https://www.patreon.com/werwolv"><img src="https://c5.patreon.com/external/logo/become_a_patron_button.png" alt="Patreon donate button" /> </a>
 <a href="https://werwolv.net/donate"><img src="https://werwolv.net/assets/paypal_banner.png" alt="PayPal donate button" /> </a>
+</p>
 
 ## Features
 
@@ -26,17 +33,16 @@ If you like my work, consider supporting me on GitHub Sponsors, Patreon or PayPa
   - Goto from start, end and current cursor position
 - Custom C++-like pattern language for parsing highlighting a file's content
   - Automatic loading based on MIME type
-  - arrays, pointers, structs, unions, enums, bitfields, using declarations, litte and big endian support
+  - arrays, pointers, structs, unions, enums, bitfields, using declarations, little and big endian support, conditionals and much more!
   - Useful error messages, syntax highlighting and error marking
 - Data importing
   - Base64 files
   - IPS and IPS32 patches
-- Data exporting 
+- Data exporting
   - IPS and IPS32 patches
-- Data Exporting
 - Data inspector allowing interpretation of data as many different types (little and big endian)
 - Huge file support with fast and efficient loading
-- Strings search
+- String search
   - Copying of strings
   - Copying of demangled strings
 - File hashing support
@@ -44,23 +50,23 @@ If you like my work, consider supporting me on GitHub Sponsors, Patreon or PayPa
   - MD4, MD5
   - SHA-1, SHA-224, SHA-256, SHA-384, SHA-512
 - Disassembler supporting many different architectures
-  - ARM32 (ARM, Thumb, Cortex-M, aarch32)
+  - ARM32 (ARM, Thumb, Cortex-M, AArch32)
   - ARM64
   - MIPS (MIPS32, MIPS64, MIPS32R6, Micro)
-  - x86 (16 bit, 32 bit, 64 bit)
-  - PowerPC (32 bit, 64 bit)
-  - Sparc
-  - SystemZ
-  - XCore
+  - x86 (16-bit, 32-bit, 64-bit)
+  - PowerPC (32-bit, 64-bit)
+  - SPARC
+  - IBM SystemZ
+  - xCORE
   - M68K
   - TMS320C64X
   - M680X
-  - Ethereum 
+  - Ethereum
 - Bookmarks
   - Region highlighting
   - Comments
 - Data Analyzer
-  - File magic based file parser and MIME type database
+  - File magic-based file parser and MIME type database
   - Byte distribution graph
   - Entropy graph
   - Highest and avarage entropy
@@ -79,43 +85,68 @@ If you like my work, consider supporting me on GitHub Sponsors, Patreon or PayPa
 ![](https://i.imgur.com/xH7xJ4g.png)
 ![](https://i.imgur.com/fhVJYEa.png)
 
+## Pattern Language
+
+The custom C-like Pattern Language developed and used by ImHex is easy to read, understand and learn. A guide with all features of the langauge can be found [in the wiki](https://github.com/WerWolv/ImHex/wiki/Pattern-Language-Guide) or a simpler version in ImHex under `Help -> Pattern Language Cheat Sheet`
+
 ## Additional Files
 
-For format patterns, includable libraries and magic files, check of the [ImHex-Patterns](https://github.com/WerWolv/ImHex-Patterns) repository here. Feel free to PR your own files there as well!
+For format patterns, includable libraries and magic files, check out the [ImHex-Patterns](https://github.com/WerWolv/ImHex-Patterns) repository. Feel free to PR your own files there as well!
+
+## Nightly builds
+
+See latest nightly builds on the artifacts result of the Build action [here](https://github.com/WerWolv/ImHex/actions?query=workflow%3ABuild).
+
+NOTE: **We currently only provide nightly builds for macOS (x86_64)**
 
 ## Compiling
 
-This guide assumes you're either on Windows using mingw or on Arch Linux
+You need a C++20 compatible compiler such as GCC 10.2.0 to compile ImHex. Moreover, the following dependencies are needed for compiling ImHex:
 
-You need a C++20 compatible compiler such as GCC 10.2.0 to compile ImHex.
-The following libraries are needed to compile ImHex. All of them can be found in the default pacman repositories
-```
-GLFW3                                             ( (sudo) pacman -S glfw )
-libmagic, libgnurx, libtre, libintl, libiconv     ( (sudo) pacman -S file )
-libcrypto                                         ( (sudo) pacman -S openssl )
-capstone                                          ( (sudo) pacman -S capstone )
-libLLVMDemangle                                   ( (sudo) pacman -S llvm llvm-libs )
-nlohmann json                                     ( (sudo) pacman -S nlohmann-json )
-Python3                                           ( (sudo) pacman -S python3 )
+- GLFW3
+- libmagic, libgnurx, libtre, libintl, libiconv
+- libcrypto
+- capstone
+- nlohmann json
+- Python3
+- freetype2
+- Brew (macOS only)
 
-All in one: sudo pacman -S glfw file openssl capstone llvm llvm-libs nlohmann-json python3
-All in one for mingw: pacman -S mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake mingw-w64-x86_64-make mingw-w64-x86_64-capstone mingw-w64-x86_64-glfw mingw-w64-x86_64-glm mingw-w64-x86_64-file mingw-w64-x86_64-llvm mingw-w64-x86_64-nlohmann-json mingw-w64-x86_64-openssl mingw-w64-x86_64-polly mingw-w64-x86_64-python
-```
+### Windows and Linux
 
-After all the libraries are installed, run the following commands to build ImHex
-```
+Find all-in-one dependency installation scripts for Arch Linux, Fedora, Debian/Ubuntu and/or MSYS2 in [dist](dist).
+
+After all the dependencies are installed, run the following commands to build ImHex:
+
+```sh
 mkdir build
 cd build
-cmake ..
+cmake -DCMAKE_BUILD_TYPE=Release ..
 make -j
 ```
 
-On Windows, download the python standard library from https://github.com/python/cpython/tree/master/Lib and place the files and folders in `lib/python3.8` next to your built executable. Don't forget to also copy the `libpython3.8.dll` and `libwinpthread-1.dll` from your mingw setup next to the executable.
+---
 
-On both Windows and Linux, copy the files from `python_libs` in the `lib` folder next to your built executable.
-Place your magic databases in the `magic` folder next to your built executable
-Place your patterns in the `pattern` folder next to your built executable
-Place your include pattern files in the `include` folder next to your built executable
+To create a standalone zipfile on Windows, get the Python standard library (e.g. from https://github.com/python/cpython/tree/master/Lib) and place the files and folders in `lib/python3.8` next to your built executable. Don't forget to also copy the `libpython3.8.dll` and `libwinpthread-1.dll` from your mingw setup next to the executable.
+
+On both Windows and Linux:
+
+- Copy the files from `python_libs` in the `lib` folder next to your built executable.
+- Place your magic databases in the `magic` folder next to your built executable
+- Place your patterns in the `pattern` folder next to your built executable
+- Place your include pattern files in the `include` folder next to your built executable
+
+### macOS
+
+To build ImHex on macOS, run the following commands:
+
+```sh
+brew bundle --no-lock --file dist/Brewfile
+mkdir build
+cd build
+CC=$(brew --prefix llvm)/bin/clang CXX=$(brew --prefix llvm)/bin/clang++ PKG_CONFIG_PATH="$(brew --prefix openssl)/lib/pkgconfig":"$(brew --prefix)/lib/pkgconfig" cmake -DCMAKE_BUILD_TYPE=Release ..
+make -j
+```
 
 ## Credits
 
@@ -125,4 +156,3 @@ Place your include pattern files in the `include` folder next to your built exec
   - Thanks to AirGuanZ for their amazing [imgui-filebrowser](https://github.com/AirGuanZ/imgui-filebrowser) used for loading and saving files
 - Thanks to nlohmann for their [json](https://github.com/nlohmann/json) library used for project files
 - Thanks to aquynh for [capstone](https://github.com/aquynh/capstone) which is the base of the disassembly window
-

cmake/modules/PostprocessBundle.cmake

@@ -0,0 +1,59 @@
+# Adapted from the Dolphin project: https://dolphin-emu.org/
+# This module can be used in two different ways.
+#
+# When invoked as `cmake -P PostprocessBundle.cmake`, it fixes up an
+# application folder to be standalone. It bundles all required libraries from
+# the system and fixes up library IDs. Any additional shared libraries, like
+# plugins, that are found under Contents/MacOS/ will be made standalone as well.
+#
+# When called with `include(PostprocessBundle)`, it defines a helper
+# function `postprocess_bundle` that sets up the command form of the
+# module as a post-build step.
+
+if(CMAKE_GENERATOR)
+	# Being called as include(PostprocessBundle), so define a helper function.
+	set(_POSTPROCESS_BUNDLE_MODULE_LOCATION "${CMAKE_CURRENT_LIST_FILE}")
+	function(postprocess_bundle target)
+		add_custom_command(TARGET ${target} POST_BUILD
+			COMMAND ${CMAKE_COMMAND} -DBUNDLE_PATH="$<TARGET_FILE_DIR:${target}>/../.." -DCODE_SIGN_CERTIFICATE_ID="${CODE_SIGN_CERTIFICATE_ID}"
+				-P "${_POSTPROCESS_BUNDLE_MODULE_LOCATION}"
+		)
+	endfunction()
+	return()
+endif()
+
+get_filename_component(BUNDLE_PATH "${BUNDLE_PATH}" ABSOLUTE)
+message(STATUS "Fixing up application bundle: ${BUNDLE_PATH}")
+
+
+# Make sure to fix up any additional shared libraries (like plugins) that are
+# needed.
+file(GLOB_RECURSE extra_libs "${BUNDLE_PATH}/Contents/MacOS/*.dylib")
+
+message(STATUS "Fixing up application bundle: ${extra_dirs}")
+
+# BundleUtilities doesn't support DYLD_FALLBACK_LIBRARY_PATH behavior, which
+# makes it sometimes break on libraries that do weird things with @rpath. Specify
+# equivalent search directories until https://gitlab.kitware.com/cmake/cmake/issues/16625
+# is fixed and in our minimum CMake version.
+set(extra_dirs "/usr/local/lib" "/lib" "/usr/lib")
+
+# BundleUtilities is overly verbose, so disable most of its messages
+function(message)
+	if(NOT ARGV MATCHES "^STATUS;")
+		_message(${ARGV})
+	endif()
+endfunction()
+
+include(BundleUtilities)
+set(BU_CHMOD_BUNDLE_ITEMS ON)
+fixup_bundle("${BUNDLE_PATH}" "${extra_libs}" "${extra_dirs}" IGNORE_ITEM "Python")
+
+if (CODE_SIGN_CERTIFICATE_ID)
+	# Hack around Apple Silicon signing bugs by copying the real app, signing it and moving it back.
+	# IMPORTANT: DON'T USE ${CMAKE_COMMAND} -E copy_directory HERE (this follow symbolic links).
+	execute_process(COMMAND cp -R "${BUNDLE_PATH}" "${BUNDLE_PATH}.temp")
+	execute_process(COMMAND codesign --deep --force --sign "${CODE_SIGN_CERTIFICATE_ID}" "${BUNDLE_PATH}.temp")
+	execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory "${BUNDLE_PATH}")
+	execute_process(COMMAND ${CMAKE_COMMAND} -E rename "${BUNDLE_PATH}.temp" "${BUNDLE_PATH}")
+endif()

cmake/modules/apple.cmake

@@ -0,0 +1,3 @@
+set (CPACK_BUNDLE_NAME "ImHex")
+set (CPACK_BUNDLE_ICON "${CMAKE_SOURCE_DIR}/res/mac/AppIcon.icns" )
+set (CPACK_BUNDLE_PLIST "${CMAKE_BINARY_DIR}/ImHex.app/Contents/Info.plist")

dist/Brewfile

@@ -0,0 +1,12 @@
+brew "glfw3"
+brew "openssl@1.1"
+brew "capstone"
+brew "nlohmann-json"
+brew "glm"
+brew "cmake"
+brew "python3"
+brew "freetype2"
+brew "libmagic"
+
+# TODO: Remove this when XCode version of clang will support the same level as LLVM 10
+brew "llvm"

dist/get_deps_archlinux.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env sh
+
+pacman -S --needed \
+  cmake \
+  gcc \
+  glfw \
+  file \
+  openssl \
+  capstone \
+  nlohmann-json \
+  glm \
+  python3 \
+  freetype2

dist/get_deps_debian.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env sh
+
+echo "As of 2020-12, Debian stable does not include g++-10, needs debian testing or unstable."
+
+# Tested on 2020-12-09 with Docker image bitnami/minideb:unstable
+
+# Install pkgconf (adds minimum dependencies) only if the equivalent pkf-config is not already installed.
+if !which pkg-config
+then
+    PKGCONF="pkgconf"
+fi
+
+apt install \
+  cmake \
+  g++-10 \
+  ${PKGCONF:-} \
+  nlohmann-json3-dev \
+  libcapstone-dev \
+  libmagic-dev \
+  libglfw3-dev \
+  libglm-dev \
+  libjsoncpp-dev \
+  libssl-dev \
+  libstdc++-10-dev \
+  python3-dev \
+  libfreetype-dev
+
+echo "Please consider this before running cmake (useful on e.g. Ubuntu 20.04):"
+echo "export CXX=g++-10"

dist/get_deps_fedora.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+dnf install \
+  cmake \
+  gcc-c++ \
+  capstone-devel \
+  file-devel \
+  glfw-devel \
+  glm-devel \
+  json-devel \
+  mesa-libGL-devel \
+  openssl-devel \
+  python-devel \
+  freetype-devel

dist/get_deps_msys2.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+pacman -S --needed \
+  mingw-w64-x86_64-gcc \
+  mingw-w64-x86_64-cmake \
+  mingw-w64-x86_64-make \
+  mingw-w64-x86_64-capstone \
+  mingw-w64-x86_64-glfw \
+  mingw-w64-x86_64-glm \
+  mingw-w64-x86_64-file \
+  mingw-w64-x86_64-nlohmann-json \
+  mingw-w64-x86_64-openssl \
+  mingw-w64-x86_64-polly \
+  mingw-w64-x86_64-python \
+  mingw-w64-x86_64-freetype \
+  mingw-w64-x86_64-dlfcn

external/ImGui/CMakeLists.txt

@@ -0,0 +1,35 @@
+cmake_minimum_required(VERSION 3.16)
+project(imgui)
+
+set(CMAKE_CXX_STANDARD 17)
+
+find_package(PkgConfig REQUIRED)
+find_package(Freetype REQUIRED)
+pkg_search_module(GLM REQUIRED glm)
+pkg_search_module(GLFW REQUIRED glfw3)
+
+add_library(imgui
+    source/imgui.cpp
+    source/imgui_demo.cpp
+    source/imgui_draw.cpp
+    source/imgui_freetype.cpp
+    source/imgui_impl_glfw.cpp
+    source/imgui_impl_opengl3.cpp
+    source/imgui_widgets.cpp
+    source/ImGuiFileBrowser.cpp
+    source/TextEditor.cpp
+)
+
+add_compile_definitions(IMGUI_IMPL_OPENGL_LOADER_GLAD)
+
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../glad ${CMAKE_CURRENT_BINARY_DIR}/external/glad)
+
+target_include_directories(imgui PUBLIC include ${FREETYPE_INCLUDE_DIRS} ${GLFW_INCLUDE_DIRS})
+
+target_link_directories(imgui PUBLIC ${GLM_INCLUDE_DIRS} ${GLFW_LIBRARY_DIRS})
+
+if (WIN32)
+    target_link_libraries(imgui libstdc++.a libgcc.a libharfbuzz.a libfreetype.a libharfbuzz.a libgraphite2.a libpng.a libbrotlidec-static.a libbrotlicommon-static.a libz.a libbz2.a librpcrt4.a glad libglfw3.a)
+elseif (UNIX)
+    target_link_libraries(imgui Freetype::Freetype glad glfw)
+endif()

external/ImGui/include/imgui_freetype.h

@@ -0,0 +1,36 @@
+// dear imgui: wrapper to use FreeType (instead of stb_truetype)
+// Get latest version at https://github.com/ocornut/imgui/tree/master/misc/freetype
+// Original code by @Vuhdo (Aleksei Skriabin), maintained by @ocornut
+
+#pragma once
+
+#include "imgui.h"      // IMGUI_API, ImFontAtlas
+
+namespace ImGuiFreeType
+{
+    // Hinting greatly impacts visuals (and glyph sizes).
+    // When disabled, FreeType generates blurrier glyphs, more or less matches the stb's output.
+    // The Default hinting mode usually looks good, but may distort glyphs in an unusual way.
+    // The Light hinting mode generates fuzzier glyphs but better matches Microsoft's rasterizer.
+
+    // You can set those flags on a per font basis in ImFontConfig::RasterizerFlags.
+    // Use the 'extra_flags' parameter of BuildFontAtlas() to force a flag on all your fonts.
+    enum RasterizerFlags
+    {
+        // By default, hinting is enabled and the font's native hinter is preferred over the auto-hinter.
+        NoHinting       = 1 << 0,   // Disable hinting. This generally generates 'blurrier' bitmap glyphs when the glyph are rendered in any of the anti-aliased modes.
+        NoAutoHint      = 1 << 1,   // Disable auto-hinter.
+        ForceAutoHint   = 1 << 2,   // Indicates that the auto-hinter is preferred over the font's native hinter.
+        LightHinting    = 1 << 3,   // A lighter hinting algorithm for gray-level modes. Many generated glyphs are fuzzier but better resemble their original shape. This is achieved by snapping glyphs to the pixel grid only vertically (Y-axis), as is done by Microsoft's ClearType and Adobe's proprietary font renderer. This preserves inter-glyph spacing in horizontal text.
+        MonoHinting     = 1 << 4,   // Strong hinting algorithm that should only be used for monochrome output.
+        Bold            = 1 << 5,   // Styling: Should we artificially embolden the font?
+        Oblique         = 1 << 6,   // Styling: Should we slant the font, emulating italic style?
+        Monochrome      = 1 << 7    // Disable anti-aliasing. Combine this with MonoHinting for best results!
+    };
+
+    IMGUI_API bool BuildFontAtlas(ImFontAtlas* atlas, unsigned int extra_flags = 0);
+
+    // By default ImGuiFreeType will use IM_ALLOC()/IM_FREE().
+    // However, as FreeType does lots of allocations we provide a way for the user to redirect it to a separate memory heap if desired:
+    IMGUI_API void SetAllocatorFunctions(void* (*alloc_func)(size_t sz, void* user_data), void (*free_func)(void* ptr, void* user_data), void* user_data = NULL);
+}

external/ImGui/include/imgui_memory_editor.h

@@ -93,8 +93,10 @@ struct MemoryEditor
     // [Internal State]
     bool            ContentsWidthChanged;
     size_t          DataPreviewAddr;
-    size_t          DataEditingAddr;
+    size_t          DataPreviewAddrOld;
     size_t          DataPreviewAddrEnd;
+    size_t          DataPreviewAddrEndOld;
+    size_t          DataEditingAddr;
     bool            DataEditingTakeFocus;
     char            DataInputBuf[32];
     char            AddrInputBuf[32];
@@ -187,6 +189,14 @@ struct MemoryEditor
 
         if (ImGui::Begin(title, p_open, ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoCollapse))
         {
+            if (DataPreviewAddr != DataPreviewAddrOld || DataPreviewAddrEnd != DataPreviewAddrEndOld) {
+                hex::Region selectionRegion = { std::min(DataPreviewAddr, DataPreviewAddrEnd), std::max(DataPreviewAddr, DataPreviewAddrEnd) - std::min(DataPreviewAddr, DataPreviewAddrEnd) };
+                hex::View::postEvent(hex::Events::RegionSelected, &selectionRegion);
+            }
+
+            DataPreviewAddrOld = DataPreviewAddr;
+            DataPreviewAddrEndOld = DataPreviewAddrEnd;
+
             DrawContents(mem_data, mem_size, base_display_addr);
             if (ContentsWidthChanged)
             {
@@ -208,14 +218,13 @@ struct MemoryEditor
         Sizes s;
         CalcSizes(s, mem_size, base_display_addr);
         ImGuiStyle& style = ImGui::GetStyle();
-        ImDrawList* draw_list = ImGui::GetWindowDrawList();
 
         if (mem_size == 0x00) {
             constexpr const char *noDataString = "No data loaded!";
 
             auto pos = ImGui::GetCursorScreenPos();
             pos.x += (ImGui::GetWindowWidth() - (ImGui::CalcTextSize(noDataString).x)) / 2;
-            draw_list->AddText(pos, 0xFFFFFFFF, noDataString);
+            ImGui::GetWindowDrawList()->AddText(pos, 0xFFFFFFFF, noDataString);
             return;
         }
 
@@ -245,8 +254,10 @@ struct MemoryEditor
 
 
         // We are not really using the clipper API correctly here, because we rely on visible_start_addr/visible_end_addr for our scrolling function.
-        const int line_total_count = (int)((mem_size + Cols - 1) / Cols);
         ImGuiListClipper clipper;
+        ImDrawList* draw_list = ImGui::GetWindowDrawList();
+
+        const int line_total_count = (int)((mem_size + Cols - 1) / Cols);
         clipper.Begin(line_total_count, s.LineHeight);
         clipper.Step();
         const size_t visible_start_addr = clipper.DisplayStart * Cols;
@@ -254,7 +265,7 @@ struct MemoryEditor
 
         bool data_next = false;
 
-        if (ReadOnly || DataEditingAddr >= mem_size)
+        if (DataEditingAddr >= mem_size)
             DataEditingAddr = (size_t)-1;
         if (DataPreviewAddr >= mem_size)
             DataPreviewAddr = (size_t)-1;
@@ -265,20 +276,24 @@ struct MemoryEditor
         size_t data_preview_addr_backup = DataPreviewAddr;
         size_t data_editing_addr_next = (size_t)-1;
         size_t data_preview_addr_next = (size_t)-1;
-        if (DataEditingAddr != (size_t)-1)
-        {
-            // Move cursor but only apply on next frame so scrolling with be synchronized (because currently we can't change the scrolling while the window is being rendered)
-            if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_UpArrow)) && DataEditingAddr >= (size_t)Cols)          { data_editing_addr_next = DataEditingAddr - Cols; DataEditingTakeFocus = true; }
-            else if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_DownArrow)) && DataEditingAddr < mem_size - Cols) { data_editing_addr_next = DataEditingAddr + Cols; DataEditingTakeFocus = true; }
-            else if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_LeftArrow)) && DataEditingAddr > 0)               { data_editing_addr_next = DataEditingAddr - 1; DataEditingTakeFocus = true; }
-            else if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_RightArrow)) && DataEditingAddr < mem_size - 1)   { data_editing_addr_next = DataEditingAddr + 1; DataEditingTakeFocus = true; }
-        } else if (DataPreviewAddr != -1) {
-            // Move cursor but only apply on next frame so scrolling with be synchronized (because currently we can't change the scrolling while the window is being rendered)
-            if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_UpArrow)) && DataPreviewAddr >= (size_t)Cols)          { data_preview_addr_next = DataPreviewAddr - Cols; DataPreviewAddr = data_preview_addr_next; if (!ImGui::GetIO().KeyShift) DataPreviewAddrEnd = DataPreviewAddr; }
-            else if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_DownArrow)) && DataPreviewAddr < mem_size - Cols) { data_preview_addr_next = DataPreviewAddr + Cols; DataPreviewAddr = data_preview_addr_next; if (!ImGui::GetIO().KeyShift) DataPreviewAddrEnd = DataPreviewAddr; }
-            else if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_LeftArrow)) && DataPreviewAddr > 0)               { data_preview_addr_next = DataPreviewAddr - 1; DataPreviewAddr = data_preview_addr_next; if (!ImGui::GetIO().KeyShift) DataPreviewAddrEnd = DataPreviewAddr; }
-            else if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_RightArrow)) && DataPreviewAddr < mem_size - 1)   { data_preview_addr_next = DataPreviewAddr + 1; DataPreviewAddr = data_preview_addr_next; if (!ImGui::GetIO().KeyShift) DataPreviewAddrEnd = DataPreviewAddr; }
+
+        if (ImGui::IsWindowFocused()) {
+            if (DataEditingAddr != (size_t)-1)
+            {
+                // Move cursor but only apply on next frame so scrolling with be synchronized (because currently we can't change the scrolling while the window is being rendered)
+                if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_UpArrow)) && DataEditingAddr >= (size_t)Cols)          { data_editing_addr_next = DataEditingAddr - Cols; DataEditingTakeFocus = true; }
+                else if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_DownArrow)) && DataEditingAddr < mem_size - Cols) { data_editing_addr_next = DataEditingAddr + Cols; DataEditingTakeFocus = true; }
+                else if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_LeftArrow)) && DataEditingAddr > 0)               { data_editing_addr_next = DataEditingAddr - 1; DataEditingTakeFocus = true; }
+                else if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_RightArrow)) && DataEditingAddr < mem_size - 1)   { data_editing_addr_next = DataEditingAddr + 1; DataEditingTakeFocus = true; }
+            } else if (DataPreviewAddr != -1) {
+                // Move cursor but only apply on next frame so scrolling with be synchronized (because currently we can't change the scrolling while the window is being rendered)
+                if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_UpArrow)) && DataPreviewAddr >= (size_t)Cols)          { data_preview_addr_next = DataPreviewAddr - Cols; DataPreviewAddr = data_preview_addr_next; if (!ImGui::GetIO().KeyShift) DataPreviewAddrEnd = DataPreviewAddr; }
+                else if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_DownArrow)) && DataPreviewAddr < mem_size - Cols) { data_preview_addr_next = DataPreviewAddr + Cols; DataPreviewAddr = data_preview_addr_next; if (!ImGui::GetIO().KeyShift) DataPreviewAddrEnd = DataPreviewAddr; }
+                else if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_LeftArrow)) && DataPreviewAddr > 0)               { data_preview_addr_next = DataPreviewAddr - 1; DataPreviewAddr = data_preview_addr_next; if (!ImGui::GetIO().KeyShift) DataPreviewAddrEnd = DataPreviewAddr; }
+                else if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_RightArrow)) && DataPreviewAddr < mem_size - 1)   { data_preview_addr_next = DataPreviewAddr + 1; DataPreviewAddr = data_preview_addr_next; if (!ImGui::GetIO().KeyShift) DataPreviewAddrEnd = DataPreviewAddr; }
+            }
         }
+
         if (data_preview_addr_next != (size_t)-1 && (data_preview_addr_next / Cols) != (data_preview_addr_backup / Cols))
         {
             // Track cursor movements
@@ -427,26 +442,18 @@ struct MemoryEditor
                         else
                             ImGui::Text(format_byte_space, b);
                     }
-                    if (!ReadOnly && ImGui::IsItemHovered() && ImGui::IsMouseClicked(0) && !ImGui::GetIO().KeyShift)
+                    if (ImGui::IsItemHovered() && ImGui::IsMouseClicked(0) && !ImGui::GetIO().KeyShift)
                     {
-                        if (ImGui::IsMouseDoubleClicked(0)) {
+                        if (!ReadOnly && ImGui::IsMouseDoubleClicked(0)) {
                             DataEditingTakeFocus = true;
                             data_editing_addr_next = addr;
                         }
 
                         DataPreviewAddr = addr;
                         DataPreviewAddrEnd = addr;
-
-                        hex::Region selectionRegion { addr, 1 };
-                        hex::View::postEvent(hex::Events::RegionSelected, &selectionRegion);
                     }
-                    if (!ReadOnly && ImGui::IsItemHovered() && ((ImGui::IsMouseClicked(0) && ImGui::GetIO().KeyShift) || ImGui::IsMouseDragging(0))) {
+                    if (ImGui::IsItemHovered() && ((ImGui::IsMouseClicked(0) && ImGui::GetIO().KeyShift) || ImGui::IsMouseDragging(0))) {
                         DataPreviewAddrEnd = addr;
-
-                        size_t dataPreviewStart = std::min(DataPreviewAddr, DataPreviewAddrEnd);
-
-                        hex::Region selectionRegion { std::min(DataPreviewAddr, DataPreviewAddrEnd), std::max(DataPreviewAddr, DataPreviewAddrEnd) - std::min(DataPreviewAddr, DataPreviewAddrEnd) + 1 };
-                        hex::View::postEvent(hex::Events::RegionSelected, &selectionRegion);
                     }
                 }
             }
@@ -495,9 +502,9 @@ struct MemoryEditor
 
                     ImGui::PopID();
 
-                    if (!ReadOnly && ImGui::IsItemHovered() && ImGui::IsMouseClicked(0) && !ImGui::GetIO().KeyShift)
+                    if (ImGui::IsItemHovered() && ImGui::IsMouseClicked(0) && !ImGui::GetIO().KeyShift)
                     {
-                        if (ImGui::IsMouseDoubleClicked(0)) {
+                        if (!ReadOnly && ImGui::IsMouseDoubleClicked(0)) {
                             DataEditingTakeFocus = true;
                             data_editing_addr_next = addr;
                         }
@@ -506,7 +513,7 @@ struct MemoryEditor
                         DataPreviewAddrEnd = addr;
 
                     }
-                    if (!ReadOnly && ImGui::IsItemHovered() && ((ImGui::IsMouseClicked(0) && ImGui::GetIO().KeyShift) || ImGui::IsMouseDragging(0))) {
+                    if (ImGui::IsItemHovered() && ((ImGui::IsMouseClicked(0) && ImGui::GetIO().KeyShift) || ImGui::IsMouseDragging(0))) {
                         DataPreviewAddrEnd = addr;
                     }
 
@@ -544,13 +551,14 @@ struct MemoryEditor
         IM_UNUSED(mem_data);
         ImGuiStyle& style = ImGui::GetStyle();
         const char* format_range = OptUpperCaseHex ? "Range %0*" _PRISizeT "X..%0*" _PRISizeT "X" : "Range %0*" _PRISizeT "x..%0*" _PRISizeT "x";
+        const char* format_selection = OptUpperCaseHex ? "Selection %0*" _PRISizeT "X..%0*" _PRISizeT "X (%ld %s)" : "Range %0*" _PRISizeT "x..%0*" _PRISizeT "x (%ld %s)";
 
         // Options menu
         if (ImGui::Button("Options"))
             ImGui::OpenPopup("options");
 
         if (ImGui::BeginPopup("options")) {
-            ImGui::PushItemWidth(56);
+            ImGui::PushItemWidth(ImGui::CalcTextSize("00 cols").x * 1.1f);
             if (ImGui::DragInt("##cols", &Cols, 0.2f, 4, 32, "%d cols")) { ContentsWidthChanged = true; if (Cols < 1) Cols = 1; }
             ImGui::PopItemWidth();
             ImGui::Checkbox("Show HexII", &OptShowHexII);
@@ -563,6 +571,17 @@ struct MemoryEditor
 
         ImGui::SameLine();
         ImGui::Text(format_range, s.AddrDigitsCount, base_display_addr, s.AddrDigitsCount, base_display_addr + mem_size - 1);
+        if (DataPreviewAddr != (size_t)-1 && DataPreviewAddrEnd != (size_t)-1) {
+            ImGui::SameLine();
+            ImGui::Spacing();
+            ImGui::SameLine();
+
+            auto selectionStart = std::min(DataPreviewAddr, DataPreviewAddrEnd);
+            auto selectionEnd = std::max(DataPreviewAddr, DataPreviewAddrEnd);
+
+            size_t regionSize = (selectionEnd - selectionStart) + 1;
+            ImGui::Text(format_selection, s.AddrDigitsCount, selectionStart, s.AddrDigitsCount, selectionEnd, regionSize, regionSize == 1 ? "byte" : "bytes");
+        }
 
         if (GotoAddr != (size_t)-1)
         {

external/ImGui/source/ImGuiFileBrowser.cpp

@@ -43,7 +43,6 @@ namespace imgui_addons
         selected_ext_idx = 0;
         ext_box_width = -1.0f;
         col_width = 280.0f;
-        min_size = ImVec2(500,300);
 
         invfile_modal_id = "Invalid File!";
         repfile_modal_id = "Replace File?";
@@ -109,11 +108,12 @@ namespace imgui_addons
 
     bool ImGuiFileBrowser::showFileDialog(const std::string& label, const DialogMode mode, const ImVec2& sz_xy, const std::string& valid_types)
     {
-
         dialog_mode = mode;
         ImGuiIO& io = ImGui::GetIO();
-        max_size.x = io.DisplaySize.x;
-        max_size.y = io.DisplaySize.y;
+        max_size = ImVec2(       io.DisplaySize.x,        io.DisplaySize.y);
+        min_size = ImVec2(0.5f * io.DisplaySize.x, 0.5f * io.DisplaySize.y);
+
+
         ImGui::SetNextWindowSizeConstraints(min_size, max_size);
         ImGui::SetNextWindowPos(io.DisplaySize * 0.5f, ImGuiCond_Appearing, ImVec2(0.5f,0.5f));
         ImGui::SetNextWindowSize(ImVec2(std::max(sz_xy.x, min_size.x), std::max(sz_xy.y, min_size.y)), ImGuiCond_Appearing);

external/ImGui/source/imgui_freetype.cpp

@@ -0,0 +1,680 @@
+// dear imgui: wrapper to use FreeType (instead of stb_truetype)
+// Get latest version at https://github.com/ocornut/imgui/tree/master/misc/freetype
+// Original code by @vuhdo (Aleksei Skriabin). Improvements by @mikesart. Maintained and v0.60+ by @ocornut.
+
+// Changelog:
+// - v0.50: (2017/08/16) imported from https://github.com/Vuhdo/imgui_freetype into http://www.github.com/ocornut/imgui_club, updated for latest changes in ImFontAtlas, minor tweaks.
+// - v0.51: (2017/08/26) cleanup, optimizations, support for ImFontConfig::RasterizerFlags, ImFontConfig::RasterizerMultiply.
+// - v0.52: (2017/09/26) fixes for imgui internal changes.
+// - v0.53: (2017/10/22) minor inconsequential change to match change in master (removed an unnecessary statement).
+// - v0.54: (2018/01/22) fix for addition of ImFontAtlas::TexUvscale member.
+// - v0.55: (2018/02/04) moved to main imgui repository (away from http://www.github.com/ocornut/imgui_club)
+// - v0.56: (2018/06/08) added support for ImFontConfig::GlyphMinAdvanceX, GlyphMaxAdvanceX.
+// - v0.60: (2019/01/10) re-factored to match big update in STB builder. fixed texture height waste. fixed redundant glyphs when merging. support for glyph padding.
+// - v0.61: (2019/01/15) added support for imgui allocators + added FreeType only override function SetAllocatorFunctions().
+// - v0.62: (2019/02/09) added RasterizerFlags::Monochrome flag to disable font anti-aliasing (combine with ::MonoHinting for best results!)
+// - v0.63: (2020/06/04) fix for rare case where FT_Get_Char_Index() succeed but FT_Load_Glyph() fails.
+
+// Gamma Correct Blending:
+//  FreeType assumes blending in linear space rather than gamma space.
+//  See https://www.freetype.org/freetype2/docs/reference/ft2-base_interface.html#FT_Render_Glyph
+//  For correct results you need to be using sRGB and convert to linear space in the pixel shader output.
+//  The default imgui styles will be impacted by this change (alpha values will need tweaking).
+
+// FIXME: cfg.OversampleH, OversampleV are not supported (but perhaps not so necessary with this rasterizer).
+
+#include "imgui_freetype.h"
+#include "imgui_internal.h"     // ImMin,ImMax,ImFontAtlasBuild*,
+#include <stdint.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H          // <freetype/freetype.h>
+#include FT_MODULE_H            // <freetype/ftmodapi.h>
+#include FT_GLYPH_H             // <freetype/ftglyph.h>
+#include FT_SYNTHESIS_H         // <freetype/ftsynth.h>
+
+#ifdef _MSC_VER
+#pragma warning (disable: 4505) // unreferenced local function has been removed (stb stuff)
+#endif
+
+#if defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wpragmas"                  // warning: unknown option after '#pragma GCC diagnostic' kind
+#pragma GCC diagnostic ignored "-Wunused-function"          // warning: 'xxxx' defined but not used
+#endif
+
+namespace
+{
+    // Glyph metrics:
+    // --------------
+    //
+    //                       xmin                     xmax
+    //                        |                         |
+    //                        |<-------- width -------->|
+    //                        |                         |
+    //              |         +-------------------------+----------------- ymax
+    //              |         |    ggggggggg   ggggg    |     ^        ^
+    //              |         |   g:::::::::ggg::::g    |     |        |
+    //              |         |  g:::::::::::::::::g    |     |        |
+    //              |         | g::::::ggggg::::::gg    |     |        |
+    //              |         | g:::::g     g:::::g     |     |        |
+    //    offsetX  -|-------->| g:::::g     g:::::g     |  offsetY     |
+    //              |         | g:::::g     g:::::g     |     |        |
+    //              |         | g::::::g    g:::::g     |     |        |
+    //              |         | g:::::::ggggg:::::g     |     |        |
+    //              |         |  g::::::::::::::::g     |     |      height
+    //              |         |   gg::::::::::::::g     |     |        |
+    //  baseline ---*---------|---- gggggggg::::::g-----*--------      |
+    //            / |         |             g:::::g     |              |
+    //     origin   |         | gggggg      g:::::g     |              |
+    //              |         | g:::::gg   gg:::::g     |              |
+    //              |         |  g::::::ggg:::::::g     |              |
+    //              |         |   gg:::::::::::::g      |              |
+    //              |         |     ggg::::::ggg        |              |
+    //              |         |         gggggg          |              v
+    //              |         +-------------------------+----------------- ymin
+    //              |                                   |
+    //              |------------- advanceX ----------->|
+
+    /// A structure that describe a glyph.
+    struct GlyphInfo
+    {
+        int         Width;              // Glyph's width in pixels.
+        int         Height;             // Glyph's height in pixels.
+        FT_Int      OffsetX;            // The distance from the origin ("pen position") to the left of the glyph.
+        FT_Int      OffsetY;            // The distance from the origin to the top of the glyph. This is usually a value < 0.
+        float       AdvanceX;           // The distance from the origin to the origin of the next glyph. This is usually a value > 0.
+    };
+
+    // Font parameters and metrics.
+    struct FontInfo
+    {
+        uint32_t    PixelHeight;        // Size this font was generated with.
+        float       Ascender;           // The pixel extents above the baseline in pixels (typically positive).
+        float       Descender;          // The extents below the baseline in pixels (typically negative).
+        float       LineSpacing;        // The baseline-to-baseline distance. Note that it usually is larger than the sum of the ascender and descender taken as absolute values. There is also no guarantee that no glyphs extend above or below subsequent baselines when using this distance. Think of it as a value the designer of the font finds appropriate.
+        float       LineGap;            // The spacing in pixels between one row's descent and the next row's ascent.
+        float       MaxAdvanceWidth;    // This field gives the maximum horizontal cursor advance for all glyphs in the font.
+    };
+
+    // FreeType glyph rasterizer.
+    // NB: No ctor/dtor, explicitly call Init()/Shutdown()
+    struct FreeTypeFont
+    {
+        bool                    InitFont(FT_Library ft_library, const ImFontConfig& cfg, unsigned int extra_user_flags); // Initialize from an external data buffer. Doesn't copy data, and you must ensure it stays valid up to this object lifetime.
+        void                    CloseFont();
+        void                    SetPixelHeight(int pixel_height); // Change font pixel size. All following calls to RasterizeGlyph() will use this size
+        const FT_Glyph_Metrics* LoadGlyph(uint32_t in_codepoint);
+        const FT_Bitmap*        RenderGlyphAndGetInfo(GlyphInfo* out_glyph_info);
+        void                    BlitGlyph(const FT_Bitmap* ft_bitmap, uint8_t* dst, uint32_t dst_pitch, unsigned char* multiply_table = NULL);
+        ~FreeTypeFont()         { CloseFont(); }
+
+        // [Internals]
+        FontInfo        Info;               // Font descriptor of the current font.
+        FT_Face         Face;
+        unsigned int    UserFlags;          // = ImFontConfig::RasterizerFlags
+        FT_Int32        LoadFlags;
+        FT_Render_Mode  RenderMode;
+    };
+
+    // From SDL_ttf: Handy routines for converting from fixed point
+    #define FT_CEIL(X)  (((X + 63) & -64) / 64)
+
+    bool FreeTypeFont::InitFont(FT_Library ft_library, const ImFontConfig& cfg, unsigned int extra_user_flags)
+    {
+        FT_Error error = FT_New_Memory_Face(ft_library, (uint8_t*)cfg.FontData, (uint32_t)cfg.FontDataSize, (uint32_t)cfg.FontNo, &Face);
+        if (error != 0)
+            return false;
+        error = FT_Select_Charmap(Face, FT_ENCODING_UNICODE);
+        if (error != 0)
+            return false;
+
+        memset(&Info, 0, sizeof(Info));
+        SetPixelHeight((uint32_t)cfg.SizePixels);
+
+        // Convert to FreeType flags (NB: Bold and Oblique are processed separately)
+        UserFlags = cfg.RasterizerFlags | extra_user_flags;
+        LoadFlags = FT_LOAD_NO_BITMAP;
+        if (UserFlags & ImGuiFreeType::NoHinting)
+            LoadFlags |= FT_LOAD_NO_HINTING;
+        if (UserFlags & ImGuiFreeType::NoAutoHint)
+            LoadFlags |= FT_LOAD_NO_AUTOHINT;
+        if (UserFlags & ImGuiFreeType::ForceAutoHint)
+            LoadFlags |= FT_LOAD_FORCE_AUTOHINT;
+        if (UserFlags & ImGuiFreeType::LightHinting)
+            LoadFlags |= FT_LOAD_TARGET_LIGHT;
+        else if (UserFlags & ImGuiFreeType::MonoHinting)
+            LoadFlags |= FT_LOAD_TARGET_MONO;
+        else
+            LoadFlags |= FT_LOAD_TARGET_NORMAL;
+
+        if (UserFlags & ImGuiFreeType::Monochrome)
+            RenderMode = FT_RENDER_MODE_MONO;
+        else
+            RenderMode = FT_RENDER_MODE_NORMAL;
+
+        return true;
+    }
+
+    void FreeTypeFont::CloseFont()
+    {
+        if (Face)
+        {
+            FT_Done_Face(Face);
+            Face = NULL;
+        }
+    }
+
+    void FreeTypeFont::SetPixelHeight(int pixel_height)
+    {
+        // Vuhdo: I'm not sure how to deal with font sizes properly. As far as I understand, currently ImGui assumes that the 'pixel_height'
+        // is a maximum height of an any given glyph, i.e. it's the sum of font's ascender and descender. Seems strange to me.
+        // NB: FT_Set_Pixel_Sizes() doesn't seem to get us the same result.
+        FT_Size_RequestRec req;
+        req.type = FT_SIZE_REQUEST_TYPE_REAL_DIM;
+        req.width = 0;
+        req.height = (uint32_t)pixel_height * 64;
+        req.horiResolution = 0;
+        req.vertResolution = 0;
+        FT_Request_Size(Face, &req);
+
+        // Update font info
+        FT_Size_Metrics metrics = Face->size->metrics;
+        Info.PixelHeight = (uint32_t)pixel_height;
+        Info.Ascender = (float)FT_CEIL(metrics.ascender);
+        Info.Descender = (float)FT_CEIL(metrics.descender);
+        Info.LineSpacing = (float)FT_CEIL(metrics.height);
+        Info.LineGap = (float)FT_CEIL(metrics.height - metrics.ascender + metrics.descender);
+        Info.MaxAdvanceWidth = (float)FT_CEIL(metrics.max_advance);
+    }
+
+    const FT_Glyph_Metrics* FreeTypeFont::LoadGlyph(uint32_t codepoint)
+    {
+        uint32_t glyph_index = FT_Get_Char_Index(Face, codepoint);
+        if (glyph_index == 0)
+            return NULL;
+        FT_Error error = FT_Load_Glyph(Face, glyph_index, LoadFlags);
+        if (error)
+            return NULL;
+
+        // Need an outline for this to work
+        FT_GlyphSlot slot = Face->glyph;
+        IM_ASSERT(slot->format == FT_GLYPH_FORMAT_OUTLINE);
+
+        // Apply convenience transform (this is not picking from real "Bold"/"Italic" fonts! Merely applying FreeType helper transform. Oblique == Slanting)
+        if (UserFlags & ImGuiFreeType::Bold)
+            FT_GlyphSlot_Embolden(slot);
+        if (UserFlags & ImGuiFreeType::Oblique)
+        {
+            FT_GlyphSlot_Oblique(slot);
+            //FT_BBox bbox;
+            //FT_Outline_Get_BBox(&slot->outline, &bbox);
+            //slot->metrics.width = bbox.xMax - bbox.xMin;
+            //slot->metrics.height = bbox.yMax - bbox.yMin;
+        }
+
+        return &slot->metrics;
+    }
+
+    const FT_Bitmap* FreeTypeFont::RenderGlyphAndGetInfo(GlyphInfo* out_glyph_info)
+    {
+        FT_GlyphSlot slot = Face->glyph;
+        FT_Error error = FT_Render_Glyph(slot, RenderMode);
+        if (error != 0)
+            return NULL;
+
+        FT_Bitmap* ft_bitmap = &Face->glyph->bitmap;
+        out_glyph_info->Width = (int)ft_bitmap->width;
+        out_glyph_info->Height = (int)ft_bitmap->rows;
+        out_glyph_info->OffsetX = Face->glyph->bitmap_left;
+        out_glyph_info->OffsetY = -Face->glyph->bitmap_top;
+        out_glyph_info->AdvanceX = (float)FT_CEIL(slot->advance.x);
+
+        return ft_bitmap;
+    }
+
+    void FreeTypeFont::BlitGlyph(const FT_Bitmap* ft_bitmap, uint8_t* dst, uint32_t dst_pitch, unsigned char* multiply_table)
+    {
+        IM_ASSERT(ft_bitmap != NULL);
+        const uint32_t w = ft_bitmap->width;
+        const uint32_t h = ft_bitmap->rows;
+        const uint8_t* src = ft_bitmap->buffer;
+        const uint32_t src_pitch = ft_bitmap->pitch;
+
+        switch (ft_bitmap->pixel_mode)
+        {
+        case FT_PIXEL_MODE_GRAY: // Grayscale image, 1 byte per pixel.
+            {
+                if (multiply_table == NULL)
+                {
+                    for (uint32_t y = 0; y < h; y++, src += src_pitch, dst += dst_pitch)
+                        memcpy(dst, src, w);
+                }
+                else
+                {
+                    for (uint32_t y = 0; y < h; y++, src += src_pitch, dst += dst_pitch)
+                        for (uint32_t x = 0; x < w; x++)
+                            dst[x] = multiply_table[src[x]];
+                }
+                break;
+            }
+        case FT_PIXEL_MODE_MONO: // Monochrome image, 1 bit per pixel. The bits in each byte are ordered from MSB to LSB.
+            {
+                uint8_t color0 = multiply_table ? multiply_table[0] : 0;
+                uint8_t color1 = multiply_table ? multiply_table[255] : 255;
+                for (uint32_t y = 0; y < h; y++, src += src_pitch, dst += dst_pitch)
+                {
+                    uint8_t bits = 0;
+                    const uint8_t* bits_ptr = src;
+                    for (uint32_t x = 0; x < w; x++, bits <<= 1)
+                    {
+                        if ((x & 7) == 0)
+                            bits = *bits_ptr++;
+                        dst[x] = (bits & 0x80) ? color1 : color0;
+                    }
+                }
+                break;
+            }
+        default:
+            IM_ASSERT(0 && "FreeTypeFont::BlitGlyph(): Unknown bitmap pixel mode!");
+        }
+    }
+}
+
+#ifndef STB_RECT_PACK_IMPLEMENTATION                        // in case the user already have an implementation in the _same_ compilation unit (e.g. unity builds)
+#ifndef IMGUI_DISABLE_STB_RECT_PACK_IMPLEMENTATION
+#define STBRP_ASSERT(x)     do { IM_ASSERT(x); } while (0)
+#define STBRP_STATIC
+#define STB_RECT_PACK_IMPLEMENTATION
+#endif
+#ifdef IMGUI_STB_RECT_PACK_FILENAME
+#include IMGUI_STB_RECT_PACK_FILENAME
+#else
+#include "imstb_rectpack.h"
+#endif
+#endif
+
+struct ImFontBuildSrcGlyphFT
+{
+    GlyphInfo           Info;
+    uint32_t            Codepoint;
+    unsigned char*      BitmapData;         // Point within one of the dst_tmp_bitmap_buffers[] array
+};
+
+struct ImFontBuildSrcDataFT
+{
+    FreeTypeFont        Font;
+    stbrp_rect*         Rects;              // Rectangle to pack. We first fill in their size and the packer will give us their position.
+    const ImWchar*      SrcRanges;          // Ranges as requested by user (user is allowed to request too much, e.g. 0x0020..0xFFFF)
+    int                 DstIndex;           // Index into atlas->Fonts[] and dst_tmp_array[]
+    int                 GlyphsHighest;      // Highest requested codepoint
+    int                 GlyphsCount;        // Glyph count (excluding missing glyphs and glyphs already set by an earlier source font)
+    ImBitVector         GlyphsSet;          // Glyph bit map (random access, 1-bit per codepoint. This will be a maximum of 8KB)
+    ImVector<ImFontBuildSrcGlyphFT>   GlyphsList;
+};
+
+// Temporary data for one destination ImFont* (multiple source fonts can be merged into one destination ImFont)
+struct ImFontBuildDstDataFT
+{
+    int                 SrcCount;           // Number of source fonts targeting this destination font.
+    int                 GlyphsHighest;
+    int                 GlyphsCount;
+    ImBitVector         GlyphsSet;          // This is used to resolve collision when multiple sources are merged into a same destination font.
+};
+
+bool ImFontAtlasBuildWithFreeType(FT_Library ft_library, ImFontAtlas* atlas, unsigned int extra_flags)
+{
+    IM_ASSERT(atlas->ConfigData.Size > 0);
+
+    ImFontAtlasBuildInit(atlas);
+
+    // Clear atlas
+    atlas->TexID = (ImTextureID)NULL;
+    atlas->TexWidth = atlas->TexHeight = 0;
+    atlas->TexUvScale = ImVec2(0.0f, 0.0f);
+    atlas->TexUvWhitePixel = ImVec2(0.0f, 0.0f);
+    atlas->ClearTexData();
+
+    // Temporary storage for building
+    ImVector<ImFontBuildSrcDataFT> src_tmp_array;
+    ImVector<ImFontBuildDstDataFT> dst_tmp_array;
+    src_tmp_array.resize(atlas->ConfigData.Size);
+    dst_tmp_array.resize(atlas->Fonts.Size);
+    memset((void*)src_tmp_array.Data, 0, (size_t)src_tmp_array.size_in_bytes());
+    memset((void*)dst_tmp_array.Data, 0, (size_t)dst_tmp_array.size_in_bytes());
+
+    // 1. Initialize font loading structure, check font data validity
+    for (int src_i = 0; src_i < atlas->ConfigData.Size; src_i++)
+    {
+        ImFontBuildSrcDataFT& src_tmp = src_tmp_array[src_i];
+        ImFontConfig& cfg = atlas->ConfigData[src_i];
+        FreeTypeFont& font_face = src_tmp.Font;
+        IM_ASSERT(cfg.DstFont && (!cfg.DstFont->IsLoaded() || cfg.DstFont->ContainerAtlas == atlas));
+
+        // Find index from cfg.DstFont (we allow the user to set cfg.DstFont. Also it makes casual debugging nicer than when storing indices)
+        src_tmp.DstIndex = -1;
+        for (int output_i = 0; output_i < atlas->Fonts.Size && src_tmp.DstIndex == -1; output_i++)
+            if (cfg.DstFont == atlas->Fonts[output_i])
+                src_tmp.DstIndex = output_i;
+        IM_ASSERT(src_tmp.DstIndex != -1); // cfg.DstFont not pointing within atlas->Fonts[] array?
+        if (src_tmp.DstIndex == -1)
+            return false;
+
+        // Load font
+        if (!font_face.InitFont(ft_library, cfg, extra_flags))
+            return false;
+
+        // Measure highest codepoints
+        ImFontBuildDstDataFT& dst_tmp = dst_tmp_array[src_tmp.DstIndex];
+        src_tmp.SrcRanges = cfg.GlyphRanges ? cfg.GlyphRanges : atlas->GetGlyphRangesDefault();
+        for (const ImWchar* src_range = src_tmp.SrcRanges; src_range[0] && src_range[1]; src_range += 2)
+            src_tmp.GlyphsHighest = ImMax(src_tmp.GlyphsHighest, (int)src_range[1]);
+        dst_tmp.SrcCount++;
+        dst_tmp.GlyphsHighest = ImMax(dst_tmp.GlyphsHighest, src_tmp.GlyphsHighest);
+    }
+
+    // 2. For every requested codepoint, check for their presence in the font data, and handle redundancy or overlaps between source fonts to avoid unused glyphs.
+    int total_glyphs_count = 0;
+    for (int src_i = 0; src_i < src_tmp_array.Size; src_i++)
+    {
+        ImFontBuildSrcDataFT& src_tmp = src_tmp_array[src_i];
+        ImFontBuildDstDataFT& dst_tmp = dst_tmp_array[src_tmp.DstIndex];
+        src_tmp.GlyphsSet.Create(src_tmp.GlyphsHighest + 1);
+        if (dst_tmp.GlyphsSet.Storage.empty())
+            dst_tmp.GlyphsSet.Create(dst_tmp.GlyphsHighest + 1);
+
+        for (const ImWchar* src_range = src_tmp.SrcRanges; src_range[0] && src_range[1]; src_range += 2)
+            for (int codepoint = src_range[0]; codepoint <= (int)src_range[1]; codepoint++)
+            {
+                if (dst_tmp.GlyphsSet.TestBit(codepoint))    // Don't overwrite existing glyphs. We could make this an option (e.g. MergeOverwrite)
+                    continue;
+                uint32_t glyph_index = FT_Get_Char_Index(src_tmp.Font.Face, codepoint); // It is actually in the font? (FIXME-OPT: We are not storing the glyph_index..)
+                if (glyph_index == 0)
+                    continue;
+
+                // Add to avail set/counters
+                src_tmp.GlyphsCount++;
+                dst_tmp.GlyphsCount++;
+                src_tmp.GlyphsSet.SetBit(codepoint);
+                dst_tmp.GlyphsSet.SetBit(codepoint);
+                total_glyphs_count++;
+            }
+    }
+
+    // 3. Unpack our bit map into a flat list (we now have all the Unicode points that we know are requested _and_ available _and_ not overlapping another)
+    for (int src_i = 0; src_i < src_tmp_array.Size; src_i++)
+    {
+        ImFontBuildSrcDataFT& src_tmp = src_tmp_array[src_i];
+        src_tmp.GlyphsList.reserve(src_tmp.GlyphsCount);
+
+        IM_ASSERT(sizeof(src_tmp.GlyphsSet.Storage.Data[0]) == sizeof(ImU32));
+        const ImU32* it_begin = src_tmp.GlyphsSet.Storage.begin();
+        const ImU32* it_end = src_tmp.GlyphsSet.Storage.end();
+        for (const ImU32* it = it_begin; it < it_end; it++)
+            if (ImU32 entries_32 = *it)
+                for (ImU32 bit_n = 0; bit_n < 32; bit_n++)
+                    if (entries_32 & ((ImU32)1 << bit_n))
+                    {
+                        ImFontBuildSrcGlyphFT src_glyph;
+                        memset(&src_glyph, 0, sizeof(src_glyph));
+                        src_glyph.Codepoint = (ImWchar)(((it - it_begin) << 5) + bit_n);
+                        //src_glyph.GlyphIndex = 0; // FIXME-OPT: We had this info in the previous step and lost it..
+                        src_tmp.GlyphsList.push_back(src_glyph);
+                    }
+        src_tmp.GlyphsSet.Clear();
+        IM_ASSERT(src_tmp.GlyphsList.Size == src_tmp.GlyphsCount);
+    }
+    for (int dst_i = 0; dst_i < dst_tmp_array.Size; dst_i++)
+        dst_tmp_array[dst_i].GlyphsSet.Clear();
+    dst_tmp_array.clear();
+
+    // Allocate packing character data and flag packed characters buffer as non-packed (x0=y0=x1=y1=0)
+    // (We technically don't need to zero-clear buf_rects, but let's do it for the sake of sanity)
+    ImVector<stbrp_rect> buf_rects;
+    buf_rects.resize(total_glyphs_count);
+    memset(buf_rects.Data, 0, (size_t)buf_rects.size_in_bytes());
+
+    // Allocate temporary rasterization data buffers.
+    // We could not find a way to retrieve accurate glyph size without rendering them.
+    // (e.g. slot->metrics->width not always matching bitmap->width, especially considering the Oblique transform)
+    // We allocate in chunks of 256 KB to not waste too much extra memory ahead. Hopefully users of FreeType won't find the temporary allocations.
+    const int BITMAP_BUFFERS_CHUNK_SIZE = 256 * 1024;
+    int buf_bitmap_current_used_bytes = 0;
+    ImVector<unsigned char*> buf_bitmap_buffers;
+    buf_bitmap_buffers.push_back((unsigned char*)IM_ALLOC(BITMAP_BUFFERS_CHUNK_SIZE));
+
+    // 4. Gather glyphs sizes so we can pack them in our virtual canvas.
+    // 8. Render/rasterize font characters into the texture
+    int total_surface = 0;
+    int buf_rects_out_n = 0;
+    for (int src_i = 0; src_i < src_tmp_array.Size; src_i++)
+    {
+        ImFontBuildSrcDataFT& src_tmp = src_tmp_array[src_i];
+        ImFontConfig& cfg = atlas->ConfigData[src_i];
+        if (src_tmp.GlyphsCount == 0)
+            continue;
+
+        src_tmp.Rects = &buf_rects[buf_rects_out_n];
+        buf_rects_out_n += src_tmp.GlyphsCount;
+
+        // Compute multiply table if requested
+        const bool multiply_enabled = (cfg.RasterizerMultiply != 1.0f);
+        unsigned char multiply_table[256];
+        if (multiply_enabled)
+            ImFontAtlasBuildMultiplyCalcLookupTable(multiply_table, cfg.RasterizerMultiply);
+
+        // Gather the sizes of all rectangles we will need to pack
+        const int padding = atlas->TexGlyphPadding;
+        for (int glyph_i = 0; glyph_i < src_tmp.GlyphsList.Size; glyph_i++)
+        {
+            ImFontBuildSrcGlyphFT& src_glyph = src_tmp.GlyphsList[glyph_i];
+
+            const FT_Glyph_Metrics* metrics = src_tmp.Font.LoadGlyph(src_glyph.Codepoint);
+            if (metrics == NULL)
+                continue;
+
+            // Render glyph into a bitmap (currently held by FreeType)
+            const FT_Bitmap* ft_bitmap = src_tmp.Font.RenderGlyphAndGetInfo(&src_glyph.Info);
+            IM_ASSERT(ft_bitmap);
+
+            // Allocate new temporary chunk if needed
+            const int bitmap_size_in_bytes = src_glyph.Info.Width * src_glyph.Info.Height;
+            if (buf_bitmap_current_used_bytes + bitmap_size_in_bytes > BITMAP_BUFFERS_CHUNK_SIZE)
+            {
+                buf_bitmap_current_used_bytes = 0;
+                buf_bitmap_buffers.push_back((unsigned char*)IM_ALLOC(BITMAP_BUFFERS_CHUNK_SIZE));
+            }
+
+            // Blit rasterized pixels to our temporary buffer and keep a pointer to it.
+            src_glyph.BitmapData = buf_bitmap_buffers.back() + buf_bitmap_current_used_bytes;
+            buf_bitmap_current_used_bytes += bitmap_size_in_bytes;
+            src_tmp.Font.BlitGlyph(ft_bitmap, src_glyph.BitmapData, src_glyph.Info.Width * 1, multiply_enabled ? multiply_table : NULL);
+
+            src_tmp.Rects[glyph_i].w = (stbrp_coord)(src_glyph.Info.Width + padding);
+            src_tmp.Rects[glyph_i].h = (stbrp_coord)(src_glyph.Info.Height + padding);
+            total_surface += src_tmp.Rects[glyph_i].w * src_tmp.Rects[glyph_i].h;
+        }
+    }
+
+    // We need a width for the skyline algorithm, any width!
+    // The exact width doesn't really matter much, but some API/GPU have texture size limitations and increasing width can decrease height.
+    // User can override TexDesiredWidth and TexGlyphPadding if they wish, otherwise we use a simple heuristic to select the width based on expected surface.
+    const int surface_sqrt = (int)ImSqrt((float)total_surface) + 1;
+    atlas->TexHeight = 0;
+    if (atlas->TexDesiredWidth > 0)
+        atlas->TexWidth = atlas->TexDesiredWidth;
+    else
+        atlas->TexWidth = (surface_sqrt >= 4096 * 0.7f) ? 4096 : (surface_sqrt >= 2048 * 0.7f) ? 2048 : (surface_sqrt >= 1024 * 0.7f) ? 1024 : 512;
+
+    // 5. Start packing
+    // Pack our extra data rectangles first, so it will be on the upper-left corner of our texture (UV will have small values).
+    const int TEX_HEIGHT_MAX = 1024 * 32;
+    const int num_nodes_for_packing_algorithm = atlas->TexWidth - atlas->TexGlyphPadding;
+    ImVector<stbrp_node> pack_nodes;
+    pack_nodes.resize(num_nodes_for_packing_algorithm);
+    stbrp_context pack_context;
+    stbrp_init_target(&pack_context, atlas->TexWidth, TEX_HEIGHT_MAX, pack_nodes.Data, pack_nodes.Size);
+    ImFontAtlasBuildPackCustomRects(atlas, &pack_context);
+
+    // 6. Pack each source font. No rendering yet, we are working with rectangles in an infinitely tall texture at this point.
+    for (int src_i = 0; src_i < src_tmp_array.Size; src_i++)
+    {
+        ImFontBuildSrcDataFT& src_tmp = src_tmp_array[src_i];
+        if (src_tmp.GlyphsCount == 0)
+            continue;
+
+        stbrp_pack_rects(&pack_context, src_tmp.Rects, src_tmp.GlyphsCount);
+
+        // Extend texture height and mark missing glyphs as non-packed so we won't render them.
+        // FIXME: We are not handling packing failure here (would happen if we got off TEX_HEIGHT_MAX or if a single if larger than TexWidth?)
+        for (int glyph_i = 0; glyph_i < src_tmp.GlyphsCount; glyph_i++)
+            if (src_tmp.Rects[glyph_i].was_packed)
+                atlas->TexHeight = ImMax(atlas->TexHeight, src_tmp.Rects[glyph_i].y + src_tmp.Rects[glyph_i].h);
+    }
+
+    // 7. Allocate texture
+    atlas->TexHeight = (atlas->Flags & ImFontAtlasFlags_NoPowerOfTwoHeight) ? (atlas->TexHeight + 1) : ImUpperPowerOfTwo(atlas->TexHeight);
+    atlas->TexUvScale = ImVec2(1.0f / atlas->TexWidth, 1.0f / atlas->TexHeight);
+    atlas->TexPixelsAlpha8 = (unsigned char*)IM_ALLOC(atlas->TexWidth * atlas->TexHeight);
+    memset(atlas->TexPixelsAlpha8, 0, atlas->TexWidth * atlas->TexHeight);
+
+    // 8. Copy rasterized font characters back into the main texture
+    // 9. Setup ImFont and glyphs for runtime
+    for (int src_i = 0; src_i < src_tmp_array.Size; src_i++)
+    {
+        ImFontBuildSrcDataFT& src_tmp = src_tmp_array[src_i];
+        if (src_tmp.GlyphsCount == 0)
+            continue;
+
+        // When merging fonts with MergeMode=true:
+        // - We can have multiple input fonts writing into a same destination font.
+        // - dst_font->ConfigData is != from cfg which is our source configuration.
+        ImFontConfig& cfg = atlas->ConfigData[src_i];
+        ImFont* dst_font = cfg.DstFont;
+
+        const float ascent = src_tmp.Font.Info.Ascender;
+        const float descent = src_tmp.Font.Info.Descender;
+        ImFontAtlasBuildSetupFont(atlas, dst_font, &cfg, ascent, descent);
+        const float font_off_x = cfg.GlyphOffset.x;
+        const float font_off_y = cfg.GlyphOffset.y + IM_ROUND(dst_font->Ascent);
+
+        const int padding = atlas->TexGlyphPadding;
+        for (int glyph_i = 0; glyph_i < src_tmp.GlyphsCount; glyph_i++)
+        {
+            ImFontBuildSrcGlyphFT& src_glyph = src_tmp.GlyphsList[glyph_i];
+            stbrp_rect& pack_rect = src_tmp.Rects[glyph_i];
+            IM_ASSERT(pack_rect.was_packed);
+            if (pack_rect.w == 0 && pack_rect.h == 0)
+                continue;
+
+            GlyphInfo& info = src_glyph.Info;
+            IM_ASSERT(info.Width + padding <= pack_rect.w);
+            IM_ASSERT(info.Height + padding <= pack_rect.h);
+            const int tx = pack_rect.x + padding;
+            const int ty = pack_rect.y + padding;
+
+            // Blit from temporary buffer to final texture
+            size_t blit_src_stride = (size_t)src_glyph.Info.Width;
+            size_t blit_dst_stride = (size_t)atlas->TexWidth;
+            unsigned char* blit_src = src_glyph.BitmapData;
+            unsigned char* blit_dst = atlas->TexPixelsAlpha8 + (ty * blit_dst_stride) + tx;
+            for (int y = info.Height; y > 0; y--, blit_dst += blit_dst_stride, blit_src += blit_src_stride)
+                memcpy(blit_dst, blit_src, blit_src_stride);
+
+            // Register glyph
+            float x0 = info.OffsetX + font_off_x;
+            float y0 = info.OffsetY + font_off_y;
+            float x1 = x0 + info.Width;
+            float y1 = y0 + info.Height;
+            float u0 = (tx) / (float)atlas->TexWidth;
+            float v0 = (ty) / (float)atlas->TexHeight;
+            float u1 = (tx + info.Width) / (float)atlas->TexWidth;
+            float v1 = (ty + info.Height) / (float)atlas->TexHeight;
+            dst_font->AddGlyph(&cfg, (ImWchar)src_glyph.Codepoint, x0, y0, x1, y1, u0, v0, u1, v1, info.AdvanceX);
+        }
+
+        src_tmp.Rects = NULL;
+    }
+
+    // Cleanup
+    for (int buf_i = 0; buf_i < buf_bitmap_buffers.Size; buf_i++)
+        IM_FREE(buf_bitmap_buffers[buf_i]);
+    for (int src_i = 0; src_i < src_tmp_array.Size; src_i++)
+        src_tmp_array[src_i].~ImFontBuildSrcDataFT();
+
+    ImFontAtlasBuildFinish(atlas);
+
+    return true;
+}
+
+// Default memory allocators
+static void* ImFreeTypeDefaultAllocFunc(size_t size, void* user_data)   { IM_UNUSED(user_data); return IM_ALLOC(size); }
+static void  ImFreeTypeDefaultFreeFunc(void* ptr, void* user_data)      { IM_UNUSED(user_data); IM_FREE(ptr); }
+
+// Current memory allocators
+static void* (*GImFreeTypeAllocFunc)(size_t size, void* user_data) = ImFreeTypeDefaultAllocFunc;
+static void  (*GImFreeTypeFreeFunc)(void* ptr, void* user_data) = ImFreeTypeDefaultFreeFunc;
+static void* GImFreeTypeAllocatorUserData = NULL;
+
+// FreeType memory allocation callbacks
+static void* FreeType_Alloc(FT_Memory /*memory*/, long size)
+{
+    return GImFreeTypeAllocFunc((size_t)size, GImFreeTypeAllocatorUserData);
+}
+
+static void FreeType_Free(FT_Memory /*memory*/, void* block)
+{
+    GImFreeTypeFreeFunc(block, GImFreeTypeAllocatorUserData);
+}
+
+static void* FreeType_Realloc(FT_Memory /*memory*/, long cur_size, long new_size, void* block)
+{
+    // Implement realloc() as we don't ask user to provide it.
+    if (block == NULL)
+        return GImFreeTypeAllocFunc((size_t)new_size, GImFreeTypeAllocatorUserData);
+
+    if (new_size == 0)
+    {
+        GImFreeTypeFreeFunc(block, GImFreeTypeAllocatorUserData);
+        return NULL;
+    }
+
+    if (new_size > cur_size)
+    {
+        void* new_block = GImFreeTypeAllocFunc((size_t)new_size, GImFreeTypeAllocatorUserData);
+        memcpy(new_block, block, (size_t)cur_size);
+        GImFreeTypeFreeFunc(block, GImFreeTypeAllocatorUserData);
+        return new_block;
+    }
+
+    return block;
+}
+
+bool ImGuiFreeType::BuildFontAtlas(ImFontAtlas* atlas, unsigned int extra_flags)
+{
+    // FreeType memory management: https://www.freetype.org/freetype2/docs/design/design-4.html
+    FT_MemoryRec_ memory_rec = {};
+    memory_rec.user = NULL;
+    memory_rec.alloc = &FreeType_Alloc;
+    memory_rec.free = &FreeType_Free;
+    memory_rec.realloc = &FreeType_Realloc;
+
+    // https://www.freetype.org/freetype2/docs/reference/ft2-module_management.html#FT_New_Library
+    FT_Library ft_library;
+    FT_Error error = FT_New_Library(&memory_rec, &ft_library);
+    if (error != 0)
+        return false;
+
+    // If you don't call FT_Add_Default_Modules() the rest of code may work, but FreeType won't use our custom allocator.
+    FT_Add_Default_Modules(ft_library);
+
+    bool ret = ImFontAtlasBuildWithFreeType(ft_library, atlas, extra_flags);
+    FT_Done_Library(ft_library);
+
+    return ret;
+}
+
+void ImGuiFreeType::SetAllocatorFunctions(void* (*alloc_func)(size_t sz, void* user_data), void (*free_func)(void* ptr, void* user_data), void* user_data)
+{
+    GImFreeTypeAllocFunc = alloc_func;
+    GImFreeTypeFreeFunc = free_func;
+    GImFreeTypeAllocatorUserData = user_data;
+}

external/glad/CMakeLists.txt

@@ -0,0 +1,20 @@
+cmake_minimum_required(VERSION 3.16)
+project(glad)
+
+set(CMAKE_CXX_STANDARD 17)
+
+if (WIN32)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libstdc++ -static-libgcc -static")
+endif()
+
+add_library(glad
+    source/glad.c
+)
+
+target_include_directories(glad PUBLIC include)
+
+if (WIN32)
+    target_link_libraries(glad PRIVATE libdl.a)
+else()
+    target_link_libraries(glad PRIVATE dl)
+endif()

external/llvm/CMakeLists.txt

@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 3.16)
+project(LLVMDemangle)
+
+set(CMAKE_CXX_STANDARD 17)
+
+if (WIN32)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libstdc++ -static-libgcc -static")
+endif()
+
+add_library(LLVMDemangle
+        Demangle/Demangle.cpp
+        Demangle/ItaniumDemangle.cpp
+        Demangle/MicrosoftDemangle.cpp
+        Demangle/MicrosoftDemangleNodes.cpp
+)
+
+target_include_directories(LLVMDemangle PUBLIC include)

external/llvm/Demangle/Demangle.cpp

@@ -0,0 +1,36 @@
+//===-- Demangle.cpp - Common demangling functions ------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+///
+/// \file This file contains definitions of common demangling functions.
+///
+//===----------------------------------------------------------------------===//
+
+#include "llvm/Demangle/Demangle.h"
+#include <cstdlib>
+
+static bool isItaniumEncoding(const std::string &MangledName) {
+  size_t Pos = MangledName.find_first_not_of('_');
+  // A valid Itanium encoding requires 1-4 leading underscores, followed by 'Z'.
+  return Pos > 0 && Pos <= 4 && MangledName[Pos] == 'Z';
+}
+
+std::string llvm::demangle(const std::string &MangledName) {
+  char *Demangled;
+  if (isItaniumEncoding(MangledName))
+    Demangled = itaniumDemangle(MangledName.c_str(), nullptr, nullptr, nullptr);
+  else
+    Demangled = microsoftDemangle(MangledName.c_str(), nullptr, nullptr,
+                                  nullptr, nullptr);
+
+  if (!Demangled)
+    return MangledName;
+
+  std::string Ret = Demangled;
+  free(Demangled);
+  return Ret;
+}

external/llvm/Demangle/ItaniumDemangle.cpp

@@ -0,0 +1,577 @@
+//===------------------------- ItaniumDemangle.cpp ------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// FIXME: (possibly) incomplete list of features that clang mangles that this
+// file does not yet support:
+//   - C++ modules TS
+
+#include "llvm/Demangle/Demangle.h"
+#include "llvm/Demangle/ItaniumDemangle.h"
+
+#include <cassert>
+#include <cctype>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <functional>
+#include <numeric>
+#include <utility>
+#include <vector>
+
+using namespace llvm;
+using namespace llvm::itanium_demangle;
+
+constexpr const char *itanium_demangle::FloatData<float>::spec;
+constexpr const char *itanium_demangle::FloatData<double>::spec;
+constexpr const char *itanium_demangle::FloatData<long double>::spec;
+
+// <discriminator> := _ <non-negative number>      # when number < 10
+//                 := __ <non-negative number> _   # when number >= 10
+//  extension      := decimal-digit+               # at the end of string
+const char *itanium_demangle::parse_discriminator(const char *first,
+                                                  const char *last) {
+  // parse but ignore discriminator
+  if (first != last) {
+    if (*first == '_') {
+      const char *t1 = first + 1;
+      if (t1 != last) {
+        if (std::isdigit(*t1))
+          first = t1 + 1;
+        else if (*t1 == '_') {
+          for (++t1; t1 != last && std::isdigit(*t1); ++t1)
+            ;
+          if (t1 != last && *t1 == '_')
+            first = t1 + 1;
+        }
+      }
+    } else if (std::isdigit(*first)) {
+      const char *t1 = first + 1;
+      for (; t1 != last && std::isdigit(*t1); ++t1)
+        ;
+      if (t1 == last)
+        first = last;
+    }
+  }
+  return first;
+}
+
+#ifndef NDEBUG
+namespace {
+struct DumpVisitor {
+  unsigned Depth = 0;
+  bool PendingNewline = false;
+
+  template<typename NodeT> static constexpr bool wantsNewline(const NodeT *) {
+    return true;
+  }
+  static bool wantsNewline(NodeArray A) { return !A.empty(); }
+  static constexpr bool wantsNewline(...) { return false; }
+
+  template<typename ...Ts> static bool anyWantNewline(Ts ...Vs) {
+    for (bool B : {wantsNewline(Vs)...})
+      if (B)
+        return true;
+    return false;
+  }
+
+  void printStr(const char *S) { fprintf(stderr, "%s", S); }
+  void print(StringView SV) {
+    fprintf(stderr, "\"%.*s\"", (int)SV.size(), SV.begin());
+  }
+  void print(const Node *N) {
+    if (N)
+      N->visit(std::ref(*this));
+    else
+      printStr("<null>");
+  }
+  void print(NodeArray A) {
+    ++Depth;
+    printStr("{");
+    bool First = true;
+    for (const Node *N : A) {
+      if (First)
+        print(N);
+      else
+        printWithComma(N);
+      First = false;
+    }
+    printStr("}");
+    --Depth;
+  }
+
+  // Overload used when T is exactly 'bool', not merely convertible to 'bool'.
+  void print(bool B) { printStr(B ? "true" : "false"); }
+
+  template <class T> std::enable_if_t<std::is_unsigned<T>::value> print(T N) {
+    fprintf(stderr, "%llu", (unsigned long long)N);
+  }
+
+  template <class T> std::enable_if_t<std::is_signed<T>::value> print(T N) {
+    fprintf(stderr, "%lld", (long long)N);
+  }
+
+  void print(ReferenceKind RK) {
+    switch (RK) {
+    case ReferenceKind::LValue:
+      return printStr("ReferenceKind::LValue");
+    case ReferenceKind::RValue:
+      return printStr("ReferenceKind::RValue");
+    }
+  }
+  void print(FunctionRefQual RQ) {
+    switch (RQ) {
+    case FunctionRefQual::FrefQualNone:
+      return printStr("FunctionRefQual::FrefQualNone");
+    case FunctionRefQual::FrefQualLValue:
+      return printStr("FunctionRefQual::FrefQualLValue");
+    case FunctionRefQual::FrefQualRValue:
+      return printStr("FunctionRefQual::FrefQualRValue");
+    }
+  }
+  void print(Qualifiers Qs) {
+    if (!Qs) return printStr("QualNone");
+    struct QualName { Qualifiers Q; const char *Name; } Names[] = {
+      {QualConst, "QualConst"},
+      {QualVolatile, "QualVolatile"},
+      {QualRestrict, "QualRestrict"},
+    };
+    for (QualName Name : Names) {
+      if (Qs & Name.Q) {
+        printStr(Name.Name);
+        Qs = Qualifiers(Qs & ~Name.Q);
+        if (Qs) printStr(" | ");
+      }
+    }
+  }
+  void print(SpecialSubKind SSK) {
+    switch (SSK) {
+    case SpecialSubKind::allocator:
+      return printStr("SpecialSubKind::allocator");
+    case SpecialSubKind::basic_string:
+      return printStr("SpecialSubKind::basic_string");
+    case SpecialSubKind::string:
+      return printStr("SpecialSubKind::string");
+    case SpecialSubKind::istream:
+      return printStr("SpecialSubKind::istream");
+    case SpecialSubKind::ostream:
+      return printStr("SpecialSubKind::ostream");
+    case SpecialSubKind::iostream:
+      return printStr("SpecialSubKind::iostream");
+    }
+  }
+  void print(TemplateParamKind TPK) {
+    switch (TPK) {
+    case TemplateParamKind::Type:
+      return printStr("TemplateParamKind::Type");
+    case TemplateParamKind::NonType:
+      return printStr("TemplateParamKind::NonType");
+    case TemplateParamKind::Template:
+      return printStr("TemplateParamKind::Template");
+    }
+  }
+
+  void newLine() {
+    printStr("\n");
+    for (unsigned I = 0; I != Depth; ++I)
+      printStr(" ");
+    PendingNewline = false;
+  }
+
+  template<typename T> void printWithPendingNewline(T V) {
+    print(V);
+    if (wantsNewline(V))
+      PendingNewline = true;
+  }
+
+  template<typename T> void printWithComma(T V) {
+    if (PendingNewline || wantsNewline(V)) {
+      printStr(",");
+      newLine();
+    } else {
+      printStr(", ");
+    }
+
+    printWithPendingNewline(V);
+  }
+
+  struct CtorArgPrinter {
+    DumpVisitor &Visitor;
+
+    template<typename T, typename ...Rest> void operator()(T V, Rest ...Vs) {
+      if (Visitor.anyWantNewline(V, Vs...))
+        Visitor.newLine();
+      Visitor.printWithPendingNewline(V);
+      int PrintInOrder[] = { (Visitor.printWithComma(Vs), 0)..., 0 };
+      (void)PrintInOrder;
+    }
+  };
+
+  template<typename NodeT> void operator()(const NodeT *Node) {
+    Depth += 2;
+    fprintf(stderr, "%s(", itanium_demangle::NodeKind<NodeT>::name());
+    Node->match(CtorArgPrinter{*this});
+    fprintf(stderr, ")");
+    Depth -= 2;
+  }
+
+  void operator()(const ForwardTemplateReference *Node) {
+    Depth += 2;
+    fprintf(stderr, "ForwardTemplateReference(");
+    if (Node->Ref && !Node->Printing) {
+      Node->Printing = true;
+      CtorArgPrinter{*this}(Node->Ref);
+      Node->Printing = false;
+    } else {
+      CtorArgPrinter{*this}(Node->Index);
+    }
+    fprintf(stderr, ")");
+    Depth -= 2;
+  }
+};
+}
+
+void itanium_demangle::Node::dump() const {
+  DumpVisitor V;
+  visit(std::ref(V));
+  V.newLine();
+}
+#endif
+
+namespace {
+class BumpPointerAllocator {
+  struct BlockMeta {
+    BlockMeta* Next;
+    size_t Current;
+  };
+
+  static constexpr size_t AllocSize = 4096;
+  static constexpr size_t UsableAllocSize = AllocSize - sizeof(BlockMeta);
+
+  alignas(long double) char InitialBuffer[AllocSize];
+  BlockMeta* BlockList = nullptr;
+
+  void grow() {
+    char* NewMeta = static_cast<char *>(std::malloc(AllocSize));
+    if (NewMeta == nullptr)
+      std::terminate();
+    BlockList = new (NewMeta) BlockMeta{BlockList, 0};
+  }
+
+  void* allocateMassive(size_t NBytes) {
+    NBytes += sizeof(BlockMeta);
+    BlockMeta* NewMeta = reinterpret_cast<BlockMeta*>(std::malloc(NBytes));
+    if (NewMeta == nullptr)
+      std::terminate();
+    BlockList->Next = new (NewMeta) BlockMeta{BlockList->Next, 0};
+    return static_cast<void*>(NewMeta + 1);
+  }
+
+public:
+  BumpPointerAllocator()
+      : BlockList(new (InitialBuffer) BlockMeta{nullptr, 0}) {}
+
+  void* allocate(size_t N) {
+    N = (N + 15u) & ~15u;
+    if (N + BlockList->Current >= UsableAllocSize) {
+      if (N > UsableAllocSize)
+        return allocateMassive(N);
+      grow();
+    }
+    BlockList->Current += N;
+    return static_cast<void*>(reinterpret_cast<char*>(BlockList + 1) +
+                              BlockList->Current - N);
+  }
+
+  void reset() {
+    while (BlockList) {
+      BlockMeta* Tmp = BlockList;
+      BlockList = BlockList->Next;
+      if (reinterpret_cast<char*>(Tmp) != InitialBuffer)
+        std::free(Tmp);
+    }
+    BlockList = new (InitialBuffer) BlockMeta{nullptr, 0};
+  }
+
+  ~BumpPointerAllocator() { reset(); }
+};
+
+class DefaultAllocator {
+  BumpPointerAllocator Alloc;
+
+public:
+  void reset() { Alloc.reset(); }
+
+  template<typename T, typename ...Args> T *makeNode(Args &&...args) {
+    return new (Alloc.allocate(sizeof(T)))
+        T(std::forward<Args>(args)...);
+  }
+
+  void *allocateNodeArray(size_t sz) {
+    return Alloc.allocate(sizeof(Node *) * sz);
+  }
+};
+}  // unnamed namespace
+
+//===----------------------------------------------------------------------===//
+// Code beyond this point should not be synchronized with libc++abi.
+//===----------------------------------------------------------------------===//
+
+using Demangler = itanium_demangle::ManglingParser<DefaultAllocator>;
+
+char *llvm::itaniumDemangle(const char *MangledName, char *Buf,
+                            size_t *N, int *Status) {
+  if (MangledName == nullptr || (Buf != nullptr && N == nullptr)) {
+    if (Status)
+      *Status = demangle_invalid_args;
+    return nullptr;
+  }
+
+  int InternalStatus = demangle_success;
+  Demangler Parser(MangledName, MangledName + std::strlen(MangledName));
+  OutputStream S;
+
+  Node *AST = Parser.parse();
+
+  if (AST == nullptr)
+    InternalStatus = demangle_invalid_mangled_name;
+  else if (!initializeOutputStream(Buf, N, S, 1024))
+    InternalStatus = demangle_memory_alloc_failure;
+  else {
+    assert(Parser.ForwardTemplateRefs.empty());
+    AST->print(S);
+    S += '\0';
+    if (N != nullptr)
+      *N = S.getCurrentPosition();
+    Buf = S.getBuffer();
+  }
+
+  if (Status)
+    *Status = InternalStatus;
+  return InternalStatus == demangle_success ? Buf : nullptr;
+}
+
+ItaniumPartialDemangler::ItaniumPartialDemangler()
+    : RootNode(nullptr), Context(new Demangler{nullptr, nullptr}) {}
+
+ItaniumPartialDemangler::~ItaniumPartialDemangler() {
+  delete static_cast<Demangler *>(Context);
+}
+
+ItaniumPartialDemangler::ItaniumPartialDemangler(
+    ItaniumPartialDemangler &&Other)
+    : RootNode(Other.RootNode), Context(Other.Context) {
+  Other.Context = Other.RootNode = nullptr;
+}
+
+ItaniumPartialDemangler &ItaniumPartialDemangler::
+operator=(ItaniumPartialDemangler &&Other) {
+  std::swap(RootNode, Other.RootNode);
+  std::swap(Context, Other.Context);
+  return *this;
+}
+
+// Demangle MangledName into an AST, storing it into this->RootNode.
+bool ItaniumPartialDemangler::partialDemangle(const char *MangledName) {
+  Demangler *Parser = static_cast<Demangler *>(Context);
+  size_t Len = std::strlen(MangledName);
+  Parser->reset(MangledName, MangledName + Len);
+  RootNode = Parser->parse();
+  return RootNode == nullptr;
+}
+
+static char *printNode(const Node *RootNode, char *Buf, size_t *N) {
+  OutputStream S;
+  if (!initializeOutputStream(Buf, N, S, 128))
+    return nullptr;
+  RootNode->print(S);
+  S += '\0';
+  if (N != nullptr)
+    *N = S.getCurrentPosition();
+  return S.getBuffer();
+}
+
+char *ItaniumPartialDemangler::getFunctionBaseName(char *Buf, size_t *N) const {
+  if (!isFunction())
+    return nullptr;
+
+  const Node *Name = static_cast<const FunctionEncoding *>(RootNode)->getName();
+
+  while (true) {
+    switch (Name->getKind()) {
+    case Node::KAbiTagAttr:
+      Name = static_cast<const AbiTagAttr *>(Name)->Base;
+      continue;
+    case Node::KStdQualifiedName:
+      Name = static_cast<const StdQualifiedName *>(Name)->Child;
+      continue;
+    case Node::KNestedName:
+      Name = static_cast<const NestedName *>(Name)->Name;
+      continue;
+    case Node::KLocalName:
+      Name = static_cast<const LocalName *>(Name)->Entity;
+      continue;
+    case Node::KNameWithTemplateArgs:
+      Name = static_cast<const NameWithTemplateArgs *>(Name)->Name;
+      continue;
+    default:
+      return printNode(Name, Buf, N);
+    }
+  }
+}
+
+char *ItaniumPartialDemangler::getFunctionDeclContextName(char *Buf,
+                                                          size_t *N) const {
+  if (!isFunction())
+    return nullptr;
+  const Node *Name = static_cast<const FunctionEncoding *>(RootNode)->getName();
+
+  OutputStream S;
+  if (!initializeOutputStream(Buf, N, S, 128))
+    return nullptr;
+
+ KeepGoingLocalFunction:
+  while (true) {
+    if (Name->getKind() == Node::KAbiTagAttr) {
+      Name = static_cast<const AbiTagAttr *>(Name)->Base;
+      continue;
+    }
+    if (Name->getKind() == Node::KNameWithTemplateArgs) {
+      Name = static_cast<const NameWithTemplateArgs *>(Name)->Name;
+      continue;
+    }
+    break;
+  }
+
+  switch (Name->getKind()) {
+  case Node::KStdQualifiedName:
+    S += "std";
+    break;
+  case Node::KNestedName:
+    static_cast<const NestedName *>(Name)->Qual->print(S);
+    break;
+  case Node::KLocalName: {
+    auto *LN = static_cast<const LocalName *>(Name);
+    LN->Encoding->print(S);
+    S += "::";
+    Name = LN->Entity;
+    goto KeepGoingLocalFunction;
+  }
+  default:
+    break;
+  }
+  S += '\0';
+  if (N != nullptr)
+    *N = S.getCurrentPosition();
+  return S.getBuffer();
+}
+
+char *ItaniumPartialDemangler::getFunctionName(char *Buf, size_t *N) const {
+  if (!isFunction())
+    return nullptr;
+  auto *Name = static_cast<FunctionEncoding *>(RootNode)->getName();
+  return printNode(Name, Buf, N);
+}
+
+char *ItaniumPartialDemangler::getFunctionParameters(char *Buf,
+                                                     size_t *N) const {
+  if (!isFunction())
+    return nullptr;
+  NodeArray Params = static_cast<FunctionEncoding *>(RootNode)->getParams();
+
+  OutputStream S;
+  if (!initializeOutputStream(Buf, N, S, 128))
+    return nullptr;
+
+  S += '(';
+  Params.printWithComma(S);
+  S += ')';
+  S += '\0';
+  if (N != nullptr)
+    *N = S.getCurrentPosition();
+  return S.getBuffer();
+}
+
+char *ItaniumPartialDemangler::getFunctionReturnType(
+    char *Buf, size_t *N) const {
+  if (!isFunction())
+    return nullptr;
+
+  OutputStream S;
+  if (!initializeOutputStream(Buf, N, S, 128))
+    return nullptr;
+
+  if (const Node *Ret =
+          static_cast<const FunctionEncoding *>(RootNode)->getReturnType())
+    Ret->print(S);
+
+  S += '\0';
+  if (N != nullptr)
+    *N = S.getCurrentPosition();
+  return S.getBuffer();
+}
+
+char *ItaniumPartialDemangler::finishDemangle(char *Buf, size_t *N) const {
+  assert(RootNode != nullptr && "must call partialDemangle()");
+  return printNode(static_cast<Node *>(RootNode), Buf, N);
+}
+
+bool ItaniumPartialDemangler::hasFunctionQualifiers() const {
+  assert(RootNode != nullptr && "must call partialDemangle()");
+  if (!isFunction())
+    return false;
+  auto *E = static_cast<const FunctionEncoding *>(RootNode);
+  return E->getCVQuals() != QualNone || E->getRefQual() != FrefQualNone;
+}
+
+bool ItaniumPartialDemangler::isCtorOrDtor() const {
+  const Node *N = static_cast<const Node *>(RootNode);
+  while (N) {
+    switch (N->getKind()) {
+    default:
+      return false;
+    case Node::KCtorDtorName:
+      return true;
+
+    case Node::KAbiTagAttr:
+      N = static_cast<const AbiTagAttr *>(N)->Base;
+      break;
+    case Node::KFunctionEncoding:
+      N = static_cast<const FunctionEncoding *>(N)->getName();
+      break;
+    case Node::KLocalName:
+      N = static_cast<const LocalName *>(N)->Entity;
+      break;
+    case Node::KNameWithTemplateArgs:
+      N = static_cast<const NameWithTemplateArgs *>(N)->Name;
+      break;
+    case Node::KNestedName:
+      N = static_cast<const NestedName *>(N)->Name;
+      break;
+    case Node::KStdQualifiedName:
+      N = static_cast<const StdQualifiedName *>(N)->Child;
+      break;
+    }
+  }
+  return false;
+}
+
+bool ItaniumPartialDemangler::isFunction() const {
+  assert(RootNode != nullptr && "must call partialDemangle()");
+  return static_cast<const Node *>(RootNode)->getKind() ==
+         Node::KFunctionEncoding;
+}
+
+bool ItaniumPartialDemangler::isSpecialName() const {
+  assert(RootNode != nullptr && "must call partialDemangle()");
+  auto K = static_cast<const Node *>(RootNode)->getKind();
+  return K == Node::KSpecialName || K == Node::KCtorVtableSpecialName;
+}
+
+bool ItaniumPartialDemangler::isData() const {
+  return !isFunction() && !isSpecialName();
+}

external/llvm/Demangle/MicrosoftDemangleNodes.cpp

@@ -0,0 +1,653 @@
+//===- MicrosoftDemangle.cpp ----------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file defines a demangler for MSVC-style mangled symbols.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/Demangle/MicrosoftDemangleNodes.h"
+#include "llvm/Demangle/DemangleConfig.h"
+#include "llvm/Demangle/Utility.h"
+#include <cctype>
+#include <string>
+
+using namespace llvm;
+using namespace ms_demangle;
+
+#define OUTPUT_ENUM_CLASS_VALUE(Enum, Value, Desc)                             \
+  case Enum::Value:                                                            \
+    OS << Desc;                                                                \
+    break;
+
+// Writes a space if the last token does not end with a punctuation.
+static void outputSpaceIfNecessary(OutputStream &OS) {
+  if (OS.empty())
+    return;
+
+  char C = OS.back();
+  if (std::isalnum(C) || C == '>')
+    OS << " ";
+}
+
+static void outputSingleQualifier(OutputStream &OS, Qualifiers Q) {
+  switch (Q) {
+  case Q_Const:
+    OS << "const";
+    break;
+  case Q_Volatile:
+    OS << "volatile";
+    break;
+  case Q_Restrict:
+    OS << "__restrict";
+    break;
+  default:
+    break;
+  }
+}
+
+static bool outputQualifierIfPresent(OutputStream &OS, Qualifiers Q,
+                                     Qualifiers Mask, bool NeedSpace) {
+  if (!(Q & Mask))
+    return NeedSpace;
+
+  if (NeedSpace)
+    OS << " ";
+
+  outputSingleQualifier(OS, Mask);
+  return true;
+}
+
+static void outputQualifiers(OutputStream &OS, Qualifiers Q, bool SpaceBefore,
+                             bool SpaceAfter) {
+  if (Q == Q_None)
+    return;
+
+  size_t Pos1 = OS.getCurrentPosition();
+  SpaceBefore = outputQualifierIfPresent(OS, Q, Q_Const, SpaceBefore);
+  SpaceBefore = outputQualifierIfPresent(OS, Q, Q_Volatile, SpaceBefore);
+  SpaceBefore = outputQualifierIfPresent(OS, Q, Q_Restrict, SpaceBefore);
+  size_t Pos2 = OS.getCurrentPosition();
+  if (SpaceAfter && Pos2 > Pos1)
+    OS << " ";
+}
+
+static void outputCallingConvention(OutputStream &OS, CallingConv CC) {
+  outputSpaceIfNecessary(OS);
+
+  switch (CC) {
+  case CallingConv::Cdecl:
+    OS << "__cdecl";
+    break;
+  case CallingConv::Fastcall:
+    OS << "__fastcall";
+    break;
+  case CallingConv::Pascal:
+    OS << "__pascal";
+    break;
+  case CallingConv::Regcall:
+    OS << "__regcall";
+    break;
+  case CallingConv::Stdcall:
+    OS << "__stdcall";
+    break;
+  case CallingConv::Thiscall:
+    OS << "__thiscall";
+    break;
+  case CallingConv::Eabi:
+    OS << "__eabi";
+    break;
+  case CallingConv::Vectorcall:
+    OS << "__vectorcall";
+    break;
+  case CallingConv::Clrcall:
+    OS << "__clrcall";
+    break;
+  default:
+    break;
+  }
+}
+
+std::string Node::toString(OutputFlags Flags) const {
+  OutputStream OS;
+  initializeOutputStream(nullptr, nullptr, OS, 1024);
+  this->output(OS, Flags);
+  OS << '\0';
+  return {OS.getBuffer()};
+}
+
+void PrimitiveTypeNode::outputPre(OutputStream &OS, OutputFlags Flags) const {
+  switch (PrimKind) {
+    OUTPUT_ENUM_CLASS_VALUE(PrimitiveKind, Void, "void");
+    OUTPUT_ENUM_CLASS_VALUE(PrimitiveKind, Bool, "bool");
+    OUTPUT_ENUM_CLASS_VALUE(PrimitiveKind, Char, "char");
+    OUTPUT_ENUM_CLASS_VALUE(PrimitiveKind, Schar, "signed char");
+    OUTPUT_ENUM_CLASS_VALUE(PrimitiveKind, Uchar, "unsigned char");
+    OUTPUT_ENUM_CLASS_VALUE(PrimitiveKind, Char8, "char8_t");
+    OUTPUT_ENUM_CLASS_VALUE(PrimitiveKind, Char16, "char16_t");
+    OUTPUT_ENUM_CLASS_VALUE(PrimitiveKind, Char32, "char32_t");
+    OUTPUT_ENUM_CLASS_VALUE(PrimitiveKind, Short, "short");
+    OUTPUT_ENUM_CLASS_VALUE(PrimitiveKind, Ushort, "unsigned short");
+    OUTPUT_ENUM_CLASS_VALUE(PrimitiveKind, Int, "int");
+    OUTPUT_ENUM_CLASS_VALUE(PrimitiveKind, Uint, "unsigned int");
+    OUTPUT_ENUM_CLASS_VALUE(PrimitiveKind, Long, "long");
+    OUTPUT_ENUM_CLASS_VALUE(PrimitiveKind, Ulong, "unsigned long");
+    OUTPUT_ENUM_CLASS_VALUE(PrimitiveKind, Int64, "__int64");
+    OUTPUT_ENUM_CLASS_VALUE(PrimitiveKind, Uint64, "unsigned __int64");
+    OUTPUT_ENUM_CLASS_VALUE(PrimitiveKind, Wchar, "wchar_t");
+    OUTPUT_ENUM_CLASS_VALUE(PrimitiveKind, Float, "float");
+    OUTPUT_ENUM_CLASS_VALUE(PrimitiveKind, Double, "double");
+    OUTPUT_ENUM_CLASS_VALUE(PrimitiveKind, Ldouble, "long double");
+    OUTPUT_ENUM_CLASS_VALUE(PrimitiveKind, Nullptr, "std::nullptr_t");
+  }
+  outputQualifiers(OS, Quals, true, false);
+}
+
+void NodeArrayNode::output(OutputStream &OS, OutputFlags Flags) const {
+  output(OS, Flags, ", ");
+}
+
+void NodeArrayNode::output(OutputStream &OS, OutputFlags Flags,
+                           StringView Separator) const {
+  if (Count == 0)
+    return;
+  if (Nodes[0])
+    Nodes[0]->output(OS, Flags);
+  for (size_t I = 1; I < Count; ++I) {
+    OS << Separator;
+    Nodes[I]->output(OS, Flags);
+  }
+}
+
+void EncodedStringLiteralNode::output(OutputStream &OS,
+                                      OutputFlags Flags) const {
+  switch (Char) {
+  case CharKind::Wchar:
+    OS << "L\"";
+    break;
+  case CharKind::Char:
+    OS << "\"";
+    break;
+  case CharKind::Char16:
+    OS << "u\"";
+    break;
+  case CharKind::Char32:
+    OS << "U\"";
+    break;
+  }
+  OS << DecodedString << "\"";
+  if (IsTruncated)
+    OS << "...";
+}
+
+void IntegerLiteralNode::output(OutputStream &OS, OutputFlags Flags) const {
+  if (IsNegative)
+    OS << '-';
+  OS << Value;
+}
+
+void TemplateParameterReferenceNode::output(OutputStream &OS,
+                                            OutputFlags Flags) const {
+  if (ThunkOffsetCount > 0)
+    OS << "{";
+  else if (Affinity == PointerAffinity::Pointer)
+    OS << "&";
+
+  if (Symbol) {
+    Symbol->output(OS, Flags);
+    if (ThunkOffsetCount > 0)
+      OS << ", ";
+  }
+
+  if (ThunkOffsetCount > 0)
+    OS << ThunkOffsets[0];
+  for (int I = 1; I < ThunkOffsetCount; ++I) {
+    OS << ", " << ThunkOffsets[I];
+  }
+  if (ThunkOffsetCount > 0)
+    OS << "}";
+}
+
+void IdentifierNode::outputTemplateParameters(OutputStream &OS,
+                                              OutputFlags Flags) const {
+  if (!TemplateParams)
+    return;
+  OS << "<";
+  TemplateParams->output(OS, Flags);
+  OS << ">";
+}
+
+void DynamicStructorIdentifierNode::output(OutputStream &OS,
+                                           OutputFlags Flags) const {
+  if (IsDestructor)
+    OS << "`dynamic atexit destructor for ";
+  else
+    OS << "`dynamic initializer for ";
+
+  if (Variable) {
+    OS << "`";
+    Variable->output(OS, Flags);
+    OS << "''";
+  } else {
+    OS << "'";
+    Name->output(OS, Flags);
+    OS << "''";
+  }
+}
+
+void NamedIdentifierNode::output(OutputStream &OS, OutputFlags Flags) const {
+  OS << Name;
+  outputTemplateParameters(OS, Flags);
+}
+
+void IntrinsicFunctionIdentifierNode::output(OutputStream &OS,
+                                             OutputFlags Flags) const {
+  switch (Operator) {
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, New, "operator new");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, Delete, "operator delete");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, Assign, "operator=");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, RightShift, "operator>>");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, LeftShift, "operator<<");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, LogicalNot, "operator!");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, Equals, "operator==");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, NotEquals, "operator!=");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, ArraySubscript,
+                            "operator[]");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, Pointer, "operator->");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, Increment, "operator++");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, Decrement, "operator--");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, Minus, "operator-");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, Plus, "operator+");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, Dereference, "operator*");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, BitwiseAnd, "operator&");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, MemberPointer,
+                            "operator->*");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, Divide, "operator/");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, Modulus, "operator%");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, LessThan, "operator<");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, LessThanEqual, "operator<=");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, GreaterThan, "operator>");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, GreaterThanEqual,
+                            "operator>=");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, Comma, "operator,");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, Parens, "operator()");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, BitwiseNot, "operator~");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, BitwiseXor, "operator^");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, BitwiseOr, "operator|");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, LogicalAnd, "operator&&");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, LogicalOr, "operator||");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, TimesEqual, "operator*=");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, PlusEqual, "operator+=");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, MinusEqual, "operator-=");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, DivEqual, "operator/=");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, ModEqual, "operator%=");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, RshEqual, "operator>>=");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, LshEqual, "operator<<=");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, BitwiseAndEqual,
+                            "operator&=");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, BitwiseOrEqual,
+                            "operator|=");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, BitwiseXorEqual,
+                            "operator^=");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, VbaseDtor, "`vbase dtor'");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, VecDelDtor,
+                            "`vector deleting dtor'");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, DefaultCtorClosure,
+                            "`default ctor closure'");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, ScalarDelDtor,
+                            "`scalar deleting dtor'");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, VecCtorIter,
+                            "`vector ctor iterator'");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, VecDtorIter,
+                            "`vector dtor iterator'");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, VecVbaseCtorIter,
+                            "`vector vbase ctor iterator'");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, VdispMap,
+                            "`virtual displacement map'");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, EHVecCtorIter,
+                            "`eh vector ctor iterator'");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, EHVecDtorIter,
+                            "`eh vector dtor iterator'");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, EHVecVbaseCtorIter,
+                            "`eh vector vbase ctor iterator'");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, CopyCtorClosure,
+                            "`copy ctor closure'");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, LocalVftableCtorClosure,
+                            "`local vftable ctor closure'");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, ArrayNew, "operator new[]");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, ArrayDelete,
+                            "operator delete[]");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, ManVectorCtorIter,
+                            "`managed vector ctor iterator'");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, ManVectorDtorIter,
+                            "`managed vector dtor iterator'");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, EHVectorCopyCtorIter,
+                            "`EH vector copy ctor iterator'");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, EHVectorVbaseCopyCtorIter,
+                            "`EH vector vbase copy ctor iterator'");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, VectorCopyCtorIter,
+                            "`vector copy ctor iterator'");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, VectorVbaseCopyCtorIter,
+                            "`vector vbase copy constructor iterator'");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, ManVectorVbaseCopyCtorIter,
+                            "`managed vector vbase copy constructor iterator'");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, CoAwait,
+                            "operator co_await");
+    OUTPUT_ENUM_CLASS_VALUE(IntrinsicFunctionKind, Spaceship, "operator<=>");
+  case IntrinsicFunctionKind::MaxIntrinsic:
+  case IntrinsicFunctionKind::None:
+    break;
+  }
+  outputTemplateParameters(OS, Flags);
+}
+
+void LocalStaticGuardIdentifierNode::output(OutputStream &OS,
+                                            OutputFlags Flags) const {
+  if (IsThread)
+    OS << "`local static thread guard'";
+  else
+    OS << "`local static guard'";
+  if (ScopeIndex > 0)
+    OS << "{" << ScopeIndex << "}";
+}
+
+void ConversionOperatorIdentifierNode::output(OutputStream &OS,
+                                              OutputFlags Flags) const {
+  OS << "operator";
+  outputTemplateParameters(OS, Flags);
+  OS << " ";
+  TargetType->output(OS, Flags);
+}
+
+void StructorIdentifierNode::output(OutputStream &OS, OutputFlags Flags) const {
+  if (IsDestructor)
+    OS << "~";
+  Class->output(OS, Flags);
+  outputTemplateParameters(OS, Flags);
+}
+
+void LiteralOperatorIdentifierNode::output(OutputStream &OS,
+                                           OutputFlags Flags) const {
+  OS << "operator \"\"" << Name;
+  outputTemplateParameters(OS, Flags);
+}
+
+void FunctionSignatureNode::outputPre(OutputStream &OS,
+                                      OutputFlags Flags) const {
+  if (!(Flags & OF_NoAccessSpecifier)) {
+    if (FunctionClass & FC_Public)
+      OS << "public: ";
+    if (FunctionClass & FC_Protected)
+      OS << "protected: ";
+    if (FunctionClass & FC_Private)
+      OS << "private: ";
+  }
+
+  if (!(Flags & OF_NoMemberType)) {
+    if (!(FunctionClass & FC_Global)) {
+      if (FunctionClass & FC_Static)
+        OS << "static ";
+    }
+    if (FunctionClass & FC_Virtual)
+      OS << "virtual ";
+
+    if (FunctionClass & FC_ExternC)
+      OS << "extern \"C\" ";
+  }
+
+  if (!(Flags & OF_NoReturnType) && ReturnType) {
+    ReturnType->outputPre(OS, Flags);
+    OS << " ";
+  }
+
+  if (!(Flags & OF_NoCallingConvention))
+    outputCallingConvention(OS, CallConvention);
+}
+
+void FunctionSignatureNode::outputPost(OutputStream &OS,
+                                       OutputFlags Flags) const {
+  if (!(FunctionClass & FC_NoParameterList)) {
+    OS << "(";
+    if (Params)
+      Params->output(OS, Flags);
+    else
+      OS << "void";
+
+    if (IsVariadic) {
+      if (OS.back() != '(')
+        OS << ", ";
+      OS << "...";
+    }
+    OS << ")";
+  }
+
+  if (Quals & Q_Const)
+    OS << " const";
+  if (Quals & Q_Volatile)
+    OS << " volatile";
+  if (Quals & Q_Restrict)
+    OS << " __restrict";
+  if (Quals & Q_Unaligned)
+    OS << " __unaligned";
+
+  if (IsNoexcept)
+    OS << " noexcept";
+
+  if (RefQualifier == FunctionRefQualifier::Reference)
+    OS << " &";
+  else if (RefQualifier == FunctionRefQualifier::RValueReference)
+    OS << " &&";
+
+  if (!(Flags & OF_NoReturnType) && ReturnType)
+    ReturnType->outputPost(OS, Flags);
+}
+
+void ThunkSignatureNode::outputPre(OutputStream &OS, OutputFlags Flags) const {
+  OS << "[thunk]: ";
+
+  FunctionSignatureNode::outputPre(OS, Flags);
+}
+
+void ThunkSignatureNode::outputPost(OutputStream &OS, OutputFlags Flags) const {
+  if (FunctionClass & FC_StaticThisAdjust) {
+    OS << "`adjustor{" << ThisAdjust.StaticOffset << "}'";
+  } else if (FunctionClass & FC_VirtualThisAdjust) {
+    if (FunctionClass & FC_VirtualThisAdjustEx) {
+      OS << "`vtordispex{" << ThisAdjust.VBPtrOffset << ", "
+         << ThisAdjust.VBOffsetOffset << ", " << ThisAdjust.VtordispOffset
+         << ", " << ThisAdjust.StaticOffset << "}'";
+    } else {
+      OS << "`vtordisp{" << ThisAdjust.VtordispOffset << ", "
+         << ThisAdjust.StaticOffset << "}'";
+    }
+  }
+
+  FunctionSignatureNode::outputPost(OS, Flags);
+}
+
+void PointerTypeNode::outputPre(OutputStream &OS, OutputFlags Flags) const {
+  if (Pointee->kind() == NodeKind::FunctionSignature) {
+    // If this is a pointer to a function, don't output the calling convention.
+    // It needs to go inside the parentheses.
+    const FunctionSignatureNode *Sig =
+        static_cast<const FunctionSignatureNode *>(Pointee);
+    Sig->outputPre(OS, OF_NoCallingConvention);
+  } else
+    Pointee->outputPre(OS, Flags);
+
+  outputSpaceIfNecessary(OS);
+
+  if (Quals & Q_Unaligned)
+    OS << "__unaligned ";
+
+  if (Pointee->kind() == NodeKind::ArrayType) {
+    OS << "(";
+  } else if (Pointee->kind() == NodeKind::FunctionSignature) {
+    OS << "(";
+    const FunctionSignatureNode *Sig =
+        static_cast<const FunctionSignatureNode *>(Pointee);
+    outputCallingConvention(OS, Sig->CallConvention);
+    OS << " ";
+  }
+
+  if (ClassParent) {
+    ClassParent->output(OS, Flags);
+    OS << "::";
+  }
+
+  switch (Affinity) {
+  case PointerAffinity::Pointer:
+    OS << "*";
+    break;
+  case PointerAffinity::Reference:
+    OS << "&";
+    break;
+  case PointerAffinity::RValueReference:
+    OS << "&&";
+    break;
+  default:
+    assert(false);
+  }
+  outputQualifiers(OS, Quals, false, false);
+}
+
+void PointerTypeNode::outputPost(OutputStream &OS, OutputFlags Flags) const {
+  if (Pointee->kind() == NodeKind::ArrayType ||
+      Pointee->kind() == NodeKind::FunctionSignature)
+    OS << ")";
+
+  Pointee->outputPost(OS, Flags);
+}
+
+void TagTypeNode::outputPre(OutputStream &OS, OutputFlags Flags) const {
+  if (!(Flags & OF_NoTagSpecifier)) {
+    switch (Tag) {
+      OUTPUT_ENUM_CLASS_VALUE(TagKind, Class, "class");
+      OUTPUT_ENUM_CLASS_VALUE(TagKind, Struct, "struct");
+      OUTPUT_ENUM_CLASS_VALUE(TagKind, Union, "union");
+      OUTPUT_ENUM_CLASS_VALUE(TagKind, Enum, "enum");
+    }
+    OS << " ";
+  }
+  QualifiedName->output(OS, Flags);
+  outputQualifiers(OS, Quals, true, false);
+}
+
+void TagTypeNode::outputPost(OutputStream &OS, OutputFlags Flags) const {}
+
+void ArrayTypeNode::outputPre(OutputStream &OS, OutputFlags Flags) const {
+  ElementType->outputPre(OS, Flags);
+  outputQualifiers(OS, Quals, true, false);
+}
+
+void ArrayTypeNode::outputOneDimension(OutputStream &OS, OutputFlags Flags,
+                                       Node *N) const {
+  assert(N->kind() == NodeKind::IntegerLiteral);
+  IntegerLiteralNode *ILN = static_cast<IntegerLiteralNode *>(N);
+  if (ILN->Value != 0)
+    ILN->output(OS, Flags);
+}
+
+void ArrayTypeNode::outputDimensionsImpl(OutputStream &OS,
+                                         OutputFlags Flags) const {
+  if (Dimensions->Count == 0)
+    return;
+
+  outputOneDimension(OS, Flags, Dimensions->Nodes[0]);
+  for (size_t I = 1; I < Dimensions->Count; ++I) {
+    OS << "][";
+    outputOneDimension(OS, Flags, Dimensions->Nodes[I]);
+  }
+}
+
+void ArrayTypeNode::outputPost(OutputStream &OS, OutputFlags Flags) const {
+  OS << "[";
+  outputDimensionsImpl(OS, Flags);
+  OS << "]";
+
+  ElementType->outputPost(OS, Flags);
+}
+
+void SymbolNode::output(OutputStream &OS, OutputFlags Flags) const {
+  Name->output(OS, Flags);
+}
+
+void FunctionSymbolNode::output(OutputStream &OS, OutputFlags Flags) const {
+  Signature->outputPre(OS, Flags);
+  outputSpaceIfNecessary(OS);
+  Name->output(OS, Flags);
+  Signature->outputPost(OS, Flags);
+}
+
+void VariableSymbolNode::output(OutputStream &OS, OutputFlags Flags) const {
+  const char *AccessSpec = nullptr;
+  bool IsStatic = true;
+  switch (SC) {
+  case StorageClass::PrivateStatic:
+    AccessSpec = "private";
+    break;
+  case StorageClass::PublicStatic:
+    AccessSpec = "public";
+    break;
+  case StorageClass::ProtectedStatic:
+    AccessSpec = "protected";
+    break;
+  default:
+    IsStatic = false;
+    break;
+  }
+  if (!(Flags & OF_NoAccessSpecifier) && AccessSpec)
+    OS << AccessSpec << ": ";
+  if (!(Flags & OF_NoMemberType) && IsStatic)
+    OS << "static ";
+
+  if (Type) {
+    Type->outputPre(OS, Flags);
+    outputSpaceIfNecessary(OS);
+  }
+  Name->output(OS, Flags);
+  if (Type)
+    Type->outputPost(OS, Flags);
+}
+
+void CustomTypeNode::outputPre(OutputStream &OS, OutputFlags Flags) const {
+  Identifier->output(OS, Flags);
+}
+void CustomTypeNode::outputPost(OutputStream &OS, OutputFlags Flags) const {}
+
+void QualifiedNameNode::output(OutputStream &OS, OutputFlags Flags) const {
+  Components->output(OS, Flags, "::");
+}
+
+void RttiBaseClassDescriptorNode::output(OutputStream &OS,
+                                         OutputFlags Flags) const {
+  OS << "`RTTI Base Class Descriptor at (";
+  OS << NVOffset << ", " << VBPtrOffset << ", " << VBTableOffset << ", "
+     << this->Flags;
+  OS << ")'";
+}
+
+void LocalStaticGuardVariableNode::output(OutputStream &OS,
+                                          OutputFlags Flags) const {
+  Name->output(OS, Flags);
+}
+
+void VcallThunkIdentifierNode::output(OutputStream &OS,
+                                      OutputFlags Flags) const {
+  OS << "`vcall'{" << OffsetInVTable << ", {flat}}";
+}
+
+void SpecialTableSymbolNode::output(OutputStream &OS, OutputFlags Flags) const {
+  outputQualifiers(OS, Quals, false, true);
+  Name->output(OS, Flags);
+  if (TargetName) {
+    OS << "{for `";
+    TargetName->output(OS, Flags);
+    OS << "'}";
+  }
+  return;
+}

external/llvm/include/llvm/Demangle/Demangle.h

@@ -0,0 +1,124 @@
+//===--- Demangle.h ---------------------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_DEMANGLE_DEMANGLE_H
+#define LLVM_DEMANGLE_DEMANGLE_H
+
+#include <cstddef>
+#include <string>
+
+namespace llvm {
+/// This is a llvm local version of __cxa_demangle. Other than the name and
+/// being in the llvm namespace it is identical.
+///
+/// The mangled_name is demangled into buf and returned. If the buffer is not
+/// large enough, realloc is used to expand it.
+///
+/// The *status will be set to a value from the following enumeration
+enum : int {
+  demangle_unknown_error = -4,
+  demangle_invalid_args = -3,
+  demangle_invalid_mangled_name = -2,
+  demangle_memory_alloc_failure = -1,
+  demangle_success = 0,
+};
+
+char *itaniumDemangle(const char *mangled_name, char *buf, size_t *n,
+                      int *status);
+
+
+enum MSDemangleFlags {
+  MSDF_None = 0,
+  MSDF_DumpBackrefs = 1 << 0,
+  MSDF_NoAccessSpecifier = 1 << 1,
+  MSDF_NoCallingConvention = 1 << 2,
+  MSDF_NoReturnType = 1 << 3,
+  MSDF_NoMemberType = 1 << 4,
+};
+
+/// Demangles the Microsoft symbol pointed at by mangled_name and returns it.
+/// Returns a pointer to the start of a null-terminated demangled string on
+/// success, or nullptr on error.
+/// If n_read is non-null and demangling was successful, it receives how many
+/// bytes of the input string were consumed.
+/// buf can point to a *n_buf bytes large buffer where the demangled name is
+/// stored. If the buffer is too small, it is grown with realloc(). If buf is
+/// nullptr, then this malloc()s memory for the result.
+/// *n_buf stores the size of buf on input if buf is non-nullptr, and it
+/// receives the size of the demangled string on output if n_buf is not nullptr.
+/// status receives one of the demangle_ enum entries above if it's not nullptr.
+/// Flags controls various details of the demangled representation.
+char *microsoftDemangle(const char *mangled_name, size_t *n_read,
+                        char *buf, size_t *n_buf,
+                        int *status, MSDemangleFlags Flags = MSDF_None);
+
+/// Attempt to demangle a string using different demangling schemes.
+/// The function uses heuristics to determine which demangling scheme to use.
+/// \param MangledName - reference to string to demangle.
+/// \returns - the demangled string, or a copy of the input string if no
+/// demangling occurred.
+std::string demangle(const std::string &MangledName);
+
+/// "Partial" demangler. This supports demangling a string into an AST
+/// (typically an intermediate stage in itaniumDemangle) and querying certain
+/// properties or partially printing the demangled name.
+struct ItaniumPartialDemangler {
+  ItaniumPartialDemangler();
+
+  ItaniumPartialDemangler(ItaniumPartialDemangler &&Other);
+  ItaniumPartialDemangler &operator=(ItaniumPartialDemangler &&Other);
+
+  /// Demangle into an AST. Subsequent calls to the rest of the member functions
+  /// implicitly operate on the AST this produces.
+  /// \return true on error, false otherwise
+  bool partialDemangle(const char *MangledName);
+
+  /// Just print the entire mangled name into Buf. Buf and N behave like the
+  /// second and third parameters to itaniumDemangle.
+  char *finishDemangle(char *Buf, size_t *N) const;
+
+  /// Get the base name of a function. This doesn't include trailing template
+  /// arguments, ie for "a::b<int>" this function returns "b".
+  char *getFunctionBaseName(char *Buf, size_t *N) const;
+
+  /// Get the context name for a function. For "a::b::c", this function returns
+  /// "a::b".
+  char *getFunctionDeclContextName(char *Buf, size_t *N) const;
+
+  /// Get the entire name of this function.
+  char *getFunctionName(char *Buf, size_t *N) const;
+
+  /// Get the parameters for this function.
+  char *getFunctionParameters(char *Buf, size_t *N) const;
+  char *getFunctionReturnType(char *Buf, size_t *N) const;
+
+  /// If this function has any any cv or reference qualifiers. These imply that
+  /// the function is a non-static member function.
+  bool hasFunctionQualifiers() const;
+
+  /// If this symbol describes a constructor or destructor.
+  bool isCtorOrDtor() const;
+
+  /// If this symbol describes a function.
+  bool isFunction() const;
+
+  /// If this symbol describes a variable.
+  bool isData() const;
+
+  /// If this symbol is a <special-name>. These are generally implicitly
+  /// generated by the implementation, such as vtables and typeinfo names.
+  bool isSpecialName() const;
+
+  ~ItaniumPartialDemangler();
+private:
+  void *RootNode;
+  void *Context;
+};
+} // namespace llvm
+
+#endif

external/llvm/include/llvm/Demangle/DemangleConfig.h

@@ -0,0 +1,92 @@
+//===--- DemangleConfig.h ---------------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file contains a variety of feature test macros copied from
+// include/llvm/Support/Compiler.h so that LLVMDemangle does not need to take
+// a dependency on LLVMSupport.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_DEMANGLE_COMPILER_H
+#define LLVM_DEMANGLE_COMPILER_H
+
+#ifndef __has_feature
+#define __has_feature(x) 0
+#endif
+
+#ifndef __has_cpp_attribute
+#define __has_cpp_attribute(x) 0
+#endif
+
+#ifndef __has_attribute
+#define __has_attribute(x) 0
+#endif
+
+#ifndef __has_builtin
+#define __has_builtin(x) 0
+#endif
+
+#ifndef DEMANGLE_GNUC_PREREQ
+#if defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__GNUC_PATCHLEVEL__)
+#define DEMANGLE_GNUC_PREREQ(maj, min, patch)                           \
+  ((__GNUC__ << 20) + (__GNUC_MINOR__ << 10) + __GNUC_PATCHLEVEL__ >=          \
+   ((maj) << 20) + ((min) << 10) + (patch))
+#elif defined(__GNUC__) && defined(__GNUC_MINOR__)
+#define DEMANGLE_GNUC_PREREQ(maj, min, patch)                           \
+  ((__GNUC__ << 20) + (__GNUC_MINOR__ << 10) >= ((maj) << 20) + ((min) << 10))
+#else
+#define DEMANGLE_GNUC_PREREQ(maj, min, patch) 0
+#endif
+#endif
+
+#if __has_attribute(used) || DEMANGLE_GNUC_PREREQ(3, 1, 0)
+#define DEMANGLE_ATTRIBUTE_USED __attribute__((__used__))
+#else
+#define DEMANGLE_ATTRIBUTE_USED
+#endif
+
+#if __has_builtin(__builtin_unreachable) || DEMANGLE_GNUC_PREREQ(4, 5, 0)
+#define DEMANGLE_UNREACHABLE __builtin_unreachable()
+#elif defined(_MSC_VER)
+#define DEMANGLE_UNREACHABLE __assume(false)
+#else
+#define DEMANGLE_UNREACHABLE
+#endif
+
+#if __has_attribute(noinline) || DEMANGLE_GNUC_PREREQ(3, 4, 0)
+#define DEMANGLE_ATTRIBUTE_NOINLINE __attribute__((noinline))
+#elif defined(_MSC_VER)
+#define DEMANGLE_ATTRIBUTE_NOINLINE __declspec(noinline)
+#else
+#define DEMANGLE_ATTRIBUTE_NOINLINE
+#endif
+
+#if !defined(NDEBUG)
+#define DEMANGLE_DUMP_METHOD DEMANGLE_ATTRIBUTE_NOINLINE DEMANGLE_ATTRIBUTE_USED
+#else
+#define DEMANGLE_DUMP_METHOD DEMANGLE_ATTRIBUTE_NOINLINE
+#endif
+
+#if __cplusplus > 201402L && __has_cpp_attribute(fallthrough)
+#define DEMANGLE_FALLTHROUGH [[fallthrough]]
+#elif __has_cpp_attribute(gnu::fallthrough)
+#define DEMANGLE_FALLTHROUGH [[gnu::fallthrough]]
+#elif !__cplusplus
+// Workaround for llvm.org/PR23435, since clang 3.6 and below emit a spurious
+// error when __has_cpp_attribute is given a scoped attribute in C mode.
+#define DEMANGLE_FALLTHROUGH
+#elif __has_cpp_attribute(clang::fallthrough)
+#define DEMANGLE_FALLTHROUGH [[clang::fallthrough]]
+#else
+#define DEMANGLE_FALLTHROUGH
+#endif
+
+#define DEMANGLE_NAMESPACE_BEGIN namespace llvm { namespace itanium_demangle {
+#define DEMANGLE_NAMESPACE_END } }
+
+#endif

external/llvm/include/llvm/Demangle/MicrosoftDemangle.h

@@ -0,0 +1,278 @@
+//===------------------------- MicrosoftDemangle.h --------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_DEMANGLE_MICROSOFT_DEMANGLE_H
+#define LLVM_DEMANGLE_MICROSOFT_DEMANGLE_H
+
+#include "llvm/Demangle/DemangleConfig.h"
+#include "llvm/Demangle/MicrosoftDemangleNodes.h"
+#include "llvm/Demangle/StringView.h"
+#include "llvm/Demangle/Utility.h"
+
+#include <utility>
+
+namespace llvm {
+namespace ms_demangle {
+// This memory allocator is extremely fast, but it doesn't call dtors
+// for allocated objects. That means you can't use STL containers
+// (such as std::vector) with this allocator. But it pays off --
+// the demangler is 3x faster with this allocator compared to one with
+// STL containers.
+constexpr size_t AllocUnit = 4096;
+
+class ArenaAllocator {
+  struct AllocatorNode {
+    uint8_t *Buf = nullptr;
+    size_t Used = 0;
+    size_t Capacity = 0;
+    AllocatorNode *Next = nullptr;
+  };
+
+  void addNode(size_t Capacity) {
+    AllocatorNode *NewHead = new AllocatorNode;
+    NewHead->Buf = new uint8_t[Capacity];
+    NewHead->Next = Head;
+    NewHead->Capacity = Capacity;
+    Head = NewHead;
+    NewHead->Used = 0;
+  }
+
+public:
+  ArenaAllocator() { addNode(AllocUnit); }
+
+  ~ArenaAllocator() {
+    while (Head) {
+      assert(Head->Buf);
+      delete[] Head->Buf;
+      AllocatorNode *Next = Head->Next;
+      delete Head;
+      Head = Next;
+    }
+  }
+
+  char *allocUnalignedBuffer(size_t Size) {
+    assert(Head && Head->Buf);
+
+    uint8_t *P = Head->Buf + Head->Used;
+
+    Head->Used += Size;
+    if (Head->Used <= Head->Capacity)
+      return reinterpret_cast<char *>(P);
+
+    addNode(std::max(AllocUnit, Size));
+    Head->Used = Size;
+    return reinterpret_cast<char *>(Head->Buf);
+  }
+
+  template <typename T, typename... Args> T *allocArray(size_t Count) {
+    size_t Size = Count * sizeof(T);
+    assert(Head && Head->Buf);
+
+    size_t P = (size_t)Head->Buf + Head->Used;
+    uintptr_t AlignedP =
+        (((size_t)P + alignof(T) - 1) & ~(size_t)(alignof(T) - 1));
+    uint8_t *PP = (uint8_t *)AlignedP;
+    size_t Adjustment = AlignedP - P;
+
+    Head->Used += Size + Adjustment;
+    if (Head->Used <= Head->Capacity)
+      return new (PP) T[Count]();
+
+    addNode(std::max(AllocUnit, Size));
+    Head->Used = Size;
+    return new (Head->Buf) T[Count]();
+  }
+
+  template <typename T, typename... Args> T *alloc(Args &&... ConstructorArgs) {
+    constexpr size_t Size = sizeof(T);
+    assert(Head && Head->Buf);
+
+    size_t P = (size_t)Head->Buf + Head->Used;
+    uintptr_t AlignedP =
+        (((size_t)P + alignof(T) - 1) & ~(size_t)(alignof(T) - 1));
+    uint8_t *PP = (uint8_t *)AlignedP;
+    size_t Adjustment = AlignedP - P;
+
+    Head->Used += Size + Adjustment;
+    if (Head->Used <= Head->Capacity)
+      return new (PP) T(std::forward<Args>(ConstructorArgs)...);
+
+    static_assert(Size < AllocUnit, "");
+    addNode(AllocUnit);
+    Head->Used = Size;
+    return new (Head->Buf) T(std::forward<Args>(ConstructorArgs)...);
+  }
+
+private:
+  AllocatorNode *Head = nullptr;
+};
+
+struct BackrefContext {
+  static constexpr size_t Max = 10;
+
+  TypeNode *FunctionParams[Max];
+  size_t FunctionParamCount = 0;
+
+  // The first 10 BackReferences in a mangled name can be back-referenced by
+  // special name @[0-9]. This is a storage for the first 10 BackReferences.
+  NamedIdentifierNode *Names[Max];
+  size_t NamesCount = 0;
+};
+
+enum class QualifierMangleMode { Drop, Mangle, Result };
+
+enum NameBackrefBehavior : uint8_t {
+  NBB_None = 0,          // don't save any names as backrefs.
+  NBB_Template = 1 << 0, // save template instanations.
+  NBB_Simple = 1 << 1,   // save simple names.
+};
+
+enum class FunctionIdentifierCodeGroup { Basic, Under, DoubleUnder };
+
+// Demangler class takes the main role in demangling symbols.
+// It has a set of functions to parse mangled symbols into Type instances.
+// It also has a set of functions to convert Type instances to strings.
+class Demangler {
+public:
+  Demangler() = default;
+  virtual ~Demangler() = default;
+
+  // You are supposed to call parse() first and then check if error is true.  If
+  // it is false, call output() to write the formatted name to the given stream.
+  SymbolNode *parse(StringView &MangledName);
+
+  TagTypeNode *parseTagUniqueName(StringView &MangledName);
+
+  // True if an error occurred.
+  bool Error = false;
+
+  void dumpBackReferences();
+
+private:
+  SymbolNode *demangleEncodedSymbol(StringView &MangledName,
+                                    QualifiedNameNode *QN);
+  SymbolNode *demangleDeclarator(StringView &MangledName);
+  SymbolNode *demangleMD5Name(StringView &MangledName);
+  SymbolNode *demangleTypeinfoName(StringView &MangledName);
+
+  VariableSymbolNode *demangleVariableEncoding(StringView &MangledName,
+                                               StorageClass SC);
+  FunctionSymbolNode *demangleFunctionEncoding(StringView &MangledName);
+
+  Qualifiers demanglePointerExtQualifiers(StringView &MangledName);
+
+  // Parser functions. This is a recursive-descent parser.
+  TypeNode *demangleType(StringView &MangledName, QualifierMangleMode QMM);
+  PrimitiveTypeNode *demanglePrimitiveType(StringView &MangledName);
+  CustomTypeNode *demangleCustomType(StringView &MangledName);
+  TagTypeNode *demangleClassType(StringView &MangledName);
+  PointerTypeNode *demanglePointerType(StringView &MangledName);
+  PointerTypeNode *demangleMemberPointerType(StringView &MangledName);
+  FunctionSignatureNode *demangleFunctionType(StringView &MangledName,
+                                              bool HasThisQuals);
+
+  ArrayTypeNode *demangleArrayType(StringView &MangledName);
+
+  NodeArrayNode *demangleFunctionParameterList(StringView &MangledName,
+                                               bool &IsVariadic);
+  NodeArrayNode *demangleTemplateParameterList(StringView &MangledName);
+
+  std::pair<uint64_t, bool> demangleNumber(StringView &MangledName);
+  uint64_t demangleUnsigned(StringView &MangledName);
+  int64_t demangleSigned(StringView &MangledName);
+
+  void memorizeString(StringView s);
+  void memorizeIdentifier(IdentifierNode *Identifier);
+
+  /// Allocate a copy of \p Borrowed into memory that we own.
+  StringView copyString(StringView Borrowed);
+
+  QualifiedNameNode *demangleFullyQualifiedTypeName(StringView &MangledName);
+  QualifiedNameNode *demangleFullyQualifiedSymbolName(StringView &MangledName);
+
+  IdentifierNode *demangleUnqualifiedTypeName(StringView &MangledName,
+                                              bool Memorize);
+  IdentifierNode *demangleUnqualifiedSymbolName(StringView &MangledName,
+                                                NameBackrefBehavior NBB);
+
+  QualifiedNameNode *demangleNameScopeChain(StringView &MangledName,
+                                            IdentifierNode *UnqualifiedName);
+  IdentifierNode *demangleNameScopePiece(StringView &MangledName);
+
+  NamedIdentifierNode *demangleBackRefName(StringView &MangledName);
+  IdentifierNode *demangleTemplateInstantiationName(StringView &MangledName,
+                                                    NameBackrefBehavior NBB);
+  IntrinsicFunctionKind
+  translateIntrinsicFunctionCode(char CH, FunctionIdentifierCodeGroup Group);
+  IdentifierNode *demangleFunctionIdentifierCode(StringView &MangledName);
+  IdentifierNode *
+  demangleFunctionIdentifierCode(StringView &MangledName,
+                                 FunctionIdentifierCodeGroup Group);
+  StructorIdentifierNode *demangleStructorIdentifier(StringView &MangledName,
+                                                     bool IsDestructor);
+  ConversionOperatorIdentifierNode *
+  demangleConversionOperatorIdentifier(StringView &MangledName);
+  LiteralOperatorIdentifierNode *
+  demangleLiteralOperatorIdentifier(StringView &MangledName);
+
+  SymbolNode *demangleSpecialIntrinsic(StringView &MangledName);
+  SpecialTableSymbolNode *
+  demangleSpecialTableSymbolNode(StringView &MangledName,
+                                 SpecialIntrinsicKind SIK);
+  LocalStaticGuardVariableNode *
+  demangleLocalStaticGuard(StringView &MangledName, bool IsThread);
+  VariableSymbolNode *demangleUntypedVariable(ArenaAllocator &Arena,
+                                              StringView &MangledName,
+                                              StringView VariableName);
+  VariableSymbolNode *
+  demangleRttiBaseClassDescriptorNode(ArenaAllocator &Arena,
+                                      StringView &MangledName);
+  FunctionSymbolNode *demangleInitFiniStub(StringView &MangledName,
+                                           bool IsDestructor);
+
+  NamedIdentifierNode *demangleSimpleName(StringView &MangledName,
+                                          bool Memorize);
+  NamedIdentifierNode *demangleAnonymousNamespaceName(StringView &MangledName);
+  NamedIdentifierNode *demangleLocallyScopedNamePiece(StringView &MangledName);
+  EncodedStringLiteralNode *demangleStringLiteral(StringView &MangledName);
+  FunctionSymbolNode *demangleVcallThunkNode(StringView &MangledName);
+
+  StringView demangleSimpleString(StringView &MangledName, bool Memorize);
+
+  FuncClass demangleFunctionClass(StringView &MangledName);
+  CallingConv demangleCallingConvention(StringView &MangledName);
+  StorageClass demangleVariableStorageClass(StringView &MangledName);
+  bool demangleThrowSpecification(StringView &MangledName);
+  wchar_t demangleWcharLiteral(StringView &MangledName);
+  uint8_t demangleCharLiteral(StringView &MangledName);
+
+  std::pair<Qualifiers, bool> demangleQualifiers(StringView &MangledName);
+
+  // Memory allocator.
+  ArenaAllocator Arena;
+
+  // A single type uses one global back-ref table for all function params.
+  // This means back-refs can even go "into" other types.  Examples:
+  //
+  //  // Second int* is a back-ref to first.
+  //  void foo(int *, int*);
+  //
+  //  // Second int* is not a back-ref to first (first is not a function param).
+  //  int* foo(int*);
+  //
+  //  // Second int* is a back-ref to first (ALL function types share the same
+  //  // back-ref map.
+  //  using F = void(*)(int*);
+  //  F G(int *);
+  BackrefContext Backrefs;
+};
+
+} // namespace ms_demangle
+} // namespace llvm
+
+#endif // LLVM_DEMANGLE_MICROSOFT_DEMANGLE_H

external/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h

@@ -0,0 +1,629 @@
+//===- MicrosoftDemangleNodes.h ---------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file defines the AST nodes used in the MSVC demangler.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_SUPPORT_MICROSOFTDEMANGLENODES_H
+#define LLVM_SUPPORT_MICROSOFTDEMANGLENODES_H
+
+#include "llvm/Demangle/DemangleConfig.h"
+#include "llvm/Demangle/StringView.h"
+#include <array>
+#include <cstdint>
+#include <string>
+
+namespace llvm {
+namespace itanium_demangle {
+class OutputStream;
+}
+}
+
+using llvm::itanium_demangle::OutputStream;
+using llvm::itanium_demangle::StringView;
+
+namespace llvm {
+namespace ms_demangle {
+
+// Storage classes
+enum Qualifiers : uint8_t {
+  Q_None = 0,
+  Q_Const = 1 << 0,
+  Q_Volatile = 1 << 1,
+  Q_Far = 1 << 2,
+  Q_Huge = 1 << 3,
+  Q_Unaligned = 1 << 4,
+  Q_Restrict = 1 << 5,
+  Q_Pointer64 = 1 << 6
+};
+
+enum class StorageClass : uint8_t {
+  None,
+  PrivateStatic,
+  ProtectedStatic,
+  PublicStatic,
+  Global,
+  FunctionLocalStatic,
+};
+
+enum class PointerAffinity { None, Pointer, Reference, RValueReference };
+enum class FunctionRefQualifier { None, Reference, RValueReference };
+
+// Calling conventions
+enum class CallingConv : uint8_t {
+  None,
+  Cdecl,
+  Pascal,
+  Thiscall,
+  Stdcall,
+  Fastcall,
+  Clrcall,
+  Eabi,
+  Vectorcall,
+  Regcall,
+};
+
+enum class ReferenceKind : uint8_t { None, LValueRef, RValueRef };
+
+enum OutputFlags {
+  OF_Default = 0,
+  OF_NoCallingConvention = 1,
+  OF_NoTagSpecifier = 2,
+  OF_NoAccessSpecifier = 4,
+  OF_NoMemberType = 8,
+  OF_NoReturnType = 16,
+};
+
+// Types
+enum class PrimitiveKind {
+  Void,
+  Bool,
+  Char,
+  Schar,
+  Uchar,
+  Char8,
+  Char16,
+  Char32,
+  Short,
+  Ushort,
+  Int,
+  Uint,
+  Long,
+  Ulong,
+  Int64,
+  Uint64,
+  Wchar,
+  Float,
+  Double,
+  Ldouble,
+  Nullptr,
+};
+
+enum class CharKind {
+  Char,
+  Char16,
+  Char32,
+  Wchar,
+};
+
+enum class IntrinsicFunctionKind : uint8_t {
+  None,
+  New,                        // ?2 # operator new
+  Delete,                     // ?3 # operator delete
+  Assign,                     // ?4 # operator=
+  RightShift,                 // ?5 # operator>>
+  LeftShift,                  // ?6 # operator<<
+  LogicalNot,                 // ?7 # operator!
+  Equals,                     // ?8 # operator==
+  NotEquals,                  // ?9 # operator!=
+  ArraySubscript,             // ?A # operator[]
+  Pointer,                    // ?C # operator->
+  Dereference,                // ?D # operator*
+  Increment,                  // ?E # operator++
+  Decrement,                  // ?F # operator--
+  Minus,                      // ?G # operator-
+  Plus,                       // ?H # operator+
+  BitwiseAnd,                 // ?I # operator&
+  MemberPointer,              // ?J # operator->*
+  Divide,                     // ?K # operator/
+  Modulus,                    // ?L # operator%
+  LessThan,                   // ?M operator<
+  LessThanEqual,              // ?N operator<=
+  GreaterThan,                // ?O operator>
+  GreaterThanEqual,           // ?P operator>=
+  Comma,                      // ?Q operator,
+  Parens,                     // ?R operator()
+  BitwiseNot,                 // ?S operator~
+  BitwiseXor,                 // ?T operator^
+  BitwiseOr,                  // ?U operator|
+  LogicalAnd,                 // ?V operator&&
+  LogicalOr,                  // ?W operator||
+  TimesEqual,                 // ?X operator*=
+  PlusEqual,                  // ?Y operator+=
+  MinusEqual,                 // ?Z operator-=
+  DivEqual,                   // ?_0 operator/=
+  ModEqual,                   // ?_1 operator%=
+  RshEqual,                   // ?_2 operator>>=
+  LshEqual,                   // ?_3 operator<<=
+  BitwiseAndEqual,            // ?_4 operator&=
+  BitwiseOrEqual,             // ?_5 operator|=
+  BitwiseXorEqual,            // ?_6 operator^=
+  VbaseDtor,                  // ?_D # vbase destructor
+  VecDelDtor,                 // ?_E # vector deleting destructor
+  DefaultCtorClosure,         // ?_F # default constructor closure
+  ScalarDelDtor,              // ?_G # scalar deleting destructor
+  VecCtorIter,                // ?_H # vector constructor iterator
+  VecDtorIter,                // ?_I # vector destructor iterator
+  VecVbaseCtorIter,           // ?_J # vector vbase constructor iterator
+  VdispMap,                   // ?_K # virtual displacement map
+  EHVecCtorIter,              // ?_L # eh vector constructor iterator
+  EHVecDtorIter,              // ?_M # eh vector destructor iterator
+  EHVecVbaseCtorIter,         // ?_N # eh vector vbase constructor iterator
+  CopyCtorClosure,            // ?_O # copy constructor closure
+  LocalVftableCtorClosure,    // ?_T # local vftable constructor closure
+  ArrayNew,                   // ?_U operator new[]
+  ArrayDelete,                // ?_V operator delete[]
+  ManVectorCtorIter,          // ?__A managed vector ctor iterator
+  ManVectorDtorIter,          // ?__B managed vector dtor iterator
+  EHVectorCopyCtorIter,       // ?__C EH vector copy ctor iterator
+  EHVectorVbaseCopyCtorIter,  // ?__D EH vector vbase copy ctor iterator
+  VectorCopyCtorIter,         // ?__G vector copy constructor iterator
+  VectorVbaseCopyCtorIter,    // ?__H vector vbase copy constructor iterator
+  ManVectorVbaseCopyCtorIter, // ?__I managed vector vbase copy constructor
+  CoAwait,                    // ?__L operator co_await
+  Spaceship,                  // ?__M operator<=>
+  MaxIntrinsic
+};
+
+enum class SpecialIntrinsicKind {
+  None,
+  Vftable,
+  Vbtable,
+  Typeof,
+  VcallThunk,
+  LocalStaticGuard,
+  StringLiteralSymbol,
+  UdtReturning,
+  Unknown,
+  DynamicInitializer,
+  DynamicAtexitDestructor,
+  RttiTypeDescriptor,
+  RttiBaseClassDescriptor,
+  RttiBaseClassArray,
+  RttiClassHierarchyDescriptor,
+  RttiCompleteObjLocator,
+  LocalVftable,
+  LocalStaticThreadGuard,
+};
+
+// Function classes
+enum FuncClass : uint16_t {
+  FC_None = 0,
+  FC_Public = 1 << 0,
+  FC_Protected = 1 << 1,
+  FC_Private = 1 << 2,
+  FC_Global = 1 << 3,
+  FC_Static = 1 << 4,
+  FC_Virtual = 1 << 5,
+  FC_Far = 1 << 6,
+  FC_ExternC = 1 << 7,
+  FC_NoParameterList = 1 << 8,
+  FC_VirtualThisAdjust = 1 << 9,
+  FC_VirtualThisAdjustEx = 1 << 10,
+  FC_StaticThisAdjust = 1 << 11,
+};
+
+enum class TagKind { Class, Struct, Union, Enum };
+
+enum class NodeKind {
+  Unknown,
+  Md5Symbol,
+  PrimitiveType,
+  FunctionSignature,
+  Identifier,
+  NamedIdentifier,
+  VcallThunkIdentifier,
+  LocalStaticGuardIdentifier,
+  IntrinsicFunctionIdentifier,
+  ConversionOperatorIdentifier,
+  DynamicStructorIdentifier,
+  StructorIdentifier,
+  LiteralOperatorIdentifier,
+  ThunkSignature,
+  PointerType,
+  TagType,
+  ArrayType,
+  Custom,
+  IntrinsicType,
+  NodeArray,
+  QualifiedName,
+  TemplateParameterReference,
+  EncodedStringLiteral,
+  IntegerLiteral,
+  RttiBaseClassDescriptor,
+  LocalStaticGuardVariable,
+  FunctionSymbol,
+  VariableSymbol,
+  SpecialTableSymbol
+};
+
+struct Node {
+  explicit Node(NodeKind K) : Kind(K) {}
+  virtual ~Node() = default;
+
+  NodeKind kind() const { return Kind; }
+
+  virtual void output(OutputStream &OS, OutputFlags Flags) const = 0;
+
+  std::string toString(OutputFlags Flags = OF_Default) const;
+
+private:
+  NodeKind Kind;
+};
+
+struct TypeNode;
+struct PrimitiveTypeNode;
+struct FunctionSignatureNode;
+struct IdentifierNode;
+struct NamedIdentifierNode;
+struct VcallThunkIdentifierNode;
+struct IntrinsicFunctionIdentifierNode;
+struct LiteralOperatorIdentifierNode;
+struct ConversionOperatorIdentifierNode;
+struct StructorIdentifierNode;
+struct ThunkSignatureNode;
+struct PointerTypeNode;
+struct ArrayTypeNode;
+struct CustomNode;
+struct TagTypeNode;
+struct IntrinsicTypeNode;
+struct NodeArrayNode;
+struct QualifiedNameNode;
+struct TemplateParameterReferenceNode;
+struct EncodedStringLiteralNode;
+struct IntegerLiteralNode;
+struct RttiBaseClassDescriptorNode;
+struct LocalStaticGuardVariableNode;
+struct SymbolNode;
+struct FunctionSymbolNode;
+struct VariableSymbolNode;
+struct SpecialTableSymbolNode;
+
+struct TypeNode : public Node {
+  explicit TypeNode(NodeKind K) : Node(K) {}
+
+  virtual void outputPre(OutputStream &OS, OutputFlags Flags) const = 0;
+  virtual void outputPost(OutputStream &OS, OutputFlags Flags) const = 0;
+
+  void output(OutputStream &OS, OutputFlags Flags) const override {
+    outputPre(OS, Flags);
+    outputPost(OS, Flags);
+  }
+
+  Qualifiers Quals = Q_None;
+};
+
+struct PrimitiveTypeNode : public TypeNode {
+  explicit PrimitiveTypeNode(PrimitiveKind K)
+      : TypeNode(NodeKind::PrimitiveType), PrimKind(K) {}
+
+  void outputPre(OutputStream &OS, OutputFlags Flags) const override;
+  void outputPost(OutputStream &OS, OutputFlags Flags) const override {}
+
+  PrimitiveKind PrimKind;
+};
+
+struct FunctionSignatureNode : public TypeNode {
+  explicit FunctionSignatureNode(NodeKind K) : TypeNode(K) {}
+  FunctionSignatureNode() : TypeNode(NodeKind::FunctionSignature) {}
+
+  void outputPre(OutputStream &OS, OutputFlags Flags) const override;
+  void outputPost(OutputStream &OS, OutputFlags Flags) const override;
+
+  // Valid if this FunctionTypeNode is the Pointee of a PointerType or
+  // MemberPointerType.
+  PointerAffinity Affinity = PointerAffinity::None;
+
+  // The function's calling convention.
+  CallingConv CallConvention = CallingConv::None;
+
+  // Function flags (gloabl, public, etc)
+  FuncClass FunctionClass = FC_Global;
+
+  FunctionRefQualifier RefQualifier = FunctionRefQualifier::None;
+
+  // The return type of the function.
+  TypeNode *ReturnType = nullptr;
+
+  // True if this is a C-style ... varargs function.
+  bool IsVariadic = false;
+
+  // Function parameters
+  NodeArrayNode *Params = nullptr;
+
+  // True if the function type is noexcept.
+  bool IsNoexcept = false;
+};
+
+struct IdentifierNode : public Node {
+  explicit IdentifierNode(NodeKind K) : Node(K) {}
+
+  NodeArrayNode *TemplateParams = nullptr;
+
+protected:
+  void outputTemplateParameters(OutputStream &OS, OutputFlags Flags) const;
+};
+
+struct VcallThunkIdentifierNode : public IdentifierNode {
+  VcallThunkIdentifierNode() : IdentifierNode(NodeKind::VcallThunkIdentifier) {}
+
+  void output(OutputStream &OS, OutputFlags Flags) const override;
+
+  uint64_t OffsetInVTable = 0;
+};
+
+struct DynamicStructorIdentifierNode : public IdentifierNode {
+  DynamicStructorIdentifierNode()
+      : IdentifierNode(NodeKind::DynamicStructorIdentifier) {}
+
+  void output(OutputStream &OS, OutputFlags Flags) const override;
+
+  VariableSymbolNode *Variable = nullptr;
+  QualifiedNameNode *Name = nullptr;
+  bool IsDestructor = false;
+};
+
+struct NamedIdentifierNode : public IdentifierNode {
+  NamedIdentifierNode() : IdentifierNode(NodeKind::NamedIdentifier) {}
+
+  void output(OutputStream &OS, OutputFlags Flags) const override;
+
+  StringView Name;
+};
+
+struct IntrinsicFunctionIdentifierNode : public IdentifierNode {
+  explicit IntrinsicFunctionIdentifierNode(IntrinsicFunctionKind Operator)
+      : IdentifierNode(NodeKind::IntrinsicFunctionIdentifier),
+        Operator(Operator) {}
+
+  void output(OutputStream &OS, OutputFlags Flags) const override;
+
+  IntrinsicFunctionKind Operator;
+};
+
+struct LiteralOperatorIdentifierNode : public IdentifierNode {
+  LiteralOperatorIdentifierNode()
+      : IdentifierNode(NodeKind::LiteralOperatorIdentifier) {}
+
+  void output(OutputStream &OS, OutputFlags Flags) const override;
+
+  StringView Name;
+};
+
+struct LocalStaticGuardIdentifierNode : public IdentifierNode {
+  LocalStaticGuardIdentifierNode()
+      : IdentifierNode(NodeKind::LocalStaticGuardIdentifier) {}
+
+  void output(OutputStream &OS, OutputFlags Flags) const override;
+
+  bool IsThread = false;
+  uint32_t ScopeIndex = 0;
+};
+
+struct ConversionOperatorIdentifierNode : public IdentifierNode {
+  ConversionOperatorIdentifierNode()
+      : IdentifierNode(NodeKind::ConversionOperatorIdentifier) {}
+
+  void output(OutputStream &OS, OutputFlags Flags) const override;
+
+  // The type that this operator converts too.
+  TypeNode *TargetType = nullptr;
+};
+
+struct StructorIdentifierNode : public IdentifierNode {
+  StructorIdentifierNode() : IdentifierNode(NodeKind::StructorIdentifier) {}
+  explicit StructorIdentifierNode(bool IsDestructor)
+      : IdentifierNode(NodeKind::StructorIdentifier),
+        IsDestructor(IsDestructor) {}
+
+  void output(OutputStream &OS, OutputFlags Flags) const override;
+
+  // The name of the class that this is a structor of.
+  IdentifierNode *Class = nullptr;
+  bool IsDestructor = false;
+};
+
+struct ThunkSignatureNode : public FunctionSignatureNode {
+  ThunkSignatureNode() : FunctionSignatureNode(NodeKind::ThunkSignature) {}
+
+  void outputPre(OutputStream &OS, OutputFlags Flags) const override;
+  void outputPost(OutputStream &OS, OutputFlags Flags) const override;
+
+  struct ThisAdjustor {
+    uint32_t StaticOffset = 0;
+    int32_t VBPtrOffset = 0;
+    int32_t VBOffsetOffset = 0;
+    int32_t VtordispOffset = 0;
+  };
+
+  ThisAdjustor ThisAdjust;
+};
+
+struct PointerTypeNode : public TypeNode {
+  PointerTypeNode() : TypeNode(NodeKind::PointerType) {}
+  void outputPre(OutputStream &OS, OutputFlags Flags) const override;
+  void outputPost(OutputStream &OS, OutputFlags Flags) const override;
+
+  // Is this a pointer, reference, or rvalue-reference?
+  PointerAffinity Affinity = PointerAffinity::None;
+
+  // If this is a member pointer, this is the class that the member is in.
+  QualifiedNameNode *ClassParent = nullptr;
+
+  // Represents a type X in "a pointer to X", "a reference to X", or
+  // "rvalue-reference to X"
+  TypeNode *Pointee = nullptr;
+};
+
+struct TagTypeNode : public TypeNode {
+  explicit TagTypeNode(TagKind Tag) : TypeNode(NodeKind::TagType), Tag(Tag) {}
+
+  void outputPre(OutputStream &OS, OutputFlags Flags) const override;
+  void outputPost(OutputStream &OS, OutputFlags Flags) const override;
+
+  QualifiedNameNode *QualifiedName = nullptr;
+  TagKind Tag;
+};
+
+struct ArrayTypeNode : public TypeNode {
+  ArrayTypeNode() : TypeNode(NodeKind::ArrayType) {}
+
+  void outputPre(OutputStream &OS, OutputFlags Flags) const override;
+  void outputPost(OutputStream &OS, OutputFlags Flags) const override;
+
+  void outputDimensionsImpl(OutputStream &OS, OutputFlags Flags) const;
+  void outputOneDimension(OutputStream &OS, OutputFlags Flags, Node *N) const;
+
+  // A list of array dimensions.  e.g. [3,4,5] in `int Foo[3][4][5]`
+  NodeArrayNode *Dimensions = nullptr;
+
+  // The type of array element.
+  TypeNode *ElementType = nullptr;
+};
+
+struct IntrinsicNode : public TypeNode {
+  IntrinsicNode() : TypeNode(NodeKind::IntrinsicType) {}
+  void output(OutputStream &OS, OutputFlags Flags) const override {}
+};
+
+struct CustomTypeNode : public TypeNode {
+  CustomTypeNode() : TypeNode(NodeKind::Custom) {}
+
+  void outputPre(OutputStream &OS, OutputFlags Flags) const override;
+  void outputPost(OutputStream &OS, OutputFlags Flags) const override;
+
+  IdentifierNode *Identifier = nullptr;
+};
+
+struct NodeArrayNode : public Node {
+  NodeArrayNode() : Node(NodeKind::NodeArray) {}
+
+  void output(OutputStream &OS, OutputFlags Flags) const override;
+
+  void output(OutputStream &OS, OutputFlags Flags, StringView Separator) const;
+
+  Node **Nodes = nullptr;
+  size_t Count = 0;
+};
+
+struct QualifiedNameNode : public Node {
+  QualifiedNameNode() : Node(NodeKind::QualifiedName) {}
+
+  void output(OutputStream &OS, OutputFlags Flags) const override;
+
+  NodeArrayNode *Components = nullptr;
+
+  IdentifierNode *getUnqualifiedIdentifier() {
+    Node *LastComponent = Components->Nodes[Components->Count - 1];
+    return static_cast<IdentifierNode *>(LastComponent);
+  }
+};
+
+struct TemplateParameterReferenceNode : public Node {
+  TemplateParameterReferenceNode()
+      : Node(NodeKind::TemplateParameterReference) {}
+
+  void output(OutputStream &OS, OutputFlags Flags) const override;
+
+  SymbolNode *Symbol = nullptr;
+
+  int ThunkOffsetCount = 0;
+  std::array<int64_t, 3> ThunkOffsets;
+  PointerAffinity Affinity = PointerAffinity::None;
+  bool IsMemberPointer = false;
+};
+
+struct IntegerLiteralNode : public Node {
+  IntegerLiteralNode() : Node(NodeKind::IntegerLiteral) {}
+  IntegerLiteralNode(uint64_t Value, bool IsNegative)
+      : Node(NodeKind::IntegerLiteral), Value(Value), IsNegative(IsNegative) {}
+
+  void output(OutputStream &OS, OutputFlags Flags) const override;
+
+  uint64_t Value = 0;
+  bool IsNegative = false;
+};
+
+struct RttiBaseClassDescriptorNode : public IdentifierNode {
+  RttiBaseClassDescriptorNode()
+      : IdentifierNode(NodeKind::RttiBaseClassDescriptor) {}
+
+  void output(OutputStream &OS, OutputFlags Flags) const override;
+
+  uint32_t NVOffset = 0;
+  int32_t VBPtrOffset = 0;
+  uint32_t VBTableOffset = 0;
+  uint32_t Flags = 0;
+};
+
+struct SymbolNode : public Node {
+  explicit SymbolNode(NodeKind K) : Node(K) {}
+  void output(OutputStream &OS, OutputFlags Flags) const override;
+  QualifiedNameNode *Name = nullptr;
+};
+
+struct SpecialTableSymbolNode : public SymbolNode {
+  explicit SpecialTableSymbolNode()
+      : SymbolNode(NodeKind::SpecialTableSymbol) {}
+
+  void output(OutputStream &OS, OutputFlags Flags) const override;
+  QualifiedNameNode *TargetName = nullptr;
+  Qualifiers Quals = Qualifiers::Q_None;
+};
+
+struct LocalStaticGuardVariableNode : public SymbolNode {
+  LocalStaticGuardVariableNode()
+      : SymbolNode(NodeKind::LocalStaticGuardVariable) {}
+
+  void output(OutputStream &OS, OutputFlags Flags) const override;
+
+  bool IsVisible = false;
+};
+
+struct EncodedStringLiteralNode : public SymbolNode {
+  EncodedStringLiteralNode() : SymbolNode(NodeKind::EncodedStringLiteral) {}
+
+  void output(OutputStream &OS, OutputFlags Flags) const override;
+
+  StringView DecodedString;
+  bool IsTruncated = false;
+  CharKind Char = CharKind::Char;
+};
+
+struct VariableSymbolNode : public SymbolNode {
+  VariableSymbolNode() : SymbolNode(NodeKind::VariableSymbol) {}
+
+  void output(OutputStream &OS, OutputFlags Flags) const override;
+
+  StorageClass SC = StorageClass::None;
+  TypeNode *Type = nullptr;
+};
+
+struct FunctionSymbolNode : public SymbolNode {
+  FunctionSymbolNode() : SymbolNode(NodeKind::FunctionSymbol) {}
+
+  void output(OutputStream &OS, OutputFlags Flags) const override;
+
+  FunctionSignatureNode *Signature = nullptr;
+};
+
+} // namespace ms_demangle
+} // namespace llvm
+
+#endif

external/llvm/include/llvm/Demangle/StringView.h

@@ -0,0 +1,126 @@
+//===--- StringView.h -------------------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// FIXME: Use std::string_view instead when we support C++17.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef DEMANGLE_STRINGVIEW_H
+#define DEMANGLE_STRINGVIEW_H
+
+#include "DemangleConfig.h"
+#include <algorithm>
+#include <cassert>
+#include <cstring>
+
+DEMANGLE_NAMESPACE_BEGIN
+
+class StringView {
+  const char *First;
+  const char *Last;
+
+public:
+  static const size_t npos = ~size_t(0);
+
+  template <size_t N>
+  StringView(const char (&Str)[N]) : First(Str), Last(Str + N - 1) {}
+  StringView(const char *First_, const char *Last_)
+      : First(First_), Last(Last_) {}
+  StringView(const char *First_, size_t Len)
+      : First(First_), Last(First_ + Len) {}
+  StringView(const char *Str) : First(Str), Last(Str + std::strlen(Str)) {}
+  StringView() : First(nullptr), Last(nullptr) {}
+
+  StringView substr(size_t From) const {
+    return StringView(begin() + From, size() - From);
+  }
+
+  size_t find(char C, size_t From = 0) const {
+    size_t FindBegin = std::min(From, size());
+    // Avoid calling memchr with nullptr.
+    if (FindBegin < size()) {
+      // Just forward to memchr, which is faster than a hand-rolled loop.
+      if (const void *P = ::memchr(First + FindBegin, C, size() - FindBegin))
+        return size_t(static_cast<const char *>(P) - First);
+    }
+    return npos;
+  }
+
+  StringView substr(size_t From, size_t To) const {
+    if (To >= size())
+      To = size() - 1;
+    if (From >= size())
+      From = size() - 1;
+    return StringView(First + From, First + To);
+  }
+
+  StringView dropFront(size_t N = 1) const {
+    if (N >= size())
+      N = size();
+    return StringView(First + N, Last);
+  }
+
+  StringView dropBack(size_t N = 1) const {
+    if (N >= size())
+      N = size();
+    return StringView(First, Last - N);
+  }
+
+  char front() const {
+    assert(!empty());
+    return *begin();
+  }
+
+  char back() const {
+    assert(!empty());
+    return *(end() - 1);
+  }
+
+  char popFront() {
+    assert(!empty());
+    return *First++;
+  }
+
+  bool consumeFront(char C) {
+    if (!startsWith(C))
+      return false;
+    *this = dropFront(1);
+    return true;
+  }
+
+  bool consumeFront(StringView S) {
+    if (!startsWith(S))
+      return false;
+    *this = dropFront(S.size());
+    return true;
+  }
+
+  bool startsWith(char C) const { return !empty() && *begin() == C; }
+
+  bool startsWith(StringView Str) const {
+    if (Str.size() > size())
+      return false;
+    return std::equal(Str.begin(), Str.end(), begin());
+  }
+
+  const char &operator[](size_t Idx) const { return *(begin() + Idx); }
+
+  const char *begin() const { return First; }
+  const char *end() const { return Last; }
+  size_t size() const { return static_cast<size_t>(Last - First); }
+  bool empty() const { return First == Last; }
+};
+
+inline bool operator==(const StringView &LHS, const StringView &RHS) {
+  return LHS.size() == RHS.size() &&
+         std::equal(LHS.begin(), LHS.end(), RHS.begin());
+}
+
+DEMANGLE_NAMESPACE_END
+
+#endif

external/llvm/include/llvm/Demangle/Utility.h

@@ -0,0 +1,191 @@
+//===--- Utility.h ----------------------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// Provide some utility classes for use in the demangler(s).
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef DEMANGLE_UTILITY_H
+#define DEMANGLE_UTILITY_H
+
+#include "StringView.h"
+#include <cstdint>
+#include <cstdlib>
+#include <cstring>
+#include <iterator>
+#include <limits>
+
+DEMANGLE_NAMESPACE_BEGIN
+
+// Stream that AST nodes write their string representation into after the AST
+// has been parsed.
+class OutputStream {
+  char *Buffer = nullptr;
+  size_t CurrentPosition = 0;
+  size_t BufferCapacity = 0;
+
+  // Ensure there is at least n more positions in buffer.
+  void grow(size_t N) {
+    if (N + CurrentPosition >= BufferCapacity) {
+      BufferCapacity *= 2;
+      if (BufferCapacity < N + CurrentPosition)
+        BufferCapacity = N + CurrentPosition;
+      Buffer = static_cast<char *>(std::realloc(Buffer, BufferCapacity));
+      if (Buffer == nullptr)
+        std::terminate();
+    }
+  }
+
+  void writeUnsigned(uint64_t N, bool isNeg = false) {
+    // Handle special case...
+    if (N == 0) {
+      *this << '0';
+      return;
+    }
+
+    char Temp[21];
+    char *TempPtr = std::end(Temp);
+
+    while (N) {
+      *--TempPtr = '0' + char(N % 10);
+      N /= 10;
+    }
+
+    // Add negative sign...
+    if (isNeg)
+      *--TempPtr = '-';
+    this->operator<<(StringView(TempPtr, std::end(Temp)));
+  }
+
+public:
+  OutputStream(char *StartBuf, size_t Size)
+      : Buffer(StartBuf), CurrentPosition(0), BufferCapacity(Size) {}
+  OutputStream() = default;
+  void reset(char *Buffer_, size_t BufferCapacity_) {
+    CurrentPosition = 0;
+    Buffer = Buffer_;
+    BufferCapacity = BufferCapacity_;
+  }
+
+  /// If a ParameterPackExpansion (or similar type) is encountered, the offset
+  /// into the pack that we're currently printing.
+  unsigned CurrentPackIndex = std::numeric_limits<unsigned>::max();
+  unsigned CurrentPackMax = std::numeric_limits<unsigned>::max();
+
+  OutputStream &operator+=(StringView R) {
+    size_t Size = R.size();
+    if (Size == 0)
+      return *this;
+    grow(Size);
+    std::memmove(Buffer + CurrentPosition, R.begin(), Size);
+    CurrentPosition += Size;
+    return *this;
+  }
+
+  OutputStream &operator+=(char C) {
+    grow(1);
+    Buffer[CurrentPosition++] = C;
+    return *this;
+  }
+
+  OutputStream &operator<<(StringView R) { return (*this += R); }
+
+  OutputStream &operator<<(char C) { return (*this += C); }
+
+  OutputStream &operator<<(long long N) {
+    if (N < 0)
+      writeUnsigned(static_cast<unsigned long long>(-N), true);
+    else
+      writeUnsigned(static_cast<unsigned long long>(N));
+    return *this;
+  }
+
+  OutputStream &operator<<(unsigned long long N) {
+    writeUnsigned(N, false);
+    return *this;
+  }
+
+  OutputStream &operator<<(long N) {
+    return this->operator<<(static_cast<long long>(N));
+  }
+
+  OutputStream &operator<<(unsigned long N) {
+    return this->operator<<(static_cast<unsigned long long>(N));
+  }
+
+  OutputStream &operator<<(int N) {
+    return this->operator<<(static_cast<long long>(N));
+  }
+
+  OutputStream &operator<<(unsigned int N) {
+    return this->operator<<(static_cast<unsigned long long>(N));
+  }
+
+  size_t getCurrentPosition() const { return CurrentPosition; }
+  void setCurrentPosition(size_t NewPos) { CurrentPosition = NewPos; }
+
+  char back() const {
+    return CurrentPosition ? Buffer[CurrentPosition - 1] : '\0';
+  }
+
+  bool empty() const { return CurrentPosition == 0; }
+
+  char *getBuffer() { return Buffer; }
+  char *getBufferEnd() { return Buffer + CurrentPosition - 1; }
+  size_t getBufferCapacity() const { return BufferCapacity; }
+};
+
+template <class T> class SwapAndRestore {
+  T &Restore;
+  T OriginalValue;
+  bool ShouldRestore = true;
+
+public:
+  SwapAndRestore(T &Restore_) : SwapAndRestore(Restore_, Restore_) {}
+
+  SwapAndRestore(T &Restore_, T NewVal)
+      : Restore(Restore_), OriginalValue(Restore) {
+    Restore = std::move(NewVal);
+  }
+  ~SwapAndRestore() {
+    if (ShouldRestore)
+      Restore = std::move(OriginalValue);
+  }
+
+  void shouldRestore(bool ShouldRestore_) { ShouldRestore = ShouldRestore_; }
+
+  void restoreNow(bool Force) {
+    if (!Force && !ShouldRestore)
+      return;
+
+    Restore = std::move(OriginalValue);
+    ShouldRestore = false;
+  }
+
+  SwapAndRestore(const SwapAndRestore &) = delete;
+  SwapAndRestore &operator=(const SwapAndRestore &) = delete;
+};
+
+inline bool initializeOutputStream(char *Buf, size_t *N, OutputStream &S,
+                                   size_t InitSize) {
+  size_t BufferSize;
+  if (Buf == nullptr) {
+    Buf = static_cast<char *>(std::malloc(InitSize));
+    if (Buf == nullptr)
+      return false;
+    BufferSize = InitSize;
+  } else
+    BufferSize = *N;
+
+  S.reset(Buf, BufferSize);
+  return true;
+}
+
+DEMANGLE_NAMESPACE_END
+
+#endif

include/helpers/event.hpp

@@ -1,58 +0,0 @@
-#pragma once
-
-#include <vector>
-#include <functional>
-
-namespace hex {
-
-    enum class Events {
-        FileLoaded,
-        DataChanged,
-        PatternChanged,
-        FileDropped,
-        WindowClosing,
-        RegionSelected,
-
-        SelectionChangeRequest,
-
-        AddBookmark,
-        AppendPatternLanguageCode,
-
-        ProjectFileStore,
-        ProjectFileLoad
-    };
-
-    struct EventHandler {
-        void *sender;
-        Events eventType;
-        std::function<void(const void*)> callback;
-    };
-
-    class EventManager {
-    public:
-
-        void post(Events eventType, const void *userData) {
-            for (auto &handler : this->m_eventHandlers)
-                if (eventType == handler.eventType)
-                    handler.callback(userData);
-        }
-
-        void subscribe(Events eventType, void *sender, std::function<void(const void*)> callback) {
-            for (auto &handler : this->m_eventHandlers)
-                if (eventType == handler.eventType && sender == handler.sender)
-                    return;
-
-            this->m_eventHandlers.push_back(EventHandler { sender, eventType, callback });
-        }
-
-        void unsubscribe(Events eventType, void *sender) {
-            std::erase_if(this->m_eventHandlers, [&eventType, &sender](EventHandler handler) {
-                return eventType == handler.eventType && sender == handler.sender;
-            });
-        }
-
-    private:
-        std::vector<EventHandler> m_eventHandlers;
-    };
-
-}

include/helpers/plugin_handler.hpp

@@ -0,0 +1,51 @@
+#pragma once
+
+#include <hex.hpp>
+
+#include "views/view.hpp"
+#include "providers/provider.hpp"
+
+#include <string_view>
+
+namespace hex {
+
+    class Plugin {
+    public:
+        Plugin(std::string_view path);
+        ~Plugin();
+
+        void initializePlugin(SharedData &sharedData) const;
+        View* createView() const;
+        void drawToolsEntry() const;
+
+    private:
+        using InitializePluginFunc = void(*)(SharedData &sharedData);
+        using CreateViewFunc = View*(*)();
+        using DrawToolsEntryFunc = void(*)();
+
+        void *m_handle = nullptr;
+
+        InitializePluginFunc m_initializePluginFunction = nullptr;
+        CreateViewFunc m_createViewFunction = nullptr;
+        DrawToolsEntryFunc m_drawToolsEntryFunction = nullptr;
+
+    };
+
+    class PluginHandler {
+    public:
+        PluginHandler() = delete;
+
+        static void load(std::string_view pluginFolder);
+        static void unload();
+        static void reload();
+
+        static const auto& getPlugins() {
+            return PluginHandler::s_plugins;
+        }
+
+    private:
+        static inline std::string s_pluginFolder;
+        static inline std::vector<Plugin> s_plugins;
+    };
+
+}

include/helpers/project_file_handler.hpp

@@ -5,7 +5,7 @@
 #include <string_view>
 
 #include "patches.hpp"
-#include "utils.hpp"
+#include "helpers/utils.hpp"
 
 namespace hex {
 

include/helpers/utils.hpp

@@ -1,128 +0,0 @@
-#pragma once
-
-#include <hex.hpp>
-
-#include <array>
-#include <functional>
-#include <memory>
-#include <optional>
-#include <string>
-#include <vector>
-
-#ifdef __MINGW32__
-#include <winsock.h>
-
-#else
-#include <arpa/inet.h>
-#endif
-
-#include "lang/token.hpp"
-
-namespace hex {
-
-    template<typename ... Args>
-    inline std::string format(const std::string &format, Args ... args) {
-        ssize_t size = snprintf( nullptr, 0, format.c_str(), args ... );
-
-        if( size <= 0 )
-            return "";
-
-        std::vector<char> buffer(size + 1, 0x00);
-        snprintf(buffer.data(), size + 1, format.c_str(), args ...);
-
-        return std::string(buffer.data(), buffer.data() + size);
-    }
-
-    [[nodiscard]] constexpr inline u64 extract(u8 from, u8 to, const u64 &value) {
-        u64 mask = (std::numeric_limits<u64>::max() >> (63 - (from - to))) << to;
-        return (value & mask) >> to;
-    }
-
-    [[nodiscard]] constexpr inline u64 signExtend(u64 value, u8 currWidth, u8 targetWidth) {
-        u64 mask = 1LLU << (currWidth - 1);
-        return (((value ^ mask) - mask) << (64 - targetWidth)) >> (64 - targetWidth);
-    }
-
-    [[nodiscard]] constexpr inline bool isUnsigned(const lang::Token::TypeToken::Type type) {
-        return (static_cast<u32>(type) & 0x0F) == 0x00;
-    }
-
-    [[nodiscard]] constexpr inline bool isSigned(const lang::Token::TypeToken::Type type) {
-        return (static_cast<u32>(type) & 0x0F) == 0x01;
-    }
-
-    [[nodiscard]] constexpr inline bool isFloatingPoint(const lang::Token::TypeToken::Type type) {
-        return (static_cast<u32>(type) & 0x0F) == 0x02;
-    }
-
-    [[nodiscard]] constexpr inline u32 getTypeSize(const lang::Token::TypeToken::Type type) {
-        return static_cast<u32>(type) >> 4;
-    }
-
-    std::string toByteString(u64 bytes);
-    std::string makePrintable(char c);
-
-    template<typename T>
-    struct always_false : std::false_type {};
-
-    template<typename T>
-    constexpr T changeEndianess(T value, std::endian endian) {
-        if (endian == std::endian::native)
-            return value;
-
-        if constexpr (sizeof(T) == 1)
-            return value;
-        else if constexpr (sizeof(T) == 2)
-            return __builtin_bswap16(value);
-        else if constexpr (sizeof(T) == 4)
-            return __builtin_bswap32(value);
-        else if constexpr (sizeof(T) == 8)
-            return __builtin_bswap64(value);
-        else
-            static_assert(always_false<T>::value, "Invalid type provided!");
-    }
-
-    template<typename T>
-    constexpr T changeEndianess(T value, size_t size, std::endian endian) {
-        if (endian == std::endian::native)
-            return value;
-
-        if (size == 1)
-            return value;
-        else if (size == 2)
-            return __builtin_bswap16(value);
-        else if (size == 4)
-            return __builtin_bswap32(value);
-        else if (size == 8)
-            return __builtin_bswap64(value);
-        else
-            throw std::invalid_argument("Invalid value size!");
-    }
-
-    std::vector<u8> readFile(std::string_view path);
-
-    class ScopeExit {
-    public:
-        ScopeExit(std::function<void()> func) : m_func(func) {}
-        ~ScopeExit() { if (this->m_func != nullptr) this->m_func(); }
-
-        void release() {
-            this->m_func = nullptr;
-        }
-
-    private:
-        std::function<void()> m_func;
-    };
-
-    struct Region {
-        u64 address;
-        size_t size;
-    };
-
-    struct Bookmark {
-        Region region;
-
-        std::vector<char> name;
-        std::vector<char> comment;
-    };
-}

include/lang/ast_node.hpp

@@ -11,123 +11,473 @@ namespace hex::lang {
 
     class ASTNode {
     public:
-        enum class Type {
-            VariableDecl,
-            TypeDecl,
-            Struct,
-            Union,
-            Enum,
-            Bitfield,
-            Scope,
-        };
+        constexpr ASTNode() = default;
+        constexpr virtual ~ASTNode() = default;
+        constexpr ASTNode(const ASTNode &) = default;
 
-        explicit ASTNode(Type type, u32 lineNumber) : m_type(type), m_lineNumber(lineNumber) {}
-        virtual ~ASTNode() = default;
+        [[nodiscard]] constexpr u32 getLineNumber() const { return this->m_lineNumber; }
+        constexpr void setLineNumber(u32 lineNumber) { this->m_lineNumber = lineNumber; }
 
-        Type getType() { return this->m_type; }
-        u32 getLineNumber() { return this->m_lineNumber; }
+        virtual ASTNode* clone() const = 0;
 
     private:
-        Type m_type;
-        u32 m_lineNumber;
+        u32 m_lineNumber = 1;
     };
 
-    class ASTNodeVariableDecl : public ASTNode {
+    class ASTNodeIntegerLiteral : public ASTNode {
     public:
-        explicit ASTNodeVariableDecl(u32 lineNumber, const Token::TypeToken::Type &type, const std::string &name, const std::string& customTypeName = "", std::optional<u64> offset = { }, size_t arraySize = 1, std::optional<std::string> arraySizeVariable = { }, std::optional<u8> pointerSize = { }, std::optional<std::endian> endianess = { })
-            : ASTNode(Type::VariableDecl, lineNumber), m_type(type), m_name(name), m_customTypeName(customTypeName), m_offset(offset), m_arraySize(arraySize), m_arraySizeVariable(arraySizeVariable), m_pointerSize(pointerSize), m_endianess(endianess) { }
+        ASTNodeIntegerLiteral(Token::IntegerLiteral literal) : ASTNode(), m_literal(literal) { }
 
-        const Token::TypeToken::Type& getVariableType() const { return this->m_type; }
-        const std::string& getCustomVariableTypeName() const { return this->m_customTypeName; }
-        const std::string& getVariableName() const { return this->m_name; };
-        std::optional<u64> getOffset() const { return this->m_offset; }
-        size_t getArraySize() const { return this->m_arraySize; }
-        std::optional<std::string> getArraySizeVariable() const { return this->m_arraySizeVariable; }
-        std::optional<u8> getPointerSize() const { return this->m_pointerSize; }
-        std::optional<std::endian> getEndianess() const { return this->m_endianess; }
+        ASTNodeIntegerLiteral(const ASTNodeIntegerLiteral&) = default;
+
+        ASTNode* clone() const override {
+            return new ASTNodeIntegerLiteral(*this);
+        }
+
+        [[nodiscard]] const auto& getValue() const {
+            return this->m_literal.second;
+        }
+
+        [[nodiscard]] Token::ValueType getType() const {
+            return this->m_literal.first;
+        }
 
     private:
-        Token::TypeToken::Type m_type;
-        std::string m_name, m_customTypeName;
-        std::optional<u64> m_offset;
-        size_t m_arraySize;
-        std::optional<std::string> m_arraySizeVariable;
-        std::optional<u8> m_pointerSize;
-        std::optional<std::endian> m_endianess = { };
+        Token::IntegerLiteral m_literal;
     };
 
-    class ASTNodeScope : public ASTNode {
+    class ASTNodeNumericExpression : public ASTNode {
     public:
-        explicit ASTNodeScope(u32 lineNumber, std::vector<ASTNode*> nodes) : ASTNode(Type::Scope, lineNumber), m_nodes(nodes) { }
+        ASTNodeNumericExpression(ASTNode *left, ASTNode *right, Token::Operator op)
+                : ASTNode(), m_left(left), m_right(right), m_operator(op) { }
+
+        ~ASTNodeNumericExpression() override {
+            delete this->m_left;
+            delete this->m_right;
+        }
+
+        ASTNodeNumericExpression(const ASTNodeNumericExpression &other) : ASTNode(other) {
+            this->m_operator = other.m_operator;
+            this->m_left = other.m_left->clone();
+            this->m_right = other.m_right->clone();
+        }
+
+        ASTNode* clone() const override {
+            return new ASTNodeNumericExpression(*this);
+        }
+
+        ASTNode *getLeftOperand() { return this->m_left; }
+        ASTNode *getRightOperand() { return this->m_right; }
+        Token::Operator getOperator() { return this->m_operator; }
 
-        std::vector<ASTNode*> &getNodes() { return this->m_nodes; }
     private:
-        std::vector<ASTNode*> m_nodes;
+        ASTNode *m_left, *m_right;
+        Token::Operator m_operator;
     };
 
-    class ASTNodeStruct : public ASTNode {
+    class ASTNodeTernaryExpression : public ASTNode {
     public:
-        explicit ASTNodeStruct(u32 lineNumber, std::string name, std::vector<ASTNode*> nodes)
-            : ASTNode(Type::Struct, lineNumber), m_name(name), m_nodes(nodes) { }
+        ASTNodeTernaryExpression(ASTNode *first, ASTNode *second, ASTNode *third, Token::Operator op)
+                : ASTNode(), m_first(first), m_second(second), m_third(third), m_operator(op) { }
+
+        ~ASTNodeTernaryExpression() override {
+            delete this->m_first;
+            delete this->m_second;
+            delete this->m_third;
+        }
+
+        ASTNodeTernaryExpression(const ASTNodeTernaryExpression &other) : ASTNode(other) {
+            this->m_operator = other.m_operator;
+            this->m_first = other.m_first->clone();
+            this->m_second = other.m_second->clone();
+            this->m_third = other.m_third->clone();
+        }
+
+        ASTNode* clone() const override {
+            return new ASTNodeTernaryExpression(*this);
+        }
+
+        ASTNode *getFirstOperand() { return this->m_first; }
+        ASTNode *getSecondOperand() { return this->m_second; }
+        ASTNode *getThirdOperand() { return this->m_third; }
+        Token::Operator getOperator() { return this->m_operator; }
 
-        const std::string& getName() const { return this->m_name; }
-        std::vector<ASTNode*> &getNodes() { return this->m_nodes; }
     private:
-        std::string m_name;
-        std::vector<ASTNode*> m_nodes;
+        ASTNode *m_first, *m_second, *m_third;
+        Token::Operator m_operator;
     };
 
-    class ASTNodeUnion : public ASTNode {
+    class ASTNodeBuiltinType : public ASTNode {
     public:
-        explicit ASTNodeUnion(u32 lineNumber, std::string name, std::vector<ASTNode*> nodes)
-                : ASTNode(Type::Union, lineNumber), m_name(name), m_nodes(nodes) { }
+        constexpr explicit ASTNodeBuiltinType(Token::ValueType type)
+                : ASTNode(), m_type(type) { }
+
+        [[nodiscard]] constexpr const auto& getType() const { return this->m_type; }
+
+        ASTNode* clone() const override {
+            return new ASTNodeBuiltinType(*this);
+        }
 
-        const std::string& getName() const { return this->m_name; }
-        std::vector<ASTNode*> &getNodes() { return this->m_nodes; }
     private:
-        std::string m_name;
-        std::vector<ASTNode*> m_nodes;
-    };
-
-    class ASTNodeBitField : public ASTNode {
-    public:
-        explicit ASTNodeBitField(u32 lineNumber, std::string name, std::vector<std::pair<std::string, size_t>> fields)
-        : ASTNode(Type::Bitfield, lineNumber), m_name(name), m_fields(fields) { }
-
-        const std::string& getName() const { return this->m_name; }
-        std::vector<std::pair<std::string, size_t>> &getFields() { return this->m_fields; }
-    private:
-        std::string m_name;
-        std::vector<std::pair<std::string, size_t>> m_fields;
+        const Token::ValueType m_type;
     };
 
     class ASTNodeTypeDecl : public ASTNode {
     public:
-        explicit ASTNodeTypeDecl(u32 lineNumber, const Token::TypeToken::Type &type, const std::string &name, const std::string& customTypeName = "")
-                : ASTNode(Type::TypeDecl, lineNumber), m_type(type), m_name(name), m_customTypeName(customTypeName) { }
+        ASTNodeTypeDecl(std::string_view name, ASTNode *type, std::optional<std::endian> endian = { })
+                : ASTNode(), m_name(name), m_type(type), m_endian(endian) { }
 
-        const std::string& getTypeName() const { return this->m_name; };
+        ASTNodeTypeDecl(const ASTNodeTypeDecl& other) : ASTNode(other) {
+            this->m_name = other.m_name;
+            this->m_type = other.m_type->clone();
+            this->m_endian = other.m_endian;
+        }
+
+        ~ASTNodeTypeDecl() override {
+            delete this->m_type;
+        }
+
+        ASTNode* clone() const override {
+            return new ASTNodeTypeDecl(*this);
+        }
+
+        [[nodiscard]] std::string_view getName() const { return this->m_name; }
+        [[nodiscard]] ASTNode* getType() { return this->m_type; }
+        [[nodiscard]] std::optional<std::endian> getEndian() const { return this->m_endian; }
 
-        const Token::TypeToken::Type& getAssignedType() const { return this->m_type; }
-        const std::string& getAssignedCustomTypeName() const { return this->m_customTypeName; }
     private:
-        Token::TypeToken::Type m_type;
-        std::string m_name, m_customTypeName;
+        std::string m_name;
+        ASTNode *m_type;
+        std::optional<std::endian> m_endian;
+    };
+
+    class ASTNodeVariableDecl : public ASTNode {
+    public:
+        ASTNodeVariableDecl(std::string_view name, ASTNode *type, ASTNode *placementOffset = nullptr)
+                : ASTNode(), m_name(name), m_type(type), m_placementOffset(placementOffset) { }
+
+        ASTNodeVariableDecl(const ASTNodeVariableDecl &other) : ASTNode(other) {
+            this->m_name = other.m_name;
+            this->m_type = other.m_type->clone();
+
+            if (other.m_placementOffset != nullptr)
+                this->m_placementOffset = other.m_placementOffset->clone();
+            else
+                this->m_placementOffset = nullptr;
+        }
+
+        ~ASTNodeVariableDecl() override {
+            delete this->m_type;
+        }
+
+        ASTNode* clone() const override {
+            return new ASTNodeVariableDecl(*this);
+        }
+
+        [[nodiscard]] std::string_view getName() const { return this->m_name; }
+        [[nodiscard]] constexpr ASTNode* getType() const { return this->m_type; }
+        [[nodiscard]] constexpr auto getPlacementOffset() const { return this->m_placementOffset; }
+
+    private:
+        std::string m_name;
+        ASTNode *m_type;
+        ASTNode *m_placementOffset;
+    };
+
+    class ASTNodeArrayVariableDecl : public ASTNode {
+    public:
+        ASTNodeArrayVariableDecl(std::string_view name, ASTNode *type, ASTNode *size, ASTNode *placementOffset = nullptr)
+                : ASTNode(), m_name(name), m_type(type), m_size(size), m_placementOffset(placementOffset) { }
+
+        ASTNodeArrayVariableDecl(const ASTNodeArrayVariableDecl &other) : ASTNode(other) {
+            this->m_name = other.m_name;
+            this->m_type = other.m_type->clone();
+            if (other.m_size != nullptr)
+                this->m_size = other.m_size->clone();
+            else
+                this->m_size = nullptr;
+
+            if (other.m_placementOffset != nullptr)
+                this->m_placementOffset = other.m_placementOffset->clone();
+            else
+                this->m_placementOffset = nullptr;
+        }
+
+        ~ASTNodeArrayVariableDecl() override {
+            delete this->m_type;
+            delete this->m_size;
+        }
+
+        ASTNode* clone() const override {
+            return new ASTNodeArrayVariableDecl(*this);
+        }
+
+        [[nodiscard]] std::string_view getName() const { return this->m_name; }
+        [[nodiscard]] constexpr ASTNode* getType() const { return this->m_type; }
+        [[nodiscard]] constexpr ASTNode* getSize() const { return this->m_size; }
+        [[nodiscard]] constexpr auto getPlacementOffset() const { return this->m_placementOffset; }
+
+    private:
+        std::string m_name;
+        ASTNode *m_type;
+        ASTNode *m_size;
+        ASTNode *m_placementOffset;
+    };
+
+    class ASTNodePointerVariableDecl : public ASTNode {
+    public:
+        ASTNodePointerVariableDecl(std::string_view name, ASTNode *type, ASTNode *sizeType, ASTNode *placementOffset = nullptr)
+                : ASTNode(), m_name(name), m_type(type), m_sizeType(sizeType), m_placementOffset(placementOffset) { }
+
+        ASTNodePointerVariableDecl(const ASTNodePointerVariableDecl &other) : ASTNode(other) {
+            this->m_name = other.m_name;
+            this->m_type = other.m_type->clone();
+            this->m_sizeType = other.m_sizeType->clone();
+
+            if (other.m_placementOffset != nullptr)
+                this->m_placementOffset = other.m_placementOffset->clone();
+            else
+                this->m_placementOffset = nullptr;
+        }
+
+        ~ASTNodePointerVariableDecl() override {
+            delete this->m_type;
+        }
+
+        ASTNode* clone() const override {
+            return new ASTNodePointerVariableDecl(*this);
+        }
+
+        [[nodiscard]] std::string_view getName() const { return this->m_name; }
+        [[nodiscard]] constexpr ASTNode* getType() const { return this->m_type; }
+        [[nodiscard]] constexpr ASTNode* getSizeType() const { return this->m_sizeType; }
+        [[nodiscard]] constexpr auto getPlacementOffset() const { return this->m_placementOffset; }
+
+    private:
+        std::string m_name;
+        ASTNode *m_type;
+        ASTNode *m_sizeType;
+        ASTNode *m_placementOffset;
+    };
+
+    class ASTNodeStruct : public ASTNode {
+    public:
+        ASTNodeStruct() : ASTNode() { }
+
+        ASTNodeStruct(const ASTNodeStruct &other) : ASTNode(other) {
+            for (const auto &otherMember : other.getMembers())
+                this->m_members.push_back(otherMember->clone());
+        }
+
+        ~ASTNodeStruct() override {
+            for (auto &member : this->m_members)
+                delete member;
+        }
+
+        ASTNode* clone() const override {
+            return new ASTNodeStruct(*this);
+        }
+
+        [[nodiscard]] const std::vector<ASTNode*>& getMembers() const { return this->m_members; }
+        void addMember(ASTNode *node) { this->m_members.push_back(node); }
+
+    private:
+        std::vector<ASTNode*> m_members;
+    };
+
+    class ASTNodeUnion : public ASTNode {
+    public:
+        ASTNodeUnion() : ASTNode() { }
+
+        ASTNodeUnion(const ASTNodeUnion &other) : ASTNode(other) {
+            for (const auto &otherMember : other.getMembers())
+                this->m_members.push_back(otherMember->clone());
+        }
+
+        ~ASTNodeUnion() override {
+            for (auto &member : this->m_members)
+                delete member;
+        }
+
+        ASTNode* clone() const override {
+            return new ASTNodeUnion(*this);
+        }
+
+        [[nodiscard]] const  std::vector<ASTNode*>& getMembers() const { return this->m_members; }
+        void addMember(ASTNode *node) { this->m_members.push_back(node); }
+
+    private:
+        std::vector<ASTNode*> m_members;
     };
 
     class ASTNodeEnum : public ASTNode {
     public:
-        explicit ASTNodeEnum(u32 lineNumber, const Token::TypeToken::Type &type, const std::string &name)
-                : ASTNode(Type::Enum, lineNumber), m_type(type), m_name(name) { }
+        explicit ASTNodeEnum(ASTNode *underlyingType) : ASTNode(), m_underlyingType(underlyingType) { }
 
-        const std::string& getName() const { return this->m_name; };
+        ASTNodeEnum(const ASTNodeEnum &other) : ASTNode(other) {
+            for (const auto &[name, entry] : other.getEntries())
+                this->m_entries.insert({ name, entry->clone() });
+            this->m_underlyingType = other.m_underlyingType->clone();
+        }
+
+        ~ASTNodeEnum() override {
+            for (auto &[name, expr] : this->m_entries)
+                delete expr;
+            delete this->m_underlyingType;
+        }
+
+        ASTNode* clone() const override {
+            return new ASTNodeEnum(*this);
+        }
+
+        [[nodiscard]] const std::unordered_map<std::string, ASTNode*>& getEntries() const { return this->m_entries; }
+        void addEntry(const std::string &name, ASTNode* expression) { this->m_entries.insert({ name, expression }); }
+
+        [[nodiscard]] const ASTNode *getUnderlyingType() const { return this->m_underlyingType; }
 
-        const Token::TypeToken::Type& getUnderlyingType() const { return this->m_type; }
-        std::vector<std::pair<u64, std::string>>& getValues() { return this->m_values; }
     private:
-        Token::TypeToken::Type m_type;
-        std::string m_name;
-        std::vector<std::pair<u64, std::string>> m_values;
+        std::unordered_map<std::string, ASTNode*> m_entries;
+        ASTNode *m_underlyingType;
     };
 
+    class ASTNodeBitfield : public ASTNode {
+    public:
+        ASTNodeBitfield() : ASTNode() { }
+
+        ASTNodeBitfield(const ASTNodeBitfield &other) : ASTNode(other) {
+            for (const auto &[name, entry] : other.getEntries())
+                this->m_entries.emplace_back(name, entry->clone());
+        }
+
+        ~ASTNodeBitfield() override {
+            for (auto &[name, expr] : this->m_entries)
+                delete expr;
+        }
+
+        ASTNode* clone() const override {
+            return new ASTNodeBitfield(*this);
+        }
+
+        [[nodiscard]] const std::vector<std::pair<std::string, ASTNode*>>& getEntries() const { return this->m_entries; }
+        void addEntry(const std::string &name, ASTNode* size) { this->m_entries.emplace_back(name, size); }
+
+    private:
+        std::vector<std::pair<std::string, ASTNode*>> m_entries;
+    };
+
+    class ASTNodeRValue : public ASTNode {
+    public:
+        explicit ASTNodeRValue(std::vector<std::string> path) : ASTNode(), m_path(std::move(path)) { }
+
+        ASTNodeRValue(const ASTNodeRValue&) = default;
+
+        ASTNode* clone() const override {
+            return new ASTNodeRValue(*this);
+        }
+
+        const std::vector<std::string>& getPath() {
+            return this->m_path;
+        }
+
+    private:
+        std::vector<std::string> m_path;
+    };
+
+    class ASTNodeScopeResolution : public ASTNode {
+    public:
+        explicit ASTNodeScopeResolution(std::vector<std::string> path) : ASTNode(), m_path(std::move(path)) { }
+
+        ASTNodeScopeResolution(const ASTNodeScopeResolution&) = default;
+
+        ASTNode* clone() const override {
+            return new ASTNodeScopeResolution(*this);
+        }
+
+        const std::vector<std::string>& getPath() {
+            return this->m_path;
+        }
+
+    private:
+        std::vector<std::string> m_path;
+    };
+
+    class ASTNodeConditionalStatement : public ASTNode {
+    public:
+        explicit ASTNodeConditionalStatement(ASTNode *condition, std::vector<ASTNode*> trueBody, std::vector<ASTNode*> falseBody)
+            : ASTNode(), m_condition(condition), m_trueBody(std::move(trueBody)), m_falseBody(std::move(falseBody)) { }
+
+        ~ASTNodeConditionalStatement() override {
+            delete this->m_condition;
+
+            for (auto &statement : this->m_trueBody)
+                delete statement;
+            for (auto &statement : this->m_falseBody)
+                delete statement;
+        }
+
+        ASTNodeConditionalStatement(const ASTNodeConditionalStatement &other) : ASTNode(other) {
+            this->m_condition = other.m_condition->clone();
+
+            for (auto &statement : other.m_trueBody)
+                this->m_trueBody.push_back(statement->clone());
+            for (auto &statement : other.m_falseBody)
+                this->m_falseBody.push_back(statement->clone());
+        }
+
+        ASTNode* clone() const override {
+            return new ASTNodeConditionalStatement(*this);
+        }
+
+        [[nodiscard]] ASTNode* getCondition() {
+            return this->m_condition;
+        }
+
+        [[nodiscard]] const std::vector<ASTNode*>& getTrueBody() const {
+            return this->m_trueBody;
+        }
+
+        [[nodiscard]] const std::vector<ASTNode*>& getFalseBody() const {
+            return this->m_falseBody;
+        }
+
+    private:
+        ASTNode *m_condition;
+        std::vector<ASTNode*> m_trueBody, m_falseBody;
+    };
+
+    class ASTNodeFunctionCall : public ASTNode {
+    public:
+        explicit ASTNodeFunctionCall(std::string_view functionName, std::vector<ASTNode*> params)
+                : ASTNode(), m_functionName(functionName), m_params(std::move(params)) { }
+
+        ~ASTNodeFunctionCall() override {
+            for (auto &param : this->m_params)
+                delete param;
+        }
+
+        ASTNodeFunctionCall(const ASTNodeFunctionCall &other) : ASTNode(other) {
+            this->m_functionName = other.m_functionName;
+
+            for (auto &param : other.m_params)
+                this->m_params.push_back(param->clone());
+        }
+
+        ASTNode* clone() const override {
+            return new ASTNodeFunctionCall(*this);
+        }
+
+        [[nodiscard]] std::string_view getFunctionName() {
+            return this->m_functionName;
+        }
+
+        [[nodiscard]] const std::vector<ASTNode*>& getParams() const {
+            return this->m_params;
+        }
+
+    private:
+        std::string m_functionName;
+        std::vector<ASTNode*> m_params;
+    };
+
+
 }

include/lang/evaluator.hpp

@@ -15,28 +15,79 @@ namespace hex::lang {
 
     class Evaluator {
     public:
-        Evaluator(prv::Provider* &provider, std::endian defaultDataEndianess);
+        Evaluator(prv::Provider* &provider, std::endian defaultDataEndian);
 
-        std::pair<Result, std::vector<PatternData*>> evaluate(const std::vector<ASTNode*>& ast);
+        std::optional<std::vector<PatternData*>> evaluate(const std::vector<ASTNode*>& ast);
 
         const std::pair<u32, std::string>& getError() { return this->m_error; }
 
+
+        struct Function {
+            constexpr static u32 UnlimitedParameters   = 0xFFFF'FFFF;
+            constexpr static u32 MoreParametersThan    = 0x8000'0000;
+            constexpr static u32 LessParametersThan    = 0x4000'0000;
+            constexpr static u32 NoParameters          = 0x0000'0000;
+
+            u32 parameterCount;
+            std::function<ASTNodeIntegerLiteral*(std::vector<ASTNodeIntegerLiteral*>)> func;
+        };
+
     private:
-        std::unordered_map<std::string, ASTNode*> m_types;
+        std::map<std::string, ASTNode*> m_types;
         prv::Provider* &m_provider;
-        std::endian m_defaultDataEndianess;
+        std::endian m_defaultDataEndian;
+        u64 m_currOffset = 0;
+        std::vector<std::endian> m_endianStack;
+        std::vector<PatternData*> m_globalMembers;
+        std::vector<std::vector<PatternData*>*> m_currMembers;
+        std::map<std::string, Function> m_functions;
 
         std::pair<u32, std::string> m_error;
 
-        std::pair<PatternData*, size_t> createStructPattern(ASTNodeVariableDecl *varDeclNode, u64 offset);
-        std::pair<PatternData*, size_t> createUnionPattern(ASTNodeVariableDecl *varDeclNode, u64 offset);
-        std::pair<PatternData*, size_t> createEnumPattern(ASTNodeVariableDecl *varDeclNode, u64 offset);
-        std::pair<PatternData*, size_t> createBitfieldPattern(ASTNodeVariableDecl *varDeclNode, u64 offset);
-        std::pair<PatternData*, size_t> createArrayPattern(ASTNodeVariableDecl *varDeclNode, u64 offset);
-        std::pair<PatternData*, size_t> createStringPattern(ASTNodeVariableDecl *varDeclNode, u64 offset);
-        std::pair<PatternData*, size_t> createCustomTypePattern(ASTNodeVariableDecl *varDeclNode, u64 offset);
-        std::pair<PatternData*, size_t> createBuiltInTypePattern(ASTNodeVariableDecl *varDeclNode, u64 offset);
+        using EvaluateError = std::pair<u32, std::string>;
 
+        [[noreturn]] static void throwEvaluateError(std::string_view error, u32 lineNumber) {
+            throw EvaluateError(lineNumber, "Evaluator: " + std::string(error));
+        }
+
+        [[nodiscard]] std::endian getCurrentEndian() const {
+            return this->m_endianStack.back();
+        }
+
+        void addFunction(std::string_view name, u32 parameterCount, std::function<ASTNodeIntegerLiteral*(std::vector<ASTNodeIntegerLiteral*>)> func) {
+            if (this->m_functions.contains(name.data()))
+                throwEvaluateError(hex::format("redefinition of function '%s'", name.data()), 1);
+
+            this->m_functions[name.data()] = { parameterCount, func };
+        }
+
+        ASTNodeIntegerLiteral* evaluateScopeResolution(ASTNodeScopeResolution *node);
+        ASTNodeIntegerLiteral* evaluateRValue(ASTNodeRValue *node);
+        ASTNodeIntegerLiteral* evaluateFunctionCall(ASTNodeFunctionCall *node);
+        ASTNodeIntegerLiteral* evaluateOperator(ASTNodeIntegerLiteral *left, ASTNodeIntegerLiteral *right, Token::Operator op);
+        ASTNodeIntegerLiteral* evaluateOperand(ASTNode *node);
+        ASTNodeIntegerLiteral* evaluateTernaryExpression(ASTNodeTernaryExpression *node);
+        ASTNodeIntegerLiteral* evaluateMathematicalExpression(ASTNodeNumericExpression *node);
+
+        PatternData* evaluateBuiltinType(ASTNodeBuiltinType *node);
+        std::vector<PatternData*> evaluateMember(ASTNode *node);
+        PatternData* evaluateStruct(ASTNodeStruct *node);
+        PatternData* evaluateUnion(ASTNodeUnion *node);
+        PatternData* evaluateEnum(ASTNodeEnum *node);
+        PatternData* evaluateBitfield(ASTNodeBitfield *node);
+        PatternData* evaluateType(ASTNodeTypeDecl *node);
+        PatternData* evaluateVariable(ASTNodeVariableDecl *node);
+        PatternData* evaluateArray(ASTNodeArrayVariableDecl *node);
+        PatternData* evaluatePointer(ASTNodePointerVariableDecl *node);
+
+
+        #define BUILTIN_FUNCTION(name) ASTNodeIntegerLiteral* name(std::vector<ASTNodeIntegerLiteral*> params)
+
+        BUILTIN_FUNCTION(findSequence);
+        BUILTIN_FUNCTION(readUnsigned);
+        BUILTIN_FUNCTION(readSigned);
+
+        #undef BUILTIN_FUNCTION
     };
 
 }

include/lang/lexer.hpp

@@ -4,6 +4,7 @@
 
 #include "token.hpp"
 
+#include <optional>
 #include <string>
 #include <vector>
 
@@ -13,12 +14,18 @@ namespace hex::lang {
     public:
         Lexer();
 
-        std::pair<Result, std::vector<Token>> lex(const std::string& code);
+        std::optional<std::vector<Token>> lex(const std::string& code);
 
         const std::pair<u32, std::string>& getError() { return this->m_error; }
 
     private:
         std::pair<u32, std::string> m_error;
+
+        using LexerError = std::pair<u32, std::string>;
+
+        [[noreturn]] void throwLexerError(std::string_view error, u32 lineNumber) const {
+            throw LexerError(lineNumber, "Lexer: " + std::string(error));
+        }
     };
 
 }

include/lang/parser.hpp

@@ -1,49 +1,174 @@
 #pragma once
 
 #include <hex.hpp>
+
 #include "token.hpp"
 #include "ast_node.hpp"
 
+#include "helpers/utils.hpp"
+
+#include <unordered_map>
+#include <stdexcept>
+#include <utility>
 #include <vector>
 
 namespace hex::lang {
 
     class Parser {
     public:
-        Parser();
+        Parser() = default;
+        ~Parser() = default;
 
         using TokenIter = std::vector<Token>::const_iterator;
 
-        std::pair<Result, std::vector<ASTNode*>> parse(const std::vector<Token> &tokens);
+        std::optional<std::vector<ASTNode*>> parse(const std::vector<Token> &tokens);
 
         const std::pair<u32, std::string>& getError() { return this->m_error; }
 
     private:
-        std::pair<u32, std::string> m_error;
+        using ParseError = std::pair<u32, std::string>;
 
+        ParseError m_error;
+        TokenIter m_curr;
+        TokenIter m_originalPosition;
 
-        ASTNode* parseBuiltinVariableDecl(TokenIter &curr, bool hasEndianDef);
-        ASTNode* parseCustomTypeVariableDecl(TokenIter &curr, bool hasEndianDef);
-        ASTNode* parseBuiltinPointerVariableDecl(TokenIter &curr, bool hasEndianDef);
-        ASTNode* parseCustomTypePointerVariableDecl(TokenIter &curr, bool hasEndianDef);
-        ASTNode* parseBuiltinArrayDecl(TokenIter &curr, bool hasEndianDef);
-        ASTNode* parseCustomTypeArrayDecl(TokenIter &curr, bool hasEndianDef);
-        ASTNode* parseBuiltinVariableArrayDecl(TokenIter &curr, bool hasEndianDef);
-        ASTNode* parseCustomTypeVariableArrayDecl(TokenIter &curr, bool hasEndianDef);
-        ASTNode* parsePaddingDecl(TokenIter &curr);
-        ASTNode* parseFreeBuiltinVariableDecl(TokenIter &curr, bool hasEndianDef);
-        ASTNode* parseFreeCustomTypeVariableDecl(TokenIter &curr, bool hasEndianDef);
+        std::unordered_map<std::string, ASTNode*> m_types;
+        std::vector<TokenIter> m_matchedOptionals;
 
-        ASTNode* parseStruct(TokenIter &curr);
-        ASTNode* parseUnion(TokenIter &curr);
-        ASTNode* parseEnum(TokenIter &curr);
-        ASTNode *parseBitField(TokenIter &curr);
-        ASTNode *parseScope(TokenIter &curr);
-        std::optional<ASTNode*> parseUsingDeclaration(TokenIter &curr);
-        std::optional<std::vector<ASTNode*>> parseStatement(TokenIter &curr);
+        u32 getLineNumber(s32 index) const {
+            return this->m_curr[index].lineNumber;
+        }
+
+        template<typename T>
+        const T& getValue(s32 index) const {
+            auto value = std::get_if<T>(&this->m_curr[index].value);
+
+            if (value == nullptr)
+                throwParseError("failed to decode token. Invalid type.", getLineNumber(index));
+
+            return *value;
+        }
+
+        Token::Type getType(s32 index) const {
+            return this->m_curr[index].type;
+        }
+
+        ASTNode* parseFunctionCall();
+        ASTNode* parseScopeResolution(std::vector<std::string> &path);
+        ASTNode* parseRValue(std::vector<std::string> &path);
+        ASTNode* parseFactor();
+        ASTNode* parseUnaryExpression();
+        ASTNode* parseMultiplicativeExpression();
+        ASTNode* parseAdditiveExpression();
+        ASTNode* parseShiftExpression();
+        ASTNode* parseRelationExpression();
+        ASTNode* parseEqualityExpression();
+        ASTNode* parseBinaryAndExpression();
+        ASTNode* parseBinaryXorExpression();
+        ASTNode* parseBinaryOrExpression();
+        ASTNode* parseBooleanAnd();
+        ASTNode* parseBooleanXor();
+        ASTNode* parseBooleanOr();
+        ASTNode* parseTernaryConditional();
+        ASTNode* parseMathematicalExpression();
+
+        ASTNode* parseConditional();
+        ASTNode* parseType(s32 startIndex);
+        ASTNode* parseUsingDeclaration();
+        ASTNode* parsePadding();
+        ASTNode* parseMemberVariable();
+        ASTNode* parseMemberArrayVariable();
+        ASTNode* parseMemberPointerVariable();
+        ASTNode* parseMember();
+        ASTNode* parseStruct();
+        ASTNode* parseUnion();
+        ASTNode* parseEnum();
+        ASTNode* parseBitfield();
+        ASTNode* parseVariablePlacement();
+        ASTNode* parseArrayVariablePlacement();
+        ASTNode* parsePointerVariablePlacement();
+        ASTNode* parseStatement();
+
+        std::vector<ASTNode*> parseTillToken(Token::Type endTokenType, const auto value) {
+            std::vector<ASTNode*> program;
+            ScopeExit guard([&]{ for (auto &node : program) delete node; });
+
+            while (this->m_curr->type != endTokenType || (*this->m_curr) != value) {
+                program.push_back(parseStatement());
+            }
+
+            this->m_curr++;
+
+            guard.release();
+
+            return program;
+        }
+
+        [[noreturn]] void throwParseError(std::string_view error, s32 token = -1) const {
+            throw ParseError(this->m_curr[token].lineNumber, "Parser: " + std::string(error));
+        }
+
+        /* Token consuming */
+
+        bool begin() {
+            this->m_originalPosition = this->m_curr;
+            this->m_matchedOptionals.clear();
+
+            return true;
+        }
+
+        bool sequence() {
+            return true;
+        }
+
+        bool sequence(Token::Type type, auto value, auto ... args) {
+            if (!peek(type, value)) {
+                this->m_curr = this->m_originalPosition;
+                return false;
+            }
+
+            this->m_curr++;
+
+            if (!sequence(args...)) {
+                this->m_curr = this->m_originalPosition;
+                return false;
+            }
+
+            return true;
+        }
+
+        bool variant(Token::Type type1, auto value1, Token::Type type2, auto value2) {
+            if (!peek(type1, value1)) {
+                if (!peek(type2, value2)) {
+                    this->m_curr = this->m_originalPosition;
+                    return false;
+                }
+            }
+
+            this->m_curr++;
+
+            return true;
+        }
+
+        bool optional(Token::Type type, auto value) {
+            if (peek(type, value)) {
+                this->m_matchedOptionals.push_back(this->m_curr);
+                this->m_curr++;
+            }
+
+            return true;
+        }
+
+        bool peek(Token::Type type, auto value, s32 index = 0) {
+            return this->m_curr[index].type == type && this->m_curr[index] == value;
+        }
+
+        bool peekOptional(Token::Type type, auto value, u32 index = 0) {
+            if (index >= this->m_matchedOptionals.size())
+                return false;
+            return peek(type, value, std::distance(this->m_curr, this->m_matchedOptionals[index]));
+        }
 
-        std::vector<ASTNode*> parseTillToken(TokenIter &curr, Token::Type endTokenType);
-        bool tryConsume(TokenIter &curr, std::initializer_list<Token::Type> tokenTypes);
     };
 
 }

include/lang/pattern_data.hpp

@@ -1,15 +1,17 @@
 #pragma once
 
 #include <hex.hpp>
-#include <string>
 
 #include "imgui.h"
 #include "imgui_memory_editor.h"
 
 #include "providers/provider.hpp"
 #include "helpers/utils.hpp"
+#include "lang/token.hpp"
 
+#include <cstring>
 #include <random>
+#include <string>
 
 namespace hex::lang {
 
@@ -26,6 +28,9 @@ namespace hex::lang {
                     result += *c;
             }
 
+            if (*(data + size - 1) == '\x00')
+                result.pop_back();
+
             return result;
         }
 
@@ -33,11 +38,9 @@ namespace hex::lang {
 
     class PatternData {
     public:
-        enum class Type { Padding, Unsigned, Signed, Float, Character, String, Struct, Union, Array, Enum };
-
-        PatternData(Type type, u64 offset, size_t size, const std::string &name, std::endian endianess, u32 color = 0)
-        : m_type(type), m_offset(offset), m_size(size), m_name(name), m_endianess(endianess), m_color(color) {
-            constexpr u32 Palette[] = { 0x50b4771f, 0x500e7fff, 0x502ca02c, 0x502827d6, 0x50bd6794, 0x504b568c, 0x50c277e3, 0x507f7f7f, 0x5022bdbc, 0x50cfbe17 };
+        PatternData(u64 offset, size_t size, u32 color = 0)
+        : m_offset(offset), m_size(size), m_color(color) {
+            constexpr u32 Palette[] = { 0x70b4771f, 0x700e7fff, 0x702ca02c, 0x702827d6, 0x70bd6794, 0x704b568c, 0x70c277e3, 0x707f7f7f, 0x7022bdbc, 0x70cfbe17 };
 
             if (color != 0)
                 return;
@@ -49,37 +52,51 @@ namespace hex::lang {
         }
         virtual ~PatternData() = default;
 
-        [[nodiscard]] Type getPatternType() const { return this->m_type; }
+        virtual PatternData* clone() = 0;
+
         [[nodiscard]] u64 getOffset() const { return this->m_offset; }
         [[nodiscard]] size_t getSize() const { return this->m_size; }
 
-        [[nodiscard]] const std::string& getName() const { return this->m_name; }
-        void setName(std::string name) { this->m_name = name; }
+        [[nodiscard]] const std::string& getVariableName() const { return this->m_variableName; }
+        void setVariableName(std::string name) { this->m_variableName = std::move(name); }
+
+        [[nodiscard]] const std::string& getTypeName() const { return this->m_typeName; }
+        void setTypeName(std::string name) { this->m_typeName = std::move(name); }
 
         [[nodiscard]] u32 getColor() const { return this->m_color; }
         void setColor(u32 color) { this->m_color = color; }
 
-        [[nodiscard]] std::endian getEndianess() const { return this->m_endianess; }
-        void setEndianess(std::endian endianess) { this->m_endianess = endianess; }
+        [[nodiscard]] std::endian getEndian() const { return this->m_endian; }
+        void setEndian(std::endian endian) { this->m_endian = endian; }
 
         virtual void createEntry(prv::Provider* &provider) = 0;
-        virtual std::string getTypeName() = 0;
+        [[nodiscard]] virtual std::string getFormattedName() const = 0;
 
         virtual std::optional<u32> highlightBytes(size_t offset) {
-            if (offset >= this->getOffset() && offset < (this->getOffset() + this->getSize()))
+            auto currOffset = this->getOffset();
+            if (offset >= currOffset && offset < (currOffset + this->getSize()))
                 return this->getColor();
             else
                 return { };
         }
 
+        virtual std::map<u64, u32> getHighlightedAddresses() {
+            if (this->m_highlightedAddresses.empty()) {
+                for (u64 i = 0; i < this->getSize(); i++)
+                    this->m_highlightedAddresses.insert({ this->getOffset() + i, this->getColor() });
+            }
+
+            return this->m_highlightedAddresses;
+        }
+
         virtual void sort(ImGuiTableSortSpecs *sortSpecs, prv::Provider *provider) { }
 
         static bool sortPatternDataTable(ImGuiTableSortSpecs *sortSpecs, prv::Provider *provider, lang::PatternData* left, lang::PatternData* right) {
             if (sortSpecs->Specs->ColumnUserID == ImGui::GetID("name")) {
                 if (sortSpecs->Specs->SortDirection == ImGuiSortDirection_Ascending)
-                    return left->getName() > right->getName();
+                    return left->getVariableName() > right->getVariableName();
                 else
-                    return left->getName() < right->getName();
+                    return left->getVariableName() < right->getVariableName();
             }
             else if (sortSpecs->Specs->ColumnUserID == ImGui::GetID("offset")) {
                 if (sortSpecs->Specs->SortDirection == ImGuiSortDirection_Ascending)
@@ -100,9 +117,9 @@ namespace hex::lang {
                 provider->read(left->getOffset(), leftBuffer.data(), left->getSize());
                 provider->read(right->getOffset(), rightBuffer.data(), right->getSize());
 
-                if (left->m_endianess != std::endian::native)
+                if (left->m_endian != std::endian::native)
                     std::reverse(leftBuffer.begin(), leftBuffer.end());
-                if (right->m_endianess != std::endian::native)
+                if (right->m_endian != std::endian::native)
                     std::reverse(rightBuffer.begin(), rightBuffer.end());
 
                 if (sortSpecs->Specs->SortDirection == ImGuiSortDirection_Ascending)
@@ -129,38 +146,39 @@ namespace hex::lang {
         static void resetPalette() { PatternData::s_paletteOffset = 0; }
 
     protected:
-        void createDefaultEntry(std::string value) {
+        void createDefaultEntry(std::string_view value) const {
             ImGui::TableNextRow();
-            ImGui::TreeNodeEx(this->getName().c_str(), ImGuiTreeNodeFlags_Leaf | ImGuiTreeNodeFlags_NoTreePushOnOpen | ImGuiTreeNodeFlags_SpanFullWidth | ImGuiTreeNodeFlags_AllowItemOverlap);
+            ImGui::TreeNodeEx(this->getVariableName().c_str(), ImGuiTreeNodeFlags_Leaf | ImGuiTreeNodeFlags_NoTreePushOnOpen | ImGuiTreeNodeFlags_SpanFullWidth | ImGuiTreeNodeFlags_AllowItemOverlap);
             ImGui::TableNextColumn();
             if (ImGui::Selectable(("##PatternDataLine"s + std::to_string(this->getOffset())).c_str(), false, ImGuiSelectableFlags_SpanAllColumns | ImGuiSelectableFlags_AllowItemOverlap)) {
                 Region selectRegion = { this->getOffset(), this->getSize() };
                 View::postEvent(Events::SelectionChangeRequest, &selectRegion);
             }
             ImGui::SameLine();
-            ImGui::Text("%s", this->getName().c_str());
+            ImGui::Text("%s", this->getVariableName().c_str());
             ImGui::TableNextColumn();
-            ImGui::ColorButton("color", ImColor(this->getColor()), ImGuiColorEditFlags_NoTooltip, ImVec2(ImGui::GetColumnWidth(), 14));
+            ImGui::ColorButton("color", ImColor(this->getColor()), ImGuiColorEditFlags_NoTooltip, ImVec2(ImGui::GetColumnWidth(), ImGui::GetTextLineHeight()));
             ImGui::TableNextColumn();
-            ImGui::Text("0x%08lx : 0x%08lx", this->getOffset(), this->getOffset() + this->getSize() - 1);
+            ImGui::Text("0x%08llx : 0x%08llx", this->getOffset(), this->getOffset() + this->getSize() - 1);
             ImGui::TableNextColumn();
-            ImGui::Text("0x%04lx", this->getSize());
+            ImGui::Text("0x%04llx", this->getSize());
             ImGui::TableNextColumn();
-            ImGui::TextColored(ImColor(0xFF9BC64D), "%s", this->getTypeName().c_str());
+            ImGui::TextColored(ImColor(0xFF9BC64D), "%s", this->getFormattedName().c_str());
             ImGui::TableNextColumn();
-            ImGui::Text("%s", value.c_str());
+            ImGui::Text("%s", value.data());
         }
 
     protected:
-        std::endian m_endianess = std::endian::native;
+        std::endian m_endian = std::endian::native;
+        std::map<u64, u32> m_highlightedAddresses;
 
     private:
-        Type m_type;
         u64 m_offset;
         size_t m_size;
 
         u32 m_color;
-        std::string m_name;
+        std::string m_variableName;
+        std::string m_typeName;
 
         static inline u8 s_paletteOffset = 0;
 
@@ -168,41 +186,49 @@ namespace hex::lang {
 
     class PatternDataPadding : public PatternData {
     public:
-        PatternDataPadding(u64 offset, size_t size) : PatternData(Type::Padding, offset, size, "", { }, 0x00FFFFFF) { }
+        PatternDataPadding(u64 offset, size_t size) : PatternData(offset, size, 0x00FFFFFF) { }
+
+        PatternData* clone() override {
+            return new PatternDataPadding(*this);
+        }
 
         void createEntry(prv::Provider* &provider) override {
         }
 
-        std::string getTypeName() override {
+        [[nodiscard]] std::string getFormattedName() const override {
             return "";
         }
     };
 
     class PatternDataPointer : public PatternData {
     public:
-        PatternDataPointer(u64 offset, size_t size, const std::string &name, PatternData *pointedAt, std::endian endianess, u32 color = 0)
-        : PatternData(Type::Unsigned, offset, size, name, endianess, color), m_pointedAt(pointedAt) {
-            this->m_pointedAt->setName("*" + this->m_pointedAt->getName());
+        PatternDataPointer(u64 offset, size_t size, PatternData *pointedAt, u32 color = 0)
+        : PatternData(offset, size, color), m_pointedAt(pointedAt) {
+            this->m_pointedAt->setVariableName("*" + this->m_pointedAt->getVariableName());
+        }
+
+        PatternData* clone() override {
+            return new PatternDataPointer(*this);
         }
 
         void createEntry(prv::Provider* &provider) override {
             u64 data = 0;
             provider->read(this->getOffset(), &data, this->getSize());
-            data = hex::changeEndianess(data, this->getSize(), this->m_endianess);
+            data = hex::changeEndianess(data, this->getSize(), this->getEndian());
 
             ImGui::TableNextRow();
             ImGui::TableNextColumn();
-            bool open = ImGui::TreeNodeEx(this->getName().c_str(), ImGuiTreeNodeFlags_SpanFullWidth);
+            bool open = ImGui::TreeNodeEx(this->getVariableName().c_str(), ImGuiTreeNodeFlags_SpanFullWidth);
             ImGui::TableNextColumn();
-            ImGui::ColorButton("color", ImColor(this->getColor()), ImGuiColorEditFlags_NoTooltip, ImVec2(ImGui::GetColumnWidth(), 14));
+            ImGui::ColorButton("color", ImColor(this->getColor()), ImGuiColorEditFlags_NoTooltip, ImVec2(ImGui::GetColumnWidth(), ImGui::GetTextLineHeight()));
             ImGui::TableNextColumn();
-            ImGui::Text("0x%08lx : 0x%08lx", this->getOffset(), this->getOffset() + this->getSize() - 1);
+            ImGui::Text("0x%08llx : 0x%08llx", this->getOffset(), this->getOffset() + this->getSize() - 1);
             ImGui::TableNextColumn();
-            ImGui::Text("0x%04lx", this->getSize());
+            ImGui::Text("0x%04llx", this->getSize());
             ImGui::TableNextColumn();
-            ImGui::TextColored(ImColor(0xFF9BC64D), "%s", this->getTypeName().c_str());
+            ImGui::TextColored(ImColor(0xFF9BC64D), "%s*", this->m_pointedAt->getFormattedName().c_str());
             ImGui::TableNextColumn();
-            ImGui::Text("*(0x%0*llx)", this->getSize() * 2, data);
+            ImGui::Text("*(0x%llx)", data);
 
             if (open) {
                 this->m_pointedAt->createEntry(provider);
@@ -211,7 +237,7 @@ namespace hex::lang {
             }
         }
 
-        virtual std::optional<u32> highlightBytes(size_t offset) {
+        std::optional<u32> highlightBytes(size_t offset) override {
             if (offset >= this->getOffset() && offset < (this->getOffset() + this->getSize()))
                 return this->getColor();
             else if (auto color = this->m_pointedAt->highlightBytes(offset); color.has_value())
@@ -220,28 +246,47 @@ namespace hex::lang {
                 return { };
         }
 
-        std::string getTypeName() override {
+        std::map<u64, u32> getHighlightedAddresses() override {
+            if (this->m_highlightedAddresses.empty()) {
+                auto ownAddresses = PatternData::getHighlightedAddresses();
+                auto pointedToAddresses = this->m_pointedAt->getHighlightedAddresses();
+
+                ownAddresses.merge(pointedToAddresses);
+                this->m_highlightedAddresses = ownAddresses;
+            }
+
+            return this->m_highlightedAddresses;
+        }
+        [[nodiscard]] std::string getFormattedName() const override {
             return "Pointer";
         }
 
+        [[nodiscard]] PatternData* getPointedAtPattern() {
+            return this->m_pointedAt;
+        }
+
     private:
         PatternData *m_pointedAt;
     };
 
     class PatternDataUnsigned : public PatternData {
     public:
-        PatternDataUnsigned(u64 offset, size_t size, const std::string &name, std::endian endianess, u32 color = 0)
-            : PatternData(Type::Unsigned, offset, size, name, endianess, color) { }
+        PatternDataUnsigned(u64 offset, size_t size, u32 color = 0)
+            : PatternData(offset, size, color) { }
+
+        PatternData* clone() override {
+            return new PatternDataUnsigned(*this);
+        }
 
         void createEntry(prv::Provider* &provider) override {
             u64 data = 0;
             provider->read(this->getOffset(), &data, this->getSize());
-            data = hex::changeEndianess(data, this->getSize(), this->m_endianess);
+            data = hex::changeEndianess(data, this->getSize(), this->getEndian());
 
             this->createDefaultEntry(hex::format("%lu (0x%0*lx)", data, this->getSize() * 2, data));
         }
 
-        std::string getTypeName() override {
+        [[nodiscard]] std::string getFormattedName() const override {
             switch (this->getSize()) {
                 case 1:     return "u8";
                 case 2:     return "u16";
@@ -255,20 +300,24 @@ namespace hex::lang {
 
     class PatternDataSigned : public PatternData {
     public:
-        PatternDataSigned(u64 offset, size_t size, const std::string &name, std::endian endianess, u32 color = 0)
-            : PatternData(Type::Signed, offset, size, name, endianess, color) { }
+        PatternDataSigned(u64 offset, size_t size, u32 color = 0)
+            : PatternData(offset, size, color) { }
+
+        PatternData* clone() override {
+            return new PatternDataSigned(*this);
+        }
 
        void createEntry(prv::Provider* &provider) override {
             u64 data = 0;
             provider->read(this->getOffset(), &data, this->getSize());
-            data = hex::changeEndianess(data, this->getSize(), this->m_endianess);
+            data = hex::changeEndianess(data, this->getSize(), this->getEndian());
 
-            s64 signedData = signedData = hex::signExtend(data, this->getSize(), 64);
+            s64 signedData = hex::signExtend(data, this->getSize(), 64);
 
            this->createDefaultEntry(hex::format("%ld (0x%0*lx)", signedData, this->getSize() * 2, data));
         }
 
-        std::string getTypeName() override {
+        [[nodiscard]] std::string getFormattedName() const override {
             switch (this->getSize()) {
                 case 1:     return "s8";
                 case 2:     return "s16";
@@ -282,29 +331,30 @@ namespace hex::lang {
 
     class PatternDataFloat : public PatternData {
     public:
-        PatternDataFloat(u64 offset, size_t size, const std::string &name, std::endian endianess, u32 color = 0)
-            : PatternData(Type::Float, offset, size, name, endianess, color) { }
+        PatternDataFloat(u64 offset, size_t size, u32 color = 0)
+            : PatternData(offset, size, color) { }
 
-        void createEntry(prv::Provider* &provider) override {
-            double formatData = 0;
-            if (this->getSize() == 4) {
-                float data = 0;
-                provider->read(this->getOffset(), &data, 4);
-                data = hex::changeEndianess(data, 4, this->m_endianess);
-
-                formatData = data;
-            } else if (this->getSize() == 8) {
-                double data = 0;
-                provider->read(this->getOffset(), &data, 8);
-                data = hex::changeEndianess(data, 8, this->m_endianess);
-
-                formatData = data;
-            }
-
-            this->createDefaultEntry(hex::format("%f (0x%0*lx)", formatData, this->getSize() * 2, formatData));
+        PatternData* clone() override {
+            return new PatternDataFloat(*this);
         }
 
-        std::string getTypeName() override {
+        void createEntry(prv::Provider* &provider) override {
+            if (this->getSize() == 4) {
+                u32 data = 0;
+                provider->read(this->getOffset(), &data, 4);
+                data = hex::changeEndianess(data, 4, this->getEndian());
+
+                this->createDefaultEntry(hex::format("%e (0x%0*lX)", *reinterpret_cast<float*>(&data), this->getSize() * 2, data));
+            } else if (this->getSize() == 8) {
+                u64 data = 0;
+                provider->read(this->getOffset(), &data, 8);
+                data = hex::changeEndianess(data, 8, this->getEndian());
+
+                this->createDefaultEntry(hex::format("%e (0x%0*lX)", *reinterpret_cast<double*>(&data), this->getSize() * 2, data));
+            }
+        }
+
+        [[nodiscard]] std::string getFormattedName() const override {
             switch (this->getSize()) {
                 case 4:     return "float";
                 case 8:     return "double";
@@ -313,10 +363,40 @@ namespace hex::lang {
         }
     };
 
+    class PatternDataBoolean : public PatternData {
+    public:
+        explicit PatternDataBoolean(u64 offset, u32 color = 0)
+                : PatternData(offset, 1, color) { }
+
+        PatternData* clone() override {
+            return new PatternDataBoolean(*this);
+        }
+
+        void createEntry(prv::Provider* &provider) override {
+            u8 boolean;
+            provider->read(this->getOffset(), &boolean, 1);
+
+            if (boolean == 0)
+                this->createDefaultEntry("false");
+            else if (boolean == 1)
+                this->createDefaultEntry("true");
+            else
+                this->createDefaultEntry("true*");
+        }
+
+        [[nodiscard]] std::string getFormattedName() const override {
+            return "bool";
+        }
+    };
+
     class PatternDataCharacter : public PatternData {
     public:
-        PatternDataCharacter(u64 offset, size_t size, const std::string &name, std::endian endianess, u32 color = 0)
-            : PatternData(Type::Character, offset, size, name, endianess, color) { }
+        explicit PatternDataCharacter(u64 offset, u32 color = 0)
+            : PatternData(offset, 1, color) { }
+
+        PatternData* clone() override {
+            return new PatternDataCharacter(*this);
+        }
 
         void createEntry(prv::Provider* &provider) override {
             char character;
@@ -325,15 +405,19 @@ namespace hex::lang {
             this->createDefaultEntry(hex::format("'%c'", character));
         }
 
-        std::string getTypeName() override {
-            return "Character";
+        [[nodiscard]] std::string getFormattedName() const override {
+            return "char";
         }
     };
 
     class PatternDataString : public PatternData {
     public:
-        PatternDataString(u64 offset, size_t size, const std::string &name, std::endian endianess, u32 color = 0)
-            : PatternData(Type::String, offset, size, name, endianess, color) { }
+        PatternDataString(u64 offset, size_t size, u32 color = 0)
+            : PatternData(offset, size, color) { }
+
+        PatternData* clone() override {
+            return new PatternDataString(*this);
+        }
 
         void createEntry(prv::Provider* &provider) override {
             std::vector<u8> buffer(this->getSize() + 1, 0x00);
@@ -343,26 +427,38 @@ namespace hex::lang {
             this->createDefaultEntry(hex::format("\"%s\"", makeDisplayable(buffer.data(), this->getSize()).c_str()));
         }
 
-        std::string getTypeName() override {
+        [[nodiscard]] std::string getFormattedName() const override {
            return "String";
         }
     };
 
     class PatternDataArray : public PatternData {
     public:
-        PatternDataArray(u64 offset, size_t size, const std::string &name, std::endian endianess, const std::vector<PatternData*> & entries, u32 color = 0)
-            : PatternData(Type::Array, offset, size, name, endianess, color), m_entries(entries) { }
+        PatternDataArray(u64 offset, size_t size, std::vector<PatternData*> entries, u32 color = 0)
+            : PatternData(offset, size, color), m_entries(std::move(entries)) { }
+
+        PatternDataArray(const PatternDataArray &other) : PatternData(other.getOffset(), other.getSize(), other.getColor()) {
+            for (const auto &entry : other.m_entries)
+                this->m_entries.push_back(entry->clone());
+        }
+
+        PatternData* clone() override {
+            return new PatternDataArray(*this);
+        }
 
         void createEntry(prv::Provider* &provider) override {
+            if (this->m_entries.empty())
+                return;
+
             ImGui::TableNextRow();
             ImGui::TableNextColumn();
-            bool open = ImGui::TreeNodeEx(this->getName().c_str(), ImGuiTreeNodeFlags_SpanFullWidth);
+            bool open = ImGui::TreeNodeEx(this->getVariableName().c_str(), ImGuiTreeNodeFlags_SpanFullWidth);
             ImGui::TableNextColumn();
-            ImGui::ColorButton("color", ImColor(this->getColor()), ImGuiColorEditFlags_NoTooltip, ImVec2(ImGui::GetColumnWidth(), 14));
+            ImGui::ColorButton("color", ImColor(this->getColor()), ImGuiColorEditFlags_NoTooltip, ImVec2(ImGui::GetColumnWidth(), ImGui::GetTextLineHeight()));
             ImGui::TableNextColumn();
-            ImGui::Text("0x%08lx : 0x%08lx", this->getOffset(), this->getOffset() + this->getSize() - 1);
+            ImGui::Text("0x%08llx : 0x%08llx", this->getOffset(), this->getOffset() + this->getSize() - 1);
             ImGui::TableNextColumn();
-            ImGui::Text("0x%04lx", this->getSize());
+            ImGui::Text("0x%04llx", this->getSize());
             ImGui::TableNextColumn();
             ImGui::TextColored(ImColor(0xFF9BC64D), "%s", this->m_entries[0]->getTypeName().c_str());
             ImGui::SameLine(0, 0);
@@ -393,7 +489,16 @@ namespace hex::lang {
             return { };
         }
 
-        std::string getTypeName() override {
+        std::map<u64, u32> getHighlightedAddresses() override {
+            if (this->m_highlightedAddresses.empty()) {
+                for (auto &entry : this->m_entries) {
+                    this->m_highlightedAddresses.merge(entry->getHighlightedAddresses());
+                }
+            }
+
+            return this->m_highlightedAddresses;
+        }
+        [[nodiscard]] std::string getFormattedName() const override {
             return this->m_entries[0]->getTypeName() + "[" + std::to_string(this->m_entries.size()) + "]";
         }
 
@@ -403,20 +508,29 @@ namespace hex::lang {
 
     class PatternDataStruct : public PatternData {
     public:
-        PatternDataStruct(u64 offset, size_t size, const std::string &name, std::endian endianess, const std::string &structName, const std::vector<PatternData*> & members, u32 color = 0)
-                : PatternData(Type::Struct, offset, size, name, endianess, color), m_structName(structName), m_members(members), m_sortedMembers(members) { }
+        PatternDataStruct(u64 offset, size_t size, const std::vector<PatternData*> & members, u32 color = 0)
+                : PatternData(offset, size, color), m_members(members), m_sortedMembers(members) { }
+
+        PatternDataStruct(const PatternDataStruct &other) : PatternData(other.getOffset(), other.getSize(), other.getColor()) {
+            for (const auto &member : other.m_members)
+                this->m_members.push_back(member->clone());
+        }
+
+        PatternData* clone() override {
+            return new PatternDataStruct(*this);
+        }
 
         void createEntry(prv::Provider* &provider) override {
             ImGui::TableNextRow();
             ImGui::TableNextColumn();
-            bool open = ImGui::TreeNodeEx(this->getName().c_str(), ImGuiTreeNodeFlags_SpanFullWidth);
+            bool open = ImGui::TreeNodeEx(this->getVariableName().c_str(), ImGuiTreeNodeFlags_SpanFullWidth);
             ImGui::TableNextColumn();
             ImGui::TableNextColumn();
-            ImGui::Text("0x%08lx : 0x%08lx", this->getOffset(), this->getOffset() + this->getSize() - 1);
+            ImGui::Text("0x%08llx : 0x%08llx", this->getOffset(), this->getOffset() + this->getSize() - 1);
             ImGui::TableNextColumn();
-            ImGui::Text("0x%04lx", this->getSize());
+            ImGui::Text("0x%04llx", this->getSize());
             ImGui::TableNextColumn();
-            ImGui::TextColored(ImColor(0xFFD69C56), "struct"); ImGui::SameLine(); ImGui::Text("%s", this->m_structName.c_str());
+            ImGui::TextColored(ImColor(0xFFD69C56), "struct"); ImGui::SameLine(); ImGui::Text("%s", this->getTypeName().c_str());
             ImGui::TableNextColumn();
             ImGui::Text("%s", "{ ... }");
 
@@ -438,6 +552,16 @@ namespace hex::lang {
             return { };
         }
 
+        std::map<u64, u32> getHighlightedAddresses() override {
+            if (this->m_highlightedAddresses.empty()) {
+                for (auto &member : this->m_members) {
+                    this->m_highlightedAddresses.merge(member->getHighlightedAddresses());
+                }
+            }
+
+            return this->m_highlightedAddresses;
+        }
+
         void sort(ImGuiTableSortSpecs *sortSpecs, prv::Provider *provider) override {
             this->m_sortedMembers = this->m_members;
 
@@ -449,32 +573,44 @@ namespace hex::lang {
                 member->sort(sortSpecs, provider);
         }
 
-        std::string getTypeName() override {
-            return "struct " + this->m_structName;
+        [[nodiscard]] std::string getFormattedName() const override {
+            return "struct " + PatternData::getTypeName();
+        }
+
+        const auto& getMembers() const {
+            return this->m_members;
         }
 
     private:
-        std::string m_structName;
         std::vector<PatternData*> m_members;
         std::vector<PatternData*> m_sortedMembers;
     };
 
     class PatternDataUnion : public PatternData {
     public:
-        PatternDataUnion(u64 offset, size_t size, const std::string &name, const std::string &unionName, const std::vector<PatternData*> & members, std::endian endianess, u32 color = 0)
-                : PatternData(Type::Union, offset, size, name, endianess, color), m_unionName(unionName), m_members(members), m_sortedMembers(members) { }
+        PatternDataUnion(u64 offset, size_t size, const std::vector<PatternData*> & members, u32 color = 0)
+                : PatternData(offset, size, color), m_members(members), m_sortedMembers(members) { }
+
+        PatternDataUnion(const PatternDataUnion &other) : PatternData(other.getOffset(), other.getSize(), other.getColor()) {
+            for (const auto &member : other.m_members)
+                this->m_members.push_back(member->clone());
+        }
+
+        PatternData* clone() override {
+            return new PatternDataUnion(*this);
+        }
 
         void createEntry(prv::Provider* &provider) override {
             ImGui::TableNextRow();
             ImGui::TableNextColumn();
-            bool open = ImGui::TreeNodeEx(this->getName().c_str(), ImGuiTreeNodeFlags_SpanFullWidth);
+            bool open = ImGui::TreeNodeEx(this->getVariableName().c_str(), ImGuiTreeNodeFlags_SpanFullWidth);
             ImGui::TableNextColumn();
             ImGui::TableNextColumn();
-            ImGui::Text("0x%08lx : 0x%08lx", this->getOffset(), this->getOffset() + this->getSize() - 1);
+            ImGui::Text("0x%08llx : 0x%08llx", this->getOffset(), this->getOffset() + this->getSize() - 1);
             ImGui::TableNextColumn();
-            ImGui::Text("0x%04lx", this->getSize());
+            ImGui::Text("0x%04llx", this->getSize());
             ImGui::TableNextColumn();
-            ImGui::TextColored(ImColor(0xFFD69C56), "union"); ImGui::SameLine(); ImGui::Text("%s", this->m_unionName.c_str());
+            ImGui::TextColored(ImColor(0xFFD69C56), "union"); ImGui::SameLine(); ImGui::Text("%s", PatternData::getTypeName().c_str());
 
             ImGui::TableNextColumn();
             ImGui::Text("%s", "{ ... }");
@@ -497,6 +633,16 @@ namespace hex::lang {
             return { };
         }
 
+        std::map<u64, u32> getHighlightedAddresses() override {
+            if (this->m_highlightedAddresses.empty()) {
+                for (auto &member : this->m_members) {
+                    this->m_highlightedAddresses.merge(member->getHighlightedAddresses());
+                }
+            }
+
+            return this->m_highlightedAddresses;
+        }
+
         void sort(ImGuiTableSortSpecs *sortSpecs, prv::Provider *provider) override {
             this->m_sortedMembers = this->m_members;
 
@@ -508,104 +654,132 @@ namespace hex::lang {
                 member->sort(sortSpecs, provider);
         }
 
-        std::string getTypeName() override {
-            return "union " + this->m_unionName;
+        [[nodiscard]] std::string getFormattedName() const override {
+            return "union " + PatternData::getTypeName();;
+        }
+
+        const auto& getMembers() const {
+            return this->m_members;
         }
 
     private:
-        std::string m_unionName;
         std::vector<PatternData*> m_members;
         std::vector<PatternData*> m_sortedMembers;
     };
 
     class PatternDataEnum : public PatternData {
     public:
-        PatternDataEnum(u64 offset, size_t size, const std::string &name, const std::string &enumName, std::vector<std::pair<u64, std::string>> enumValues, std::endian endianess, u32 color = 0)
-            : PatternData(Type::Enum, offset, size, name, endianess, color), m_enumName(enumName), m_enumValues(enumValues) { }
+        PatternDataEnum(u64 offset, size_t size, std::vector<std::pair<Token::IntegerLiteral, std::string>> enumValues, u32 color = 0)
+            : PatternData(offset, size, color), m_enumValues(std::move(enumValues)) { }
+
+        PatternData* clone() override {
+            return new PatternDataEnum(*this);
+        }
 
         void createEntry(prv::Provider* &provider) override {
             u64 value = 0;
             provider->read(this->getOffset(), &value, this->getSize());
-            value = hex::changeEndianess(value, this->getSize(), this->m_endianess);
+            value = hex::changeEndianess(value, this->getSize(), this->getEndian());
 
-            std::string valueString = this->m_enumName + "::";
+            std::string valueString = PatternData::getTypeName() + "::";
 
             bool foundValue = false;
-            for (auto &[entryValue, entryName] : this->m_enumValues) {
-                if (value == entryValue) {
-                    valueString += entryName;
-                    foundValue = true;
+            for (auto &[entryValueLiteral, entryName] : this->m_enumValues) {
+                bool matches = std::visit([&, name = entryName](auto &&entryValue) {
+                    if (value == entryValue) {
+                        valueString += name;
+                        foundValue = true;
+                        return true;
+                    }
+
+                    return false;
+                }, entryValueLiteral.second);
+                if (matches)
                     break;
-                }
             }
 
             if (!foundValue)
                 valueString += "???";
 
             ImGui::TableNextRow();
-            ImGui::TreeNodeEx(this->getName().c_str(), ImGuiTreeNodeFlags_Leaf | ImGuiTreeNodeFlags_NoTreePushOnOpen | ImGuiTreeNodeFlags_SpanFullWidth);
+            ImGui::TreeNodeEx(this->getVariableName().c_str(), ImGuiTreeNodeFlags_Leaf | ImGuiTreeNodeFlags_NoTreePushOnOpen | ImGuiTreeNodeFlags_SpanFullWidth);
             ImGui::TableNextColumn();
             if (ImGui::Selectable(("##PatternDataLine"s + std::to_string(this->getOffset())).c_str(), false, ImGuiSelectableFlags_SpanAllColumns)) {
                 Region selectRegion = { this->getOffset(), this->getSize() };
                 View::postEvent(Events::SelectionChangeRequest, &selectRegion);
             }
             ImGui::SameLine();
-            ImGui::Text("%s", this->getName().c_str());
+            ImGui::Text("%s", this->getVariableName().c_str());
             ImGui::TableNextColumn();
-            ImGui::ColorButton("color", ImColor(this->getColor()), ImGuiColorEditFlags_NoTooltip, ImVec2(ImGui::GetColumnWidth(), 14));
+            ImGui::ColorButton("color", ImColor(this->getColor()), ImGuiColorEditFlags_NoTooltip, ImVec2(ImGui::GetColumnWidth(), ImGui::GetTextLineHeight()));
             ImGui::TableNextColumn();
-            ImGui::Text("0x%08lx : 0x%08lx", this->getOffset(), this->getOffset() + this->getSize() - 1);
+            ImGui::Text("0x%08llx : 0x%08llx", this->getOffset(), this->getOffset() + this->getSize() - 1);
             ImGui::TableNextColumn();
-            ImGui::Text("0x%04lx", this->getSize());
+            ImGui::Text("0x%04llx", this->getSize());
             ImGui::TableNextColumn();
-            ImGui::TextColored(ImColor(0xFFD69C56), "enum"); ImGui::SameLine(); ImGui::Text("%s", this->m_enumName.c_str());
+            ImGui::TextColored(ImColor(0xFFD69C56), "enum"); ImGui::SameLine(); ImGui::Text("%s", PatternData::getTypeName().c_str());
             ImGui::TableNextColumn();
             ImGui::Text("%s", hex::format("%s (0x%0*lx)", valueString.c_str(), this->getSize() * 2, value).c_str());
         }
 
-        std::string getTypeName() override {
-            return "enum " + this->m_enumName;
+        [[nodiscard]] std::string getFormattedName() const override {
+            return "enum " + PatternData::getTypeName();
+        }
+
+        const auto& getEnumValues() const {
+            return this->m_enumValues;
         }
 
     private:
-        std::string m_enumName;
-        std::vector<std::pair<u64, std::string>> m_enumValues;
+        std::vector<std::pair<Token::IntegerLiteral, std::string>> m_enumValues;
     };
 
     class PatternDataBitfield : public PatternData {
     public:
-        PatternDataBitfield(u64 offset, size_t size, const std::string &name, const std::string &bitfieldName, std::vector<std::pair<std::string, size_t>> fields, std::endian endianess, u32 color = 0)
-                : PatternData(Type::Enum, offset, size, name, endianess, color), m_bitfieldName(bitfieldName), m_fields(fields) { }
+        PatternDataBitfield(u64 offset, size_t size, std::vector<std::pair<std::string, size_t>> fields, u32 color = 0)
+                : PatternData(offset, size, color), m_fields(std::move(fields)) { }
+
+        PatternData* clone() override {
+            return new PatternDataBitfield(*this);
+        }
 
         void createEntry(prv::Provider* &provider) override {
-            u64 value = 0;
-            provider->read(this->getOffset(), &value, this->getSize());
-            value = hex::changeEndianess(value, this->getSize(), this->m_endianess);
+            std::vector<u8> value(this->getSize(), 0);
+            provider->read(this->getOffset(), &value[0], value.size());
+
+            if (this->m_endian == std::endian::big)
+                std::reverse(value.begin(), value.end());
 
             ImGui::TableNextRow();
             ImGui::TableNextColumn();
-            bool open = ImGui::TreeNodeEx(this->getName().c_str(), ImGuiTreeNodeFlags_SpanFullWidth);
+            bool open = ImGui::TreeNodeEx(this->getVariableName().c_str(), ImGuiTreeNodeFlags_SpanFullWidth);
             ImGui::TableNextColumn();
             ImGui::TableNextColumn();
-            ImGui::Text("0x%08lx : 0x%08lx", this->getOffset(), this->getOffset() + this->getSize() - 1);
+            ImGui::Text("0x%08llx : 0x%08llx", this->getOffset(), this->getOffset() + this->getSize() - 1);
             ImGui::TableNextColumn();
-            ImGui::Text("0x%04lx", this->getSize());
+            ImGui::Text("0x%04llx", this->getSize());
             ImGui::TableNextColumn();
-            ImGui::TextColored(ImColor(0xFFD69C56), "bitfield"); ImGui::SameLine(); ImGui::Text("%s", this->m_bitfieldName.c_str());
+            ImGui::TextColored(ImColor(0xFFD69C56), "bitfield"); ImGui::SameLine(); ImGui::Text("%s", PatternData::getTypeName().c_str());
             ImGui::TableNextColumn();
-            ImGui::Text("{ %llx }", value);
+
+            std::string valueString = "{ ";
+            for (u64 i = 0; i < value.size(); i++)
+                valueString += hex::format("%02x ", value[i]);
+            valueString += "}";
+
+            ImGui::TextUnformatted(valueString.c_str());
 
             if (open) {
                 u16 bitOffset = 0;
                 for (auto &[entryName, entrySize] : this->m_fields) {
                     ImGui::TableNextRow();
-                    ImGui::TreeNodeEx(this->getName().c_str(), ImGuiTreeNodeFlags_Leaf | ImGuiTreeNodeFlags_NoTreePushOnOpen | ImGuiTreeNodeFlags_SpanFullWidth);
+                    ImGui::TreeNodeEx(this->getVariableName().c_str(), ImGuiTreeNodeFlags_Leaf | ImGuiTreeNodeFlags_NoTreePushOnOpen | ImGuiTreeNodeFlags_SpanFullWidth);
                     ImGui::TableNextColumn();
                     ImGui::Text("%s", entryName.c_str());
                     ImGui::TableNextColumn();
-                    ImGui::ColorButton("color", ImColor(this->getColor()), ImGuiColorEditFlags_NoTooltip, ImVec2(ImGui::GetColumnWidth(), 14));
+                    ImGui::ColorButton("color", ImColor(this->getColor()), ImGuiColorEditFlags_NoTooltip, ImVec2(ImGui::GetColumnWidth(), ImGui::GetTextLineHeight()));
                     ImGui::TableNextColumn();
-                    ImGui::Text("0x%08lx : 0x%08lx", this->getOffset() + (bitOffset >> 3), this->getOffset() + ((bitOffset + entrySize) >> 3) - 1);
+                    ImGui::Text("0x%08llx : 0x%08llx", this->getOffset() + (bitOffset >> 3), this->getOffset() + ((bitOffset + entrySize) >> 3));
                     ImGui::TableNextColumn();
                     if (entrySize == 1)
                         ImGui::Text("%llu bit", entrySize);
@@ -614,7 +788,11 @@ namespace hex::lang {
                     ImGui::TableNextColumn();
                     ImGui::Text("%s", entryName.c_str());
                     ImGui::TableNextColumn();
-                    ImGui::Text("%llx", hex::extract((bitOffset + entrySize) - 1, bitOffset, value));
+                    {
+                        u128 fieldValue = 0;
+                        std::memcpy(&fieldValue, value.data() + (bitOffset / 8), (entrySize / 8) + 1);
+                        ImGui::Text("%llx", hex::extract((bitOffset + entrySize) - 1 - ((bitOffset / 8) * 8), bitOffset - ((bitOffset / 8) * 8), fieldValue));
+                    }
                     bitOffset += entrySize;
                 }
 
@@ -623,12 +801,15 @@ namespace hex::lang {
 
         }
 
-        std::string getTypeName() override {
-            return "bitfield " + this->m_bitfieldName;
+        [[nodiscard]] std::string getFormattedName() const override {
+            return "bitfield " + PatternData::getTypeName();
+        }
+
+        const auto& getFields() const {
+            return this->m_fields;
         }
 
     private:
-        std::string m_bitfieldName;
         std::vector<std::pair<std::string, size_t>> m_fields;
     };
 

include/lang/preprocessor.hpp

@@ -16,14 +16,20 @@ namespace hex::lang {
     public:
         Preprocessor();
 
-        std::pair<Result, std::string> preprocess(const std::string& code, bool initialRun = true);
+        std::optional<std::string> preprocess(const std::string& code, bool initialRun = true);
 
-        void addPragmaHandler(std::string pragmaType, std::function<bool(std::string)> function);
+        void addPragmaHandler(const std::string &pragmaType, const std::function<bool(const std::string&)> &function);
         void addDefaultPragmaHandlers();
 
         const std::pair<u32, std::string>& getError() { return this->m_error; }
 
     private:
+        using PreprocessorError = std::pair<u32, std::string>;
+
+        [[noreturn]] void throwPreprocessorError(std::string_view error, u32 lineNumber) const {
+            throw PreprocessorError(lineNumber, "Preprocessor: " + std::string(error));
+        }
+
         std::unordered_map<std::string, std::function<bool(std::string)>> m_pragmaHandlers;
 
         std::set<std::pair<std::string, std::string>> m_defines;

include/lang/result.hpp

@@ -1,21 +0,0 @@
-#pragma once
-
-#include <cstdint>
-
-namespace hex::lang {
-
-    class Result {
-    public:
-        constexpr Result(const std::uint8_t module, const std::uint32_t desc) noexcept : m_result((module << 24) | (desc & 0x00FFFFFF)) { }
-
-        constexpr std::uint32_t getResult() const noexcept { return this->m_result; }
-        constexpr std::uint8_t getModule() const noexcept { return this->m_result >> 24; }
-        constexpr std::uint32_t getDescription() const noexcept { return this->m_result & 0x00FFFFFF; }
-
-        constexpr bool succeeded() const noexcept { return this->m_result == 0; }
-        constexpr bool failed() const noexcept { return !succeeded(); }
-    private:
-        const std::uint32_t m_result;
-    };
-
-}

include/lang/results.hpp

@@ -1,14 +0,0 @@
-#pragma once
-
-#include "result.hpp"
-
-namespace hex::lang {
-
-    constexpr Result ResultSuccess(0, 0);
-
-    constexpr Result ResultPreprocessingError(1, 1);
-    constexpr Result ResultLexicalError(2, 1);
-    constexpr Result ResultParseError(3, 1);
-    constexpr Result ResultEvaluatorError(4, 1);
-
-}

include/lang/token.hpp

@@ -2,70 +2,242 @@
 
 #include <hex.hpp>
 
+#include "helpers/utils.hpp"
+
+#include <utility>
 #include <string>
+#include <variant>
 
 namespace hex::lang {
 
-    struct Token {
+    class Token {
+    public:
         enum class Type : u64 {
             Keyword,
-            Type,
+            ValueType,
             Operator,
             Integer,
             Identifier,
+            Separator
+        };
+
+        enum class Keyword {
+            Struct,
+            Union,
+            Using,
+            Enum,
+            Bitfield,
+            LittleEndian,
+            BigEndian,
+            If,
+            Else
+        };
+
+        enum class Operator {
+            AtDeclaration,
+            Assignment,
+            Inherit,
+            Plus,
+            Minus,
+            Star,
+            Slash,
+            ShiftLeft,
+            ShiftRight,
+            BitOr,
+            BitAnd,
+            BitXor,
+            BitNot,
+            BoolEquals,
+            BoolNotEquals,
+            BoolGreaterThan,
+            BoolLessThan,
+            BoolGreaterThanOrEquals,
+            BoolLessThanOrEquals,
+            BoolAnd,
+            BoolOr,
+            BoolXor,
+            BoolNot,
+            TernaryConditional
+        };
+
+        enum class ValueType {
+            Unsigned8Bit        = 0x10,
+            Signed8Bit          = 0x11,
+            Unsigned16Bit       = 0x20,
+            Signed16Bit         = 0x21,
+            Unsigned32Bit       = 0x40,
+            Signed32Bit         = 0x41,
+            Unsigned64Bit       = 0x80,
+            Signed64Bit         = 0x81,
+            Unsigned128Bit      = 0x100,
+            Signed128Bit        = 0x101,
+            Character           = 0x13,
+            Boolean             = 0x14,
+            Float               = 0x42,
+            Double              = 0x82,
+            CustomType          = 0x00,
+            Padding             = 0x1F,
+
+            Unsigned            = 0xFF00,
+            Signed              = 0xFF01,
+            FloatingPoint       = 0xFF02,
+            Integer             = 0xFF03,
+            Any                 = 0xFFFF
+        };
+
+        enum class Separator {
+            RoundBracketOpen,
+            RoundBracketClose,
+            CurlyBracketOpen,
+            CurlyBracketClose,
+            SquareBracketOpen,
+            SquareBracketClose,
+            Comma,
+            Dot,
+            ScopeResolution,
             EndOfExpression,
-            ScopeOpen,
-            ScopeClose,
-            ArrayOpen,
-            ArrayClose,
-            Separator,
             EndOfProgram
-        } type;
+        };
 
-        struct KeywordToken {
-            enum class Keyword {
-                Struct,
-                Union,
-                Using,
-                Enum,
-                Bitfield,
-                LittleEndian,
-                BigEndian
-            } keyword;
-        } keywordToken;
-        struct IdentifierToken {
-            std::string identifier;
-        } identifierToken;
-        struct OperatorToken {
-            enum class Operator {
-                AtDeclaration,
-                Assignment,
-                Inherit,
-                Star
-            } op;
-        } operatorToken;
-        struct IntegerToken {
-            s128 integer;
-        } integerToken;
-        struct TypeToken {
-            enum class Type {
-                Unsigned8Bit        = 0x10,
-                Signed8Bit          = 0x11,
-                Unsigned16Bit       = 0x20,
-                Signed16Bit         = 0x21,
-                Unsigned32Bit       = 0x40,
-                Signed32Bit         = 0x41,
-                Unsigned64Bit       = 0x80,
-                Signed64Bit         = 0x81,
-                Unsigned128Bit      = 0x100,
-                Signed128Bit        = 0x101,
-                Float               = 0x42,
-                Double              = 0x82,
-                CustomType          = 0x00,
-                Padding             = 0x1F
-            } type;
-        } typeToken;
+        using IntegerLiteral = std::pair<ValueType, std::variant<u8, s8, u16, s16, u32, s32, u64, s64, u128, s128, float, double>>;
+        using ValueTypes = std::variant<Keyword, std::string, Operator, IntegerLiteral, ValueType, Separator>;
 
+        Token(Type type, auto value, u32 lineNumber) : type(type), value(value), lineNumber(lineNumber) {
+
+        }
+
+        [[nodiscard]] constexpr static inline bool isUnsigned(const ValueType type) {
+            return (static_cast<u32>(type) & 0x0F) == 0x00;
+        }
+
+        [[nodiscard]] constexpr static inline bool isSigned(const ValueType type) {
+            return (static_cast<u32>(type) & 0x0F) == 0x01;
+        }
+
+        [[nodiscard]] constexpr static inline bool isFloatingPoint(const ValueType type) {
+            return (static_cast<u32>(type) & 0x0F) == 0x02;
+        }
+
+        [[nodiscard]] constexpr static inline u32 getTypeSize(const ValueType type) {
+            return static_cast<u32>(type) >> 4;
+        }
+
+        [[nodiscard]] constexpr static auto getTypeName(const lang::Token::ValueType type) {
+            switch (type) {
+                case ValueType::Signed8Bit:     return "s8";
+                case ValueType::Signed16Bit:    return "s16";
+                case ValueType::Signed32Bit:    return "s32";
+                case ValueType::Signed64Bit:    return "s64";
+                case ValueType::Signed128Bit:   return "s128";
+                case ValueType::Unsigned8Bit:   return "u8";
+                case ValueType::Unsigned16Bit:  return "u16";
+                case ValueType::Unsigned32Bit:  return "u32";
+                case ValueType::Unsigned64Bit:  return "u64";
+                case ValueType::Unsigned128Bit: return "u128";
+                case ValueType::Float:          return "float";
+                case ValueType::Double:         return "double";
+                case ValueType::Character:      return "char";
+                default:                        return "< ??? >";
+            }
+        }
+
+        bool operator==(const ValueTypes &other) const {
+            if (this->type == Type::Integer || this->type == Type::Identifier)
+                return true;
+            else if (this->type == Type::ValueType) {
+                auto otherValueType =   std::get_if<ValueType>(&other);
+                auto valueType =        std::get_if<ValueType>(&this->value);
+
+                if (otherValueType == nullptr) return false;
+                if (valueType == nullptr) return false;
+
+                if (*otherValueType == *valueType)
+                    return true;
+                else if (*otherValueType == ValueType::Any)
+                    return *valueType != ValueType::CustomType && *valueType != ValueType::Padding;
+                else if (*otherValueType == ValueType::Unsigned)
+                    return isUnsigned(*valueType);
+                else if (*otherValueType == ValueType::Signed)
+                    return isSigned(*valueType);
+                else if (*otherValueType == ValueType::FloatingPoint)
+                    return isFloatingPoint(*valueType);
+                else if (*otherValueType == ValueType::Integer)
+                    return isUnsigned(*valueType) || isSigned(*valueType);
+            }
+            else
+                return other == this->value;
+
+            return false;
+        }
+
+        bool operator!=(const ValueTypes &other) const {
+            return !operator==(other);
+        }
+
+        Type type;
+        ValueTypes value;
         u32 lineNumber;
+
     };
-}
+
+}
+
+#define COMPONENT(type, value) hex::lang::Token::Type::type, hex::lang::Token::type::value
+
+#define KEYWORD_STRUCT                      COMPONENT(Keyword, Struct)
+#define KEYWORD_UNION                       COMPONENT(Keyword, Union)
+#define KEYWORD_USING                       COMPONENT(Keyword, Using)
+#define KEYWORD_ENUM                        COMPONENT(Keyword, Enum)
+#define KEYWORD_BITFIELD                    COMPONENT(Keyword, Bitfield)
+#define KEYWORD_LE                          COMPONENT(Keyword, LittleEndian)
+#define KEYWORD_BE                          COMPONENT(Keyword, BigEndian)
+#define KEYWORD_IF                          COMPONENT(Keyword, If)
+#define KEYWORD_ELSE                        COMPONENT(Keyword, Else)
+
+#define INTEGER                             hex::lang::Token::Type::Integer, hex::lang::Token::IntegerLiteral(hex::lang::Token::ValueType::Any, u64(0))
+#define IDENTIFIER                          hex::lang::Token::Type::Identifier, ""
+
+#define OPERATOR_AT                         COMPONENT(Operator, AtDeclaration)
+#define OPERATOR_ASSIGNMENT                 COMPONENT(Operator, Assignment)
+#define OPERATOR_INHERIT                    COMPONENT(Operator, Inherit)
+#define OPERATOR_PLUS                       COMPONENT(Operator, Plus)
+#define OPERATOR_MINUS                      COMPONENT(Operator, Minus)
+#define OPERATOR_STAR                       COMPONENT(Operator, Star)
+#define OPERATOR_SLASH                      COMPONENT(Operator, Slash)
+#define OPERATOR_SHIFTLEFT                  COMPONENT(Operator, ShiftLeft)
+#define OPERATOR_SHIFTRIGHT                 COMPONENT(Operator, ShiftRight)
+#define OPERATOR_BITOR                      COMPONENT(Operator, BitOr)
+#define OPERATOR_BITAND                     COMPONENT(Operator, BitAnd)
+#define OPERATOR_BITXOR                     COMPONENT(Operator, BitXor)
+#define OPERATOR_BITNOT                     COMPONENT(Operator, BitNot)
+#define OPERATOR_BOOLEQUALS                 COMPONENT(Operator, BoolEquals)
+#define OPERATOR_BOOLNOTEQUALS              COMPONENT(Operator, BoolNotEquals)
+#define OPERATOR_BOOLGREATERTHAN            COMPONENT(Operator, BoolGreaterThan)
+#define OPERATOR_BOOLLESSTHAN               COMPONENT(Operator, BoolLessThan)
+#define OPERATOR_BOOLGREATERTHANOREQUALS    COMPONENT(Operator, BoolGreaterThanOrEquals)
+#define OPERATOR_BOOLLESSTHANOREQUALS       COMPONENT(Operator, BoolLessThanOrEquals)
+#define OPERATOR_BOOLAND                    COMPONENT(Operator, BoolAnd)
+#define OPERATOR_BOOLOR                     COMPONENT(Operator, BoolOr)
+#define OPERATOR_BOOLXOR                    COMPONENT(Operator, BoolXor)
+#define OPERATOR_BOOLNOT                    COMPONENT(Operator, BoolNot)
+#define OPERATOR_TERNARYCONDITIONAL         COMPONENT(Operator, TernaryConditional)
+
+#define VALUETYPE_CUSTOMTYPE                COMPONENT(ValueType, CustomType)
+#define VALUETYPE_PADDING                   COMPONENT(ValueType, Padding)
+#define VALUETYPE_UNSIGNED                  COMPONENT(ValueType, Unsigned)
+#define VALUETYPE_SIGNED                    COMPONENT(ValueType, Signed)
+#define VALUETYPE_FLOATINGPOINT             COMPONENT(ValueType, FloatingPoint)
+#define VALUETYPE_INTEGER                   COMPONENT(ValueType, Integer)
+#define VALUETYPE_ANY                       COMPONENT(ValueType, Any)
+
+#define SEPARATOR_ROUNDBRACKETOPEN          COMPONENT(Separator, RoundBracketOpen)
+#define SEPARATOR_ROUNDBRACKETCLOSE         COMPONENT(Separator, RoundBracketClose)
+#define SEPARATOR_CURLYBRACKETOPEN          COMPONENT(Separator, CurlyBracketOpen)
+#define SEPARATOR_CURLYBRACKETCLOSE         COMPONENT(Separator, CurlyBracketClose)
+#define SEPARATOR_SQUAREBRACKETOPEN         COMPONENT(Separator, SquareBracketOpen)
+#define SEPARATOR_SQUAREBRACKETCLOSE        COMPONENT(Separator, SquareBracketClose)
+#define SEPARATOR_COMMA                     COMPONENT(Separator, Comma)
+#define SEPARATOR_DOT                       COMPONENT(Separator, Dot)
+#define SEPARATOR_SCOPE_RESOLUTION          COMPONENT(Separator, ScopeResolution)
+#define SEPARATOR_ENDOFEXPRESSION           COMPONENT(Separator, EndOfExpression)
+#define SEPARATOR_ENDOFPROGRAM              COMPONENT(Separator, EndOfProgram)

include/lang/validator.hpp

@@ -15,11 +15,19 @@ namespace hex::lang {
         Validator();
 
         bool validate(const std::vector<ASTNode*>& ast);
+        void printAST(const std::vector<ASTNode*>& ast);
 
         const std::pair<u32, std::string>& getError() { return this->m_error; }
 
     private:
         std::pair<u32, std::string> m_error;
+
+        using ValidatorError = std::pair<u32, std::string>;
+
+        [[noreturn]] void throwValidateError(std::string_view error, u32 lineNumber) const {
+            throw ValidatorError(lineNumber, error);
+        }
+
     };
 
 }

include/providers/file_provider.hpp

@@ -6,6 +6,14 @@
 
 #include <sys/stat.h>
 
+#if defined(OS_WINDOWS)
+#include <windows.h>
+#else
+#include <sys/mman.h>
+#include <unistd.h>
+#include <sys/fcntl.h>
+#endif
+
 namespace hex::prv {
 
     class FileProvider : public Provider {
@@ -27,8 +35,15 @@ namespace hex::prv {
         std::vector<std::pair<std::string, std::string>> getDataInformation() override;
 
     private:
-        FILE *m_file;
+        #if defined(OS_WINDOWS)
+        HANDLE m_file;
+        HANDLE m_mapping;
+        #else
+        int m_file;
+        #endif
         std::string m_path;
+        void *m_mappedFile;
+        size_t m_fileSize;
 
         bool m_fileStatsValid = false;
         struct stat m_fileStats = { 0 };

include/providers/provider.hpp

@@ -1,70 +0,0 @@
-#pragma once
-
-#include <hex.hpp>
-
-#include <cmath>
-#include <concepts>
-#include <map>
-#include <optional>
-#include <string>
-#include <vector>
-
-namespace hex::prv {
-
-    class Provider {
-    public:
-        constexpr static size_t PageSize = 0x1000'0000;
-
-        Provider() {
-            this->m_patches.emplace_back();
-        }
-
-        virtual ~Provider() = default;
-
-        virtual bool isAvailable() = 0;
-        virtual bool isReadable() = 0;
-        virtual bool isWritable() = 0;
-
-        virtual void read(u64 offset, void *buffer, size_t size) { this->readRaw(offset, buffer, size); }
-        virtual void write(u64 offset, const void *buffer, size_t size) { this->writeRaw(offset, buffer, size); }
-
-        virtual void readRaw(u64 offset, void *buffer, size_t size) = 0;
-        virtual void writeRaw(u64 offset, const void *buffer, size_t size) = 0;
-        virtual size_t getActualSize() = 0;
-
-        std::map<u64, u8>& getPatches() { return this->m_patches.back(); }
-        void applyPatches() {
-            for (auto &[patchAddress, patch] : this->m_patches.back())
-                this->writeRaw(patchAddress, &patch, 1);
-        }
-
-        u32 getPageCount() { return std::ceil(this->getActualSize() / double(PageSize)); }
-        u32 getCurrentPage() const { return this->m_currPage; }
-        void setCurrentPage(u32 page) { if (page < getPageCount()) this->m_currPage = page; }
-
-        virtual size_t getBaseAddress() {
-            return PageSize * this->m_currPage;
-        }
-
-        virtual size_t getSize() {
-            return std::min(this->getActualSize() - PageSize * this->m_currPage, PageSize);
-        }
-
-        virtual std::optional<u32> getPageOfAddress(u64 address) {
-            u32 page = std::floor(address / double(PageSize));
-
-            if (page >= this->getPageCount())
-                return { };
-
-            return page;
-        }
-
-        virtual std::vector<std::pair<std::string, std::string>> getDataInformation() = 0;
-
-    protected:
-        u32 m_currPage = 0;
-
-        std::vector<std::map<u64, u8>> m_patches;
-    };
-
-}

include/views/view.hpp

@@ -1,90 +0,0 @@
-#pragma once
-
-#include <hex.hpp>
-
-#include "imgui.h"
-
-#include "helpers/event.hpp"
-
-#include <functional>
-#include <string>
-#include <vector>
-
-
-namespace hex {
-
-    class View {
-    public:
-        View(std::string viewName) : m_viewName(viewName) { }
-        virtual ~View() { }
-
-        virtual void createView() = 0;
-        virtual void createMenu() { }
-        virtual bool handleShortcut(int key, int mods) { return false; }
-
-        static std::vector<std::function<void()>>& getDeferedCalls() {
-            return View::s_deferedCalls;
-        }
-
-        static void postEvent(Events eventType, const void *userData = nullptr) {
-            View::s_eventManager.post(eventType, userData);
-        }
-
-        static void drawCommonInterfaces() {
-            if (ImGui::BeginPopupModal("Error", nullptr, ImGuiWindowFlags_NoResize)) {
-                ImGui::NewLine();
-                if (ImGui::BeginChild("##scrolling", ImVec2(300, 100))) {
-                    ImGui::SetCursorPosX((300 - ImGui::CalcTextSize(View::s_errorMessage.c_str(), nullptr, false).x) / 2.0F);
-                    ImGui::TextWrapped("%s", View::s_errorMessage.c_str());
-                    ImGui::EndChild();
-                }
-                ImGui::NewLine();
-                ImGui::SetCursorPosX(75);
-                if (ImGui::Button("Okay", ImVec2(150, 20)))
-                    ImGui::CloseCurrentPopup();
-                ImGui::EndPopup();
-            }
-        }
-
-        static void showErrorPopup(std::string_view errorMessage) {
-            View::s_errorMessage = errorMessage;
-
-            ImGui::OpenPopup("Error");
-        }
-
-        virtual bool hasViewMenuItemEntry() { return true; }
-
-        bool& getWindowOpenState() {
-            return this->m_windowOpen;
-        }
-
-        const std::string getName() const {
-            return this->m_viewName;
-        }
-
-    protected:
-        void subscribeEvent(Events eventType, std::function<void(const void*)> callback) {
-            View::s_eventManager.subscribe(eventType, this, callback);
-        }
-
-        void unsubscribeEvent(Events eventType) {
-            View::s_eventManager.unsubscribe(eventType, this);
-        }
-
-        void doLater(std::function<void()> &&function) {
-            View::s_deferedCalls.push_back(function);
-        }
-
-
-
-    private:
-        std::string m_viewName;
-        bool m_windowOpen = false;
-
-        static inline EventManager s_eventManager;
-        static inline std::vector<std::function<void()>> s_deferedCalls;
-
-        static inline std::string s_errorMessage;
-    };
-
-}

include/views/view_bookmarks.hpp

@@ -13,15 +13,13 @@ namespace hex {
 
     class ViewBookmarks : public View {
     public:
-        explicit ViewBookmarks(prv::Provider* &dataProvider);
+        explicit ViewBookmarks();
         ~ViewBookmarks() override;
 
-        void createView() override;
-        void createMenu() override;
+        void drawContent() override;
+        void drawMenu() override;
 
     private:
-        prv::Provider* &m_dataProvider;
-
         std::list<Bookmark> m_bookmarks;
     };
 

include/views/view_command_palette.hpp

@@ -0,0 +1,40 @@
+#pragma once
+
+#include <hex.hpp>
+
+#include "imgui.h"
+#include "views/view.hpp"
+#include "lang/pattern_data.hpp"
+
+#include <vector>
+#include <tuple>
+#include <cstdio>
+
+namespace hex {
+
+    namespace prv { class Provider; }
+
+    class ViewCommandPalette : public View {
+    public:
+        ViewCommandPalette();
+        ~ViewCommandPalette() override;
+
+        void drawContent() override;
+        void drawMenu() override;
+
+        bool handleShortcut(int key, int mods) override;
+
+        bool hasViewMenuItemEntry() override { return false; }
+        ImVec2 getMinSize() override { return ImVec2(400, 100); }
+        ImVec2 getMaxSize() override { return ImVec2(400, 100); }
+
+    private:
+        bool m_justOpened = false;
+        std::vector<char> m_commandBuffer;
+        std::vector<std::string> m_lastResults;
+        std::string m_exactResult;
+
+        std::vector<std::string> getCommandResults(std::string_view command);
+    };
+
+}

include/views/view_data_inspector.hpp

@@ -32,7 +32,7 @@ namespace hex {
         u8 utf8Char[4];
         float float32;
         double float64;
-        #if defined(_WIN64)
+        #if defined(OS_WINDOWS) && defined(ARCH_64_BIT)
             __time32_t time32;
             __time64_t time64;
         #else
@@ -41,23 +41,37 @@ namespace hex {
         GUID guid;
     };
 
+    struct CachedData {
+        CachedData(std::string name, std::string value, size_t size) : name(name), value(value), size(size) { }
+
+        std::string name;
+        std::string value;
+        size_t size;
+    };
+
+    enum class NumberDisplayStyle {
+        Decimal,
+        Hexadecimal,
+        Octal
+    };
+
     class ViewDataInspector : public View {
     public:
-        explicit ViewDataInspector(prv::Provider* &dataProvider);
+        explicit ViewDataInspector();
         ~ViewDataInspector() override;
 
-        void createView() override;
-        void createMenu() override;
+        void drawContent() override;
+        void drawMenu() override;
 
     private:
-        prv::Provider* &m_dataProvider;
         bool m_shouldInvalidate = true;
 
-        std::endian m_endianess = std::endian::native;
+        std::endian m_endian = std::endian::native;
+        NumberDisplayStyle m_numberDisplayStyle = NumberDisplayStyle::Decimal;
 
         PreviewData m_previewData = { 0 };
         size_t m_validBytes = 0;
-        std::vector<std::pair<std::string, std::string>> m_cachedData;
+        std::vector<CachedData> m_cachedData;
     };
 
 }

include/views/view_disassembler.hpp

@@ -24,14 +24,13 @@ namespace hex {
 
     class ViewDisassembler : public View {
     public:
-        explicit ViewDisassembler(prv::Provider* &dataProvider);
+        explicit ViewDisassembler();
         ~ViewDisassembler() override;
 
-        void createView() override;
-        void createMenu() override;
+        void drawContent() override;
+        void drawMenu() override;
 
     private:
-        prv::Provider* &m_dataProvider;
         bool m_shouldInvalidate = false;
 
         u64 m_baseAddress = 0;

include/views/view_hashes.hpp

@@ -10,15 +10,13 @@ namespace hex {
 
     class ViewHashes : public View {
     public:
-        explicit ViewHashes(prv::Provider* &dataProvider);
+        explicit ViewHashes();
         ~ViewHashes() override;
 
-        void createView() override;
-        void createMenu() override;
+        void drawContent() override;
+        void drawMenu() override;
 
     private:
-        prv::Provider* &m_dataProvider;
-
         bool m_shouldInvalidate = true;
         int m_currHashFunction = 0;
         u64 m_hashRegion[2] = { 0 };

include/views/view_help.hpp

@@ -19,8 +19,8 @@ namespace hex {
         ViewHelp();
         ~ViewHelp() override;
 
-        void createView() override;
-        void createMenu() override;
+        void drawContent() override;
+        void drawMenu() override;
 
         bool hasViewMenuItemEntry() override { return false; }
 

include/views/view_hexeditor.hpp

@@ -20,19 +20,19 @@ namespace hex {
 
     class ViewHexEditor : public View {
     public:
-        ViewHexEditor(prv::Provider* &dataProvider, std::vector<lang::PatternData*> &patternData);
+        ViewHexEditor(std::vector<lang::PatternData*> &patternData);
         ~ViewHexEditor() override;
 
-        void createView() override;
-        void createMenu() override;
+        void drawContent() override;
+        void drawMenu() override;
         bool handleShortcut(int key, int mods) override;
 
     private:
         MemoryEditor m_memoryEditor;
         imgui_addons::ImGuiFileBrowser m_fileBrowser;
 
-        prv::Provider* &m_dataProvider;
         std::vector<lang::PatternData*> &m_patternData;
+        std::map<u64, u32> m_highlightedBytes;
 
         char m_searchStringBuffer[0xFFFF] = { 0 };
         char m_searchHexBuffer[0xFFFF] = { 0 };

include/views/view_information.hpp

@@ -13,15 +13,13 @@ namespace hex {
 
     class ViewInformation : public View {
     public:
-        explicit ViewInformation(prv::Provider* &dataProvider);
+        explicit ViewInformation();
         ~ViewInformation() override;
 
-        void createView() override;
-        void createMenu() override;
+        void drawContent() override;
+        void drawMenu() override;
 
     private:
-        prv::Provider* &m_dataProvider;
-
         bool m_dataValid = false;
         u32 m_blockSize = 0;
         float m_averageEntropy = 0;

include/views/view_patches.hpp

@@ -13,16 +13,13 @@ namespace hex {
 
     class ViewPatches : public View {
     public:
-        explicit ViewPatches(prv::Provider* &dataProvider);
+        explicit ViewPatches();
         ~ViewPatches() override;
 
-        void createView() override;
-        void createMenu() override;
+        void drawContent() override;
+        void drawMenu() override;
 
     private:
-        prv::Provider* &m_dataProvider;
-
-
         u64 m_selectedPatch;
     };
 

include/views/view_pattern.hpp

@@ -7,9 +7,9 @@
 
 #include "providers/provider.hpp"
 
-#include <concepts>
 #include <cstring>
 #include <filesystem>
+#include <thread>
 
 #include "ImGuiFileBrowser.h"
 #include "TextEditor.h"
@@ -18,15 +18,14 @@ namespace hex {
 
     class ViewPattern : public View {
     public:
-        explicit ViewPattern(prv::Provider* &dataProvider, std::vector<lang::PatternData*> &patternData);
+        explicit ViewPattern(std::vector<lang::PatternData*> &patternData);
         ~ViewPattern() override;
 
-        void createMenu() override;
-        void createView() override;
+        void drawMenu() override;
+        void drawContent() override;
 
     private:
         std::vector<lang::PatternData*> &m_patternData;
-        prv::Provider* &m_dataProvider;
         std::filesystem::path m_possiblePatternFile;
 
         TextEditor m_textEditor;

include/views/view_pattern_data.hpp

@@ -16,15 +16,14 @@ namespace hex {
 
     class ViewPatternData : public View {
     public:
-        ViewPatternData(prv::Provider* &dataProvider, std::vector<lang::PatternData*> &patternData);
+        ViewPatternData(std::vector<lang::PatternData*> &patternData);
         ~ViewPatternData() override;
 
-        void createView() override;
-        void createMenu() override;
+        void drawContent() override;
+        void drawMenu() override;
 
     private:
 
-        prv::Provider* &m_dataProvider;
         std::vector<lang::PatternData*> &m_patternData;
         std::vector<lang::PatternData*> m_sortedPatternData;
     };

include/views/view_strings.hpp

@@ -17,14 +17,13 @@ namespace hex {
 
     class ViewStrings : public View {
     public:
-        explicit ViewStrings(prv::Provider* &dataProvider);
+        explicit ViewStrings();
         ~ViewStrings() override;
 
-        void createView() override;
-        void createMenu() override;
+        void drawContent() override;
+        void drawMenu() override;
 
     private:
-        prv::Provider* &m_dataProvider;
         bool m_shouldInvalidate = false;
 
         std::vector<FoundString> m_foundStrings;

include/views/view_tools.hpp

@@ -15,15 +15,13 @@ namespace hex {
 
     class ViewTools : public View {
     public:
-        ViewTools(hex::prv::Provider* &provider);
+        ViewTools();
         ~ViewTools() override;
 
-        void createView() override;
-        void createMenu() override;
+        void drawContent() override;
+        void drawMenu() override;
 
     private:
-        hex::prv::Provider* &m_dataProvider;
-
         char *m_mangledBuffer = nullptr;
         std::string m_demangledName;
 

include/window.hpp

@@ -1,9 +1,10 @@
 #pragma once
 
-#include <concepts>
+#include <filesystem>
 #include <memory>
 #include <vector>
 
+#include "helpers/utils.hpp"
 #include "views/view.hpp"
 
 struct GLFWwindow;
@@ -18,7 +19,7 @@ namespace hex {
 
         void loop();
 
-        template<std::derived_from<View> T, typename ... Args>
+        template<derived_from<View> T, typename ... Args>
         T* addView(Args&& ... args) {
             this->m_views.emplace_back(new T(std::forward<Args>(args)...));
 
@@ -30,17 +31,22 @@ namespace hex {
         friend void ImHexSettingsHandler_ApplyAll(ImGuiContext *ctx, ImGuiSettingsHandler *handler);
         friend void ImHexSettingsHandler_WriteAll(ImGuiContext* ctx, ImGuiSettingsHandler *handler, ImGuiTextBuffer *buf);
 
+        bool setFont(const std::filesystem::path &font_path);
+
     private:
         void frameBegin();
         void frameEnd();
 
         void initGLFW();
         void initImGui();
+        void initPlugins();
         void deinitGLFW();
         void deinitImGui();
+        void deinitPlugins();
 
         GLFWwindow* m_window;
         std::vector<View*> m_views;
+        std::vector<View*> m_pluginViews;
 
         float m_globalScale = 1.0f, m_fontScale = 1.0f;
         bool m_fpsVisible = false;

msys2/PKGBUILD

@@ -0,0 +1,46 @@
+_realname=ImHex
+pkgbase=mingw-w64-${_realname}
+pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
+pkgver=ci
+pkgrel=1
+pkgdesc="${_realname}: a Hex Editor for Reverse Engineers, Programmers and people that value their eye sight when working at 3 AM (mingw-w64)"
+arch=('any')
+url="https://github.com/WerWolv/ImHex"
+license=('GPLv2')
+depends=("${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-make"
+             "${MINGW_PACKAGE_PREFIX}-capstone"
+             "${MINGW_PACKAGE_PREFIX}-glfw"
+             "${MINGW_PACKAGE_PREFIX}-glm"
+             "${MINGW_PACKAGE_PREFIX}-file"
+             "${MINGW_PACKAGE_PREFIX}-nlohmann-json"
+             "${MINGW_PACKAGE_PREFIX}-openssl"
+             "${MINGW_PACKAGE_PREFIX}-polly"
+             "${MINGW_PACKAGE_PREFIX}-python"
+             "${MINGW_PACKAGE_PREFIX}-freetype")
+
+source=()
+sha256sums=()
+
+build() {
+  cd "${srcdir}"/../..
+  mkdir build
+  cd build
+  export BUILD_TYPE='Release'
+  MSYS2_ARG_CONV_EXCL=- cmake \
+    -G "MinGW Makefiles" \
+    -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
+    ../
+  mingw32-make
+}
+
+package() {
+  cd "${srcdir}"/../../build
+  mingw32-make DESTDIR="${pkgdir}" install
+
+  _licenses="${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}"
+  mkdir -p "${_licenses}"
+  install -m 644 ../LICENSE "${_licenses}"
+}

plugins/example/CMakeLists.txt

@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 3.16)
+project(example)
+
+set(CMAKE_CXX_STANDARD 20)
+
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../libimhex ${CMAKE_CURRENT_BINARY_DIR}/plugins/libimhex)
+
+set(CMAKE_SHARED_LIBRARY_PREFIX "plugin")
+
+add_library(example SHARED
+        source/plugin_example.cpp
+)
+
+target_include_directories(example PRIVATE include)
+target_link_libraries(example PRIVATE libimhex)

plugins/example/source/plugin_example.cpp

@@ -0,0 +1,32 @@
+#include <plugin.hpp>
+
+#include <views/view.hpp>
+
+class ViewExample : public hex::View {
+public:
+    ViewExample() : hex::View("Example") {}
+    ~ViewExample() override {}
+
+    void drawContent() override {
+        if (ImGui::Begin("Example")) {
+            ImGui::Text("Custom plugin window");
+        }
+        ImGui::End();
+    }
+};
+
+IMHEX_PLUGIN {
+
+    View* createView() {
+        return new ViewExample();
+    }
+
+    void drawToolsEntry() {
+        if (ImGui::CollapsingHeader("Example Tool")) {
+            ImGui::Text("Custom Plugin tool");
+        }
+    }
+
+}
+
+

plugins/libimhex/CMakeLists.txt

@@ -0,0 +1,22 @@
+cmake_minimum_required(VERSION 3.16)
+project(libimhex)
+
+set(CMAKE_CXX_STANDARD 20)
+
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../external/ImGui ${CMAKE_CURRENT_BINARY_DIR}/external/ImGui)
+
+if (WIN32)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libstdc++ -static-libgcc -static")
+endif()
+
+add_library(libimhex STATIC
+        source/helpers/event.cpp
+        source/helpers/utils.cpp
+
+        source/providers/provider.cpp
+
+        source/views/view.cpp
+        )
+
+target_include_directories(libimhex PUBLIC include)
+target_link_libraries(libimhex PUBLIC imgui)

plugins/libimhex/include/helpers/event.hpp

@@ -0,0 +1,38 @@
+#pragma once
+
+#include <vector>
+#include <functional>
+
+namespace hex {
+
+    enum class Events {
+        FileLoaded,
+        DataChanged,
+        PatternChanged,
+        FileDropped,
+        WindowClosing,
+        RegionSelected,
+
+        SelectionChangeRequest,
+
+        AddBookmark,
+        AppendPatternLanguageCode,
+
+        ProjectFileStore,
+        ProjectFileLoad
+    };
+
+    struct EventHandler {
+        void *owner;
+        Events eventType;
+        std::function<void(const void*)> callback;
+    };
+
+    class EventManager {
+    public:
+        static void post(Events eventType, const void *userData);
+        static void subscribe(Events eventType, void *owner, std::function<void(const void*)> callback);
+        static void unsubscribe(Events eventType, void *sender);
+    };
+
+}

plugins/libimhex/include/helpers/shared_data.hpp

@@ -0,0 +1,71 @@
+#pragma once
+
+#include <functional>
+#include <vector>
+
+#include <helpers/event.hpp>
+#include <imgui.h>
+
+namespace hex { class SharedData; }
+
+namespace hex::plugin::internal {
+    void initializePlugin(SharedData &sharedData);
+}
+
+namespace hex {
+
+    namespace prv { class Provider; }
+
+    class SharedData {
+        SharedData() = default;
+    public:
+        SharedData(const SharedData&) = delete;
+        SharedData(SharedData&&) = delete;
+
+        static auto& get() {
+            static SharedData instance;
+
+            return instance;
+        }
+
+        friend void hex::plugin::internal::initializePlugin(SharedData &sharedData);
+        friend class Window;
+
+    private:
+
+        void initializeData() {
+            static std::vector<EventHandler> eventHandlersStorage;
+            static std::vector<std::function<void()>> deferredCallsStorage;
+            static prv::Provider *currentProviderStorage;
+            static ImVec2 windowPosStorage, windowSizeStorage;
+
+            this->imguiContext      = ImGui::GetCurrentContext();
+            this->eventHandlers     = &eventHandlersStorage;
+            this->deferredCalls     = &deferredCallsStorage;
+            this->currentProvider   = &currentProviderStorage;
+
+            this->windowPos         = &windowPosStorage;
+            this->windowSize        = &windowSizeStorage;
+        }
+
+        void initializeData(const SharedData &other) {
+            this->imguiContext      = other.imguiContext;
+            this->eventHandlers     = other.eventHandlers;
+            this->deferredCalls     = other.deferredCalls;
+            this->currentProvider   = other.currentProvider;
+
+            this->windowPos         = other.windowPos;
+            this->windowSize        = other.windowSize;
+        }
+
+    public:
+        ImGuiContext *imguiContext;
+        std::vector<EventHandler> *eventHandlers;
+        std::vector<std::function<void()>> *deferredCalls;
+        prv::Provider **currentProvider;
+
+        ImVec2 *windowPos;
+        ImVec2 *windowSize;
+    };
+
+}

plugins/libimhex/include/helpers/utils.hpp

@@ -0,0 +1,188 @@
+#pragma once
+
+#include <hex.hpp>
+
+#include <array>
+#include <cstring>
+#include <functional>
+#include <memory>
+#include <optional>
+#include <string>
+#include <type_traits>
+#include <vector>
+
+#ifdef __MINGW32__
+#include <winsock.h>
+#else
+#include <arpa/inet.h>
+#endif
+
+#ifdef __APPLE__
+    #define off64_t off_t
+    #define fopen64 fopen
+    #define fseeko64 fseek
+    #define ftello64 ftell
+#else
+    template<>
+    struct std::is_integral<u128> : public std::true_type { };
+    template<>
+    struct std::is_integral<s128> : public std::true_type { };
+    template<>
+    struct std::is_signed<s128>   : public std::true_type { };
+#endif
+
+#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION <= 12000
+#if __has_include(<concepts>)
+// Make sure we break when derived_from is implemented in libc++. Then we can fix a compatibility version above
+#include <concepts>
+#endif
+// libcxx 12 still doesn't have many default concepts implemented, as a result we need to define it ourself using clang built-ins.
+// [concept.derived] (patch from https://reviews.llvm.org/D74292)
+namespace hex {
+template<class _Dp, class _Bp>
+concept derived_from =
+  __is_base_of(_Bp, _Dp) && __is_convertible_to(const volatile _Dp*, const volatile _Bp*);
+}
+
+// [concepts.arithmetic]
+namespace hex {
+template<class _Tp>
+concept integral = __is_integral(_Tp);
+
+template<class _Tp>
+concept signed_integral = integral<_Tp> && __is_signed(_Tp);
+
+template<class _Tp>
+concept unsigned_integral = integral<_Tp> && !signed_integral<_Tp>;
+
+template<class _Tp>
+concept floating_point = __is_floating_point(_Tp);
+}
+#else
+// Assume supported
+#include <concepts>
+namespace hex {
+    using std::derived_from;
+
+    using std::integral;
+    using std::signed_integral;
+    using std::unsigned_integral;
+    using std::floating_point;
+}
+#endif
+
+#define TOKEN_CONCAT_IMPL(x, y) x ## y
+#define TOKEN_CONCAT(x, y) TOKEN_CONCAT_IMPL(x, y)
+
+namespace hex {
+
+    template<typename ... Args>
+    inline std::string format(const char *format, Args ... args) {
+        ssize_t size = snprintf( nullptr, 0, format, args ... );
+
+        if (size <= 0)
+            return "";
+
+        std::vector<char> buffer(size + 1, 0x00);
+        snprintf(buffer.data(), size + 1, format, args ...);
+
+        return std::string(buffer.data(), buffer.data() + size);
+    }
+
+    [[nodiscard]] constexpr inline u64 extract(u8 from, u8 to, const hex::unsigned_integral auto &value) {
+        std::remove_cvref_t<decltype(value)> mask = (std::numeric_limits<std::remove_cvref_t<decltype(value)>>::max() >> (((sizeof(value) * 8) - 1) - (from - to))) << to;
+        return (value & mask) >> to;
+    }
+
+    template<hex::integral T>
+    [[nodiscard]] constexpr inline T signExtend(T value, u8 currWidth, u8 targetWidth) {
+        T mask = 1LLU << (currWidth - 1);
+        return (((value ^ mask) - mask) << ((sizeof(T) * 8) - targetWidth)) >> ((sizeof(T) * 8) - targetWidth);
+    }
+
+    std::string toByteString(u64 bytes);
+    std::string makePrintable(char c);
+
+    template<typename T>
+    struct always_false : std::false_type {};
+
+    template<typename T>
+    constexpr T changeEndianess(T value, std::endian endian) {
+        if (endian == std::endian::native)
+            return value;
+
+        if constexpr (sizeof(T) == 1)
+            return value;
+        else if constexpr (sizeof(T) == 2)
+            return __builtin_bswap16(value);
+        else if constexpr (sizeof(T) == 4)
+            return __builtin_bswap32(value);
+        else if constexpr (sizeof(T) == 8)
+            return __builtin_bswap64(value);
+        else
+                static_assert(always_false<T>::value, "Invalid type provided!");
+    }
+
+    template<typename T>
+    constexpr T changeEndianess(T value, size_t size, std::endian endian) {
+        if (endian == std::endian::native)
+            return value;
+
+        if (size == 1)
+            return value;
+        else if (size == 2)
+            return __builtin_bswap16(value);
+        else if (size == 4)
+            return __builtin_bswap32(value);
+        else if (size == 8)
+            return __builtin_bswap64(value);
+        else if (size == 16) {
+            u64 parts[2];
+            std::memcpy(parts, &value, size);
+            return u128(parts[1]) << 64 | u128(parts[0]);
+        }
+        else
+            throw std::invalid_argument("Invalid value size!");
+    }
+
+    template< class T >
+    constexpr T bit_width(T x) noexcept {
+        return std::numeric_limits<T>::digits - std::countl_zero(x);
+    }
+
+    template<typename T>
+    constexpr T bit_ceil(T x) noexcept {
+        if (x <= 1u)
+            return T(1);
+
+        return T(1) << bit_width(T(x - 1));
+    }
+
+    std::vector<u8> readFile(std::string_view path);
+
+    #define SCOPE_EXIT(func) ScopeExit TOKEN_CONCAT(scopeGuard, __COUNTER__)([&] { func })
+    class ScopeExit {
+    public:
+        ScopeExit(std::function<void()> func) : m_func(func) {}
+        ~ScopeExit() { if (this->m_func != nullptr) this->m_func(); }
+
+        void release() {
+            this->m_func = nullptr;
+        }
+
+    private:
+        std::function<void()> m_func;
+    };
+
+    struct Region {
+        u64 address;
+        size_t size;
+    };
+
+    struct Bookmark {
+        Region region;
+
+        std::vector<char> name;
+        std::vector<char> comment;
+    };
+}

plugins/libimhex/include/hex.hpp

@@ -15,13 +15,10 @@ using s32   = std::int32_t;
 using s64   = std::int64_t;
 using s128  = __int128_t;
 
-#include "lang/result.hpp"
-#include "lang/results.hpp"
-
 extern int mainArgc;
 extern char **mainArgv;
 
-#if defined(__EMX__) || defined (WIN32)
+#ifdef OS_WINDOWS
 #define MAGIC_PATH_SEPARATOR	";"
 #else
 #define MAGIC_PATH_SEPARATOR	":"

plugins/libimhex/include/plugin.hpp

@@ -0,0 +1,18 @@
+#pragma once
+
+#include <glad/glad.h>
+#include <imgui.h>
+
+#include <hex.hpp>
+#include <views/view.hpp>
+#include <providers/provider.hpp>
+#include <helpers/shared_data.hpp>
+
+#define IMHEX_PLUGIN    namespace hex::plugin::internal {                     \
+                            void initializePlugin(SharedData &sharedData) {   \
+                                if (glGetString == NULL)                      \
+                                    gladLoadGL();                             \
+                                SharedData::get().initializeData(sharedData); \
+                            }                                                 \
+                        }                                                     \
+                        namespace hex::plugin

plugins/libimhex/include/providers/provider.hpp

@@ -0,0 +1,51 @@
+#pragma once
+
+#include <hex.hpp>
+
+#include <map>
+#include <optional>
+#include <string>
+#include <vector>
+
+#include <helpers/shared_data.hpp>
+
+namespace hex::prv {
+
+    class Provider {
+    public:
+        constexpr static size_t PageSize = 0x1000'0000;
+
+        Provider();
+        virtual ~Provider() = default;
+
+        virtual bool isAvailable() = 0;
+        virtual bool isReadable() = 0;
+        virtual bool isWritable() = 0;
+
+        virtual void read(u64 offset, void *buffer, size_t size);
+        virtual void write(u64 offset, const void *buffer, size_t size);
+
+        virtual void readRaw(u64 offset, void *buffer, size_t size) = 0;
+        virtual void writeRaw(u64 offset, const void *buffer, size_t size) = 0;
+        virtual size_t getActualSize() = 0;
+
+        std::map<u64, u8>& getPatches();
+        void applyPatches();
+
+        u32 getPageCount();
+        u32 getCurrentPage() const;
+        void setCurrentPage(u32 page);
+
+        virtual size_t getBaseAddress();
+        virtual size_t getSize();
+        virtual std::optional<u32> getPageOfAddress(u64 address);
+
+        virtual std::vector<std::pair<std::string, std::string>> getDataInformation() = 0;
+
+    protected:
+        u32 m_currPage = 0;
+
+        std::vector<std::map<u64, u8>> m_patches;
+    };
+
+}

plugins/libimhex/include/views/view.hpp

@@ -0,0 +1,58 @@
+#pragma once
+
+#include <hex.hpp>
+
+#include "imgui.h"
+
+#include "helpers/event.hpp"
+
+#include <functional>
+#include <string>
+#include <vector>
+
+
+namespace hex {
+
+    class View {
+    public:
+        View(std::string viewName);
+        virtual ~View() = default;
+
+        virtual void drawContent() = 0;
+        virtual void drawMenu();
+        virtual bool handleShortcut(int key, int mods);
+
+        static std::vector<std::function<void()>>& getDeferedCalls();
+
+        static void postEvent(Events eventType, const void *userData = nullptr);
+
+        static void drawCommonInterfaces();
+
+        static void showErrorPopup(std::string_view errorMessage);
+
+        virtual bool hasViewMenuItemEntry();
+        virtual ImVec2 getMinSize();
+        virtual ImVec2 getMaxSize();
+
+        bool& getWindowOpenState();
+
+        const std::string getName() const;
+
+    protected:
+        void subscribeEvent(Events eventType, std::function<void(const void*)> callback);
+
+        void unsubscribeEvent(Events eventType);
+
+        void doLater(std::function<void()> &&function);
+
+    protected:
+        void confirmButtons(const char *textLeft, const char *textRight, std::function<void()> leftButtonFn, std::function<void()> rightButtonFn);
+
+    private:
+        std::string m_viewName;
+        bool m_windowOpen = false;
+
+        static inline std::string s_errorMessage;
+    };
+
+}

plugins/libimhex/source/helpers/event.cpp

@@ -0,0 +1,27 @@
+#include "helpers/event.hpp"
+
+#include <helpers/shared_data.hpp>
+
+namespace hex {
+
+    void EventManager::post(Events eventType, const void *userData) {
+        for (auto &handler : *SharedData::get().eventHandlers)
+            if (eventType == handler.eventType)
+                handler.callback(userData);
+    }
+
+    void EventManager::subscribe(Events eventType, void *owner, std::function<void(const void*)> callback) {
+        for (auto &handler : *SharedData::get().eventHandlers)
+            if (eventType == handler.eventType && owner == handler.owner)
+                return;
+
+        SharedData::get().eventHandlers->push_back(EventHandler { owner, eventType, callback });
+    }
+
+    void EventManager::unsubscribe(Events eventType, void *sender) {
+        std::erase_if(*SharedData::get().eventHandlers, [&eventType, &sender](EventHandler handler) {
+            return eventType == handler.eventType && sender == handler.owner;
+        });
+    }
+
+}

plugins/libimhex/source/providers/provider.cpp

@@ -0,0 +1,66 @@
+#include "providers/provider.hpp"
+
+#include <hex.hpp>
+
+#include <cmath>
+#include <map>
+#include <optional>
+#include <string>
+#include <vector>
+
+namespace hex::prv {
+
+    Provider::Provider() {
+        this->m_patches.emplace_back();
+    }
+
+    void Provider::read(u64 offset, void *buffer, size_t size) {
+        this->readRaw(offset, buffer, size);
+    }
+
+    void Provider::write(u64 offset, const void *buffer, size_t size) {
+        this->writeRaw(offset, buffer, size);
+    }
+
+
+    std::map<u64, u8>& Provider::getPatches() {
+        return this->m_patches.back();
+    }
+
+    void Provider::applyPatches() {
+        for (auto &[patchAddress, patch] : this->m_patches.back())
+            this->writeRaw(patchAddress, &patch, 1);
+    }
+
+    u32 Provider::getPageCount() {
+        return std::ceil(this->getActualSize() / double(PageSize));
+    }
+
+    u32 Provider::getCurrentPage() const {
+        return this->m_currPage;
+    }
+
+    void Provider::setCurrentPage(u32 page) {
+        if (page < getPageCount())
+            this->m_currPage = page;
+    }
+
+
+    size_t Provider::getBaseAddress() {
+        return PageSize * this->m_currPage;
+    }
+
+    size_t Provider::getSize() {
+        return std::min(this->getActualSize() - PageSize * this->m_currPage, PageSize);
+    }
+
+    std::optional<u32> Provider::getPageOfAddress(u64 address) {
+        u32 page = std::floor(address / double(PageSize));
+
+        if (page >= this->getPageCount())
+            return { };
+
+        return page;
+    }
+
+}