OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- turned everything I could into non-action functions.

Browse source 
- fixed emission of the self pointer in FxVMFunctionCall. I did not realize that the self expression only sets up a register for the value, not pushing it onto the stack.
This commit is contained in:
Christoph Oelckers 2016-10-22 17:49:08 +02:00
commit 371712c53a
152 changed files with 1051 additions and 1072 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/scripting/codegeneration/codegen.cpp
View file

@ -5281,50 +5281,31 @@ ExpEmit FxVMFunctionCall::Emit(VMFunctionBuilder *build)
}
}
// If both functions are non-action or both are action, there is no need for special treatment.
//if (elf || (!!(Function->Variants[0].Flags & VARF_Action) == build->IsActionFunc))
// Emit code to pass implied parameters
if (Function->Variants[0].Flags & VARF_Method)
{
// Emit code to pass implied parameters
if (Function->Variants[0].Flags & VARF_Method)
{
assert(Self != nullptr);
Self->Emit(build);
count += 1;
}
if (Function->Variants[0].Flags & VARF_Action)
{
static_assert(NAP == 3, "This code needs to be updated if NAP changes");
if (build->IsActionFunc)
{
build->Emit(OP_PARAM, 0, REGT_POINTER, 1);
build->Emit(OP_PARAM, 0, REGT_POINTER, 2);
}
else
{
int null = build->GetConstantAddress(nullptr, ATAG_GENERIC);
build->Emit(OP_PARAM, 0, REGT_POINTER | REGT_KONST, null);
build->Emit(OP_PARAM, 0, REGT_POINTER | REGT_KONST, null);
}
count += 2;
}
assert(Self != nullptr);
ExpEmit selfemit = Self->Emit(build);
assert(selfemit.RegType == REGT_POINTER);
build->Emit(OP_PARAM, 0, selfemit.RegType, selfemit.RegNum);
count += 1;
}
/*
else
if (Function->Variants[0].Flags & VARF_Action)
{
if (build->IsActionFunc && (Function->Variants[0].Flags & VARF_Method))
static_assert(NAP == 3, "This code needs to be updated if NAP changes");
if (build->IsActionFunc)
{
build->Emit(OP_PARAM, 0, REGT_POINTER, 0);
count += 1;
build->Emit(OP_PARAM, 0, REGT_POINTER, 1);
build->Emit(OP_PARAM, 0, REGT_POINTER, 2);
}
// and calling an action function from a non-action function.
// This must be blocked because it lacks crucial information.
if (!build->IsActionFunc && (Function->Variants[0].Flags & VARF_Action))
else
{
// This case should be eliminated in the analyzing stage.
I_Error("Cannot call action function from non-action functions.");
int null = build->GetConstantAddress(nullptr, ATAG_GENERIC);
build->Emit(OP_PARAM, 0, REGT_POINTER | REGT_KONST, null);
build->Emit(OP_PARAM, 0, REGT_POINTER | REGT_KONST, null);
}
count += 2;
}
*/
// Emit code to pass explicit parameters
if (ArgList != NULL)