ZScript DAP Debug server

.gitignore

@@ -32,3 +32,4 @@
 /build_vc2019-32
 /build__
 gzdoom-crash.log
+.cache/

CMakeLists.txt

@@ -215,6 +215,9 @@ option( NO_OPENAL "Disable OpenAL sound support" OFF )
 
 find_package( BZip2 )
 find_package( VPX )
+if (NOT FORCE_INTERNAL_CPPDAP)
+	find_package( cppdap CONFIG )
+endif()
 
 include( TargetArch )
 
@@ -334,6 +337,9 @@ set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${DEB_C_FLAGS} -D_DEBUG" )
 
 option(FORCE_INTERNAL_BZIP2 "Use internal bzip2")
 option(FORCE_INTERNAL_ASMJIT "Use internal asmjit" ON)
+option(FORCE_INTERNAL_CPPDAP "Use internal cppdap" ON)
+
+
 mark_as_advanced( FORCE_INTERNAL_ASMJIT )
 
 if (HAVE_VULKAN)
@@ -385,6 +391,17 @@ else()
 	set( BZIP2_LIBRARY bz2 )
 endif()
 
+if ( CPPDAP_FOUND AND NOT FORCE_INTERNAL_CPPDAP )
+	message( STATUS "Using system cppdap library, includes found at ${CPPDAP_INCLUDE_DIR}" )
+else()
+	message( STATUS "Using internal cppdap library" )
+	add_subdirectory( libraries/cppdap )
+	set( CPPDAP_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/cppdap" )
+	set( CPPDAP_LIBRARIES cppdap )
+	set( CPPDAP_LIBRARY cppdap )
+	set( CPPDAP_FOUND TRUE )
+endif()
+
 set( LZMA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/lzma/C" )
 
 if( NOT CMAKE_CROSSCOMPILING )

docs/console.html

@@ -1814,6 +1814,14 @@ <h2>Debugging</h2>
 				<div class="b">Sends you to the specified coordinates immediately. This can be used 
 					with <a href="#idmypos">idmypos</a> to debug problems in a specific area of a 
 					map.</div>
+				<div class="v" id="vm_debug">vm_debug</div>
+				<div class="t">boolean: false</div>
+				<div class="d">When set to true, the game will enable the ZScript debug
+					server on the port specified in <i>vm_debug_port</i>. Note that enabling this
+					will disable JIT and requires restarting the game.</div>
+				<div class="v" id="vm_debug_port">vm_debug_port</div>
+				<div class="t">integer: 19021</div>
+				<div class="d">This is the port that the ZScript debug server will listen on.</div>
 			</div>
 			<div id="effects">
 				<h2>Effects</h2>

libraries/cppdap/.gitattributes

@@ -0,0 +1,4 @@
+* text=auto
+
+*.sh eol=lf
+*.bat eol=crlf

libraries/cppdap/.github/workflows/main.yml

@@ -0,0 +1,48 @@
+on:
+  push:
+  pull_request:
+
+jobs:
+  linux:
+    name: ci
+    runs-on: ubuntu-latest
+
+    container:
+      image: ubuntu:22.04
+
+    strategy:
+      matrix:
+        include:
+          - CC: gcc
+            CXX: g++
+          - CC: clang
+            CXX: clang++
+
+    # don't run pull requests from local branches twice
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.repository
+
+    env:
+      DEBIAN_FRONTEND: noninteractive
+
+    steps:
+      - name: Install packages
+        run: |
+          apt-get -q -y update
+          apt-get -q -y install build-essential cmake git clang
+
+      - uses: actions/checkout@v3
+        with:
+          submodules: 'true'
+
+      - name: Build source
+        run: |
+          mkdir -p build
+          cd build
+          CC=${{ matrix.CC }} CXX=${{ matrix.CXX }} cmake ..
+          cmake --build .
+          DESTDIR=../out cmake --install .
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: cppdap-${{ matrix.CC }}
+          path: out/usr/local/

libraries/cppdap/.gitignore

@@ -0,0 +1,6 @@
+build/
+fuzz/corpus
+fuzz/logs
+.vs/
+.vscode/settings.json
+CMakeSettings.json