OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Revert "AsmJit update"

Browse source 
This reverts commit 747b3dfcfe.

# Conflicts:
#	libraries/asmjit/asmjit/core/compiler.h

This had to be reverted because it breaks exception handling which is a critical problem.
With the updated code any exception thrown inside code that had a JITed call stack would crash.
This commit is contained in:
Christoph Oelckers 2019-10-07 20:34:55 +02:00
commit 523fd0bf3a
166 changed files with 45117 additions and 51918 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/scripting/vm/jit_move.cpp
View file

@ -57,9 +57,9 @@ static void CastTID2S(FString *a, int b) { auto tex = TexMan.GetTexture(*(FTextu
void JitCompiler::EmitCAST()
{
asmjit::x86::Gp tmp, resultD;
asmjit::x86::Xmm resultF;
asmjit::FuncCallNode *call = nullptr;
asmjit::X86Gp tmp, resultD;
asmjit::X86Xmm resultF;
asmjit::CCFuncCall *call = nullptr;
switch (C)
{
@ -185,7 +185,7 @@ void JitCompiler::EmitCASTB()
if (C == CASTB_I)
{
cc.cmp(regD[B], (int)0);
cc.setne(regD[A].r8());
cc.setne(regD[A]);
cc.movzx(regD[A], regD[A].r8Lo()); // not sure if this is needed
}
else if (C == CASTB_F)
@ -196,13 +196,13 @@ void JitCompiler::EmitCASTB()
cc.mov(one, 1);
cc.xor_(regD[A], regD[A]);
cc.ucomisd(regF[B], zero);
cc.setp(regD[A].r8());
cc.setp(regD[A]);
cc.cmovne(regD[A], one);
}
else if (C == CASTB_A)
{
cc.test(regA[B], regA[B]);
cc.setne(regD[A].r8());
cc.setne(regD[A]);
cc.movzx(regD[A], regD[A].r8Lo()); // not sure if this is needed
}
else
@ -234,7 +234,7 @@ void JitCompiler::EmitDYNCAST_K()
{
auto result = newResultIntPtr();
auto c = newTempIntPtr();
cc.mov(c, asmjit::imm(konsta[C].o));
cc.mov(c, asmjit::imm_ptr(konsta[C].o));
auto call = CreateCall<DObject*, DObject*, PClass*>(DynCast);
call->setRet(0, result);
call->setArg(0, regA[B]);
@ -262,7 +262,7 @@ void JitCompiler::EmitDYNCASTC_K()
using namespace asmjit;
auto result = newResultIntPtr();
auto c = newTempIntPtr();
cc.mov(c, asmjit::imm(konsta[C].o));
cc.mov(c, asmjit::imm_ptr(konsta[C].o));
typedef PClass*(*FuncPtr)(PClass*, PClass*);
auto call = CreateCall<PClass*, PClass*, PClass*>(DynCastC);
call->setRet(0, result);