Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
lua package.lua
7z a -tzip -y japp-windows-${{ matrix.arch }}-${{ matrix.build_type }}.zip *.pk3

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: ${{ matrix.build_type == 'Release' }}
with:
name: japp-windows-${{ matrix.arch }}-${{ matrix.build_type }}
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
./package.lua
tar -czvf japp-linux-${{ matrix.arch }}-${{ matrix.build_type }}.tar.gz *.zip

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: ${{ matrix.build_type == 'Release' }}
with:
name: japp-linux-${{ matrix.arch }}-${{ matrix.build_type }}
Expand All @@ -141,7 +141,7 @@ jobs:

macos:
name: macOS ${{ matrix.arch }} ${{ matrix.build_type }}
runs-on: macos-12
runs-on: macos-15
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -169,7 +169,7 @@ jobs:
./package.lua
tar -czvf japp-macos-${{ matrix.arch }}-${{ matrix.build_type }}.tar.gz *.zip

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: ${{ matrix.build_type == 'Release' }}
with:
name: japp-macos-${{ matrix.arch }}-${{ matrix.build_type }}
Expand All @@ -186,7 +186,7 @@ jobs:
submodules: recursive

- name: Download Artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4

- name: Create binary archives
run: |
Expand Down Expand Up @@ -240,7 +240,7 @@ jobs:
submodules: recursive

- name: Download Artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4

- name: Create archive
run: |
Expand Down
29 changes: 17 additions & 12 deletions JAPP/jp_crash.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -986,29 +986,34 @@ static LONG WINAPI UnhandledExceptionHandler_Failsafe(struct _EXCEPTION_POINTERS
// Alright, we got a VERY serious issue here..
// In this state the exception handler itself will run outta stack too
// So we'll just use a nice hack here to roll up esp by 16k

// clang-format off
#if defined(_MSC_VER)
qasm2(mov eax, EI)
#elif defined(__GNUC__)
__asm__("mov %0, esp" : "=m"(StackBackupStart) :);
#endif
qasm2(mov esi, esp)
qasm2(mov esi, esp)
#if defined(_MSC_VER)
qasm2(mov edi, offset StackBackup)
qasm2(mov edi, offset StackBackup)
#elif defined(__GNUC__)
__asm__("mov edi, offset %0"
:
: "m"(StackBackup));
__asm__("mov edi, offset %0"
:
: "m"(StackBackup));
#endif
qasm2(mov ecx, 0x6000) qasm1(rep stosd) qasm2(add esp, 0x18000) qasm1(push eax)
qasm2(mov ecx, 0x6000)
qasm1(rep stosd)
qasm2(add esp, 0x18000)
qasm1(push eax)
#if defined(_MSC_VER)
qasm1(call UnhandledExceptionHandler)
qasm1(call UnhandledExceptionHandler)
#elif defined(__GNUC__)
__asm__("call %0"
:
: "r"(UnhandledExceptionHandler));
__asm__("call %0" : : "r"(UnhandledExceptionHandler));
#endif
// qasm1( jmp skip )
qasm1(ret)
// qasm1( jmp skip )
qasm1(ret)

// clang-format on
}
StackBackupStart = 0;
return UnhandledExceptionHandler(EI);
Expand Down
Loading
Loading