zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-04-19 17:01:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix parameter/return checking

Browse source
This commit is contained in:
Ricardo Luís Vaz Silva 2025-04-01 17:07:53 -03:00
parent 151547ed4d
commit effb24594b
2 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/common/scripting/vm/vm.h
View file

@ -545,7 +545,7 @@ void VMCheckParamCount(VMFunction* func, int argcount) { return VMCheckParamCoun
// The type can't be mapped to ZScript automatically:
template<typename NativeType> void VMCheckParam(VMFunction* func, int index) = delete;
template<typename NativeType> void VMCheckReturn(VMFunction* func) = delete;
template<typename NativeType> void VMCheckReturn(VMFunction* func, int index) = delete;
// Native types we support converting to/from:
@ -554,12 +554,12 @@ template<> void VMCheckParam<double>(VMFunction* func, int index);
template<> void VMCheckParam<FString>(VMFunction* func, int index);
template<> void VMCheckParam<DObject*>(VMFunction* func, int index);
template<> void VMCheckReturn<void>(VMFunction* func);
template<> void VMCheckReturn<int>(VMFunction* func);
template<> void VMCheckReturn<double>(VMFunction* func);
template<> void VMCheckReturn<FString>(VMFunction* func);
template<> void VMCheckReturn<DObject*>(VMFunction* func);
template<> void VMCheckReturn<void*>(VMFunction* func);
template<> void VMCheckReturn<void>(VMFunction* func, int index);
template<> void VMCheckReturn<int>(VMFunction* func, int index);
template<> void VMCheckReturn<double>(VMFunction* func, int index);
template<> void VMCheckReturn<FString>(VMFunction* func, int index);
template<> void VMCheckReturn<DObject*>(VMFunction* func, int index);
template<> void VMCheckReturn<void*>(VMFunction* func, int index);
template<typename T>
struct vm_decay_pointer_object
@ -591,7 +591,7 @@ template<typename RetVal, typename... Args, size_t... I>
void VMValidateSignatureSingle(VMFunction* func, std::index_sequence<I...>)
{
VMCheckParamCount<RetVal>(func, sizeof...(Args));
VMCheckReturn<vm_pointer_decay<RetVal>>(func);
VMCheckReturn<vm_pointer_decay<RetVal>>(func, 0);
(VMCheckParam<vm_pointer_decay<Args>>(func, I), ...);
}

36
src/common/scripting/vm/vmframe.cpp
View file

@ -566,53 +566,53 @@ void VMCheckParamCount(VMFunction* func, int retcount, int argcount)
template<> void VMCheckParam<int>(VMFunction* func, int index)
{
if (!func->Proto->ArgumentTypes[index]->isIntCompatible())
I_FatalError("%s argument %d is not an integer", func->PrintableName);
I_FatalError("%s argument %d is not an integer", func->PrintableName, index);
}
template<> void VMCheckParam<double>(VMFunction* func, int index)
{
if (func->Proto->ArgumentTypes[index] != TypeFloat64)
I_FatalError("%s argument %d is not a double", func->PrintableName);
I_FatalError("%s argument %d is not a double", func->PrintableName, index);
}
template<> void VMCheckParam<FString>(VMFunction* func, int index)
{
if (func->Proto->ArgumentTypes[index] != TypeString)
I_FatalError("%s argument %d is not a string", func->PrintableName);
I_FatalError("%s argument %d is not a string", func->PrintableName, index);
}
template<> void VMCheckParam<DObject*>(VMFunction* func, int index)
{
if (func->Proto->ArgumentTypes[index]->isObjectPointer())
I_FatalError("%s argument %d is not an object", func->PrintableName);
if (!func->Proto->ArgumentTypes[index]->isObjectPointer())
I_FatalError("%s argument %d is not an object", func->PrintableName, index);
}
template<> void VMCheckReturn<void>(VMFunction* func)
template<> void VMCheckReturn<void>(VMFunction* func, int index)
{
}
template<> void VMCheckReturn<int>(VMFunction* func)
template<> void VMCheckReturn<int>(VMFunction* func, int index)
{
if (!func->Proto->ReturnTypes[0]->isIntCompatible())
I_FatalError("%s return value %d is not an integer", func->PrintableName);
if (!func->Proto->ReturnTypes[index]->isIntCompatible())
I_FatalError("%s return value %d is not an integer", func->PrintableName, index);
}
template<> void VMCheckReturn<double>(VMFunction* func)
template<> void VMCheckReturn<double>(VMFunction* func, int index)
{
if (func->Proto->ReturnTypes[0] != TypeFloat64)
I_FatalError("%s return value %d is not a double", func->PrintableName);
if (func->Proto->ReturnTypes[index] != TypeFloat64)
I_FatalError("%s return value %d is not a double", func->PrintableName, index);
}
template<> void VMCheckReturn<FString>(VMFunction* func)
template<> void VMCheckReturn<FString>(VMFunction* func, int index)
{
if (func->Proto->ReturnTypes[0] != TypeString)
I_FatalError("%s return value %d is not a string", func->PrintableName);
if (func->Proto->ReturnTypes[index] != TypeString)
I_FatalError("%s return value %d is not a string", func->PrintableName, index);
}
template<> void VMCheckReturn<DObject*>(VMFunction* func)
template<> void VMCheckReturn<DObject*>(VMFunction* func, int index)
{
if (func->Proto->ReturnTypes[0]->isObjectPointer())
I_FatalError("%s return value %d is not an object", func->PrintableName);
if (!func->Proto->ReturnTypes[index]->isObjectPointer())
I_FatalError("%s return value %d is not an object", func->PrintableName, index);
}
void VMCallCheckResult(VMFunction* func, VMValue* params, int numparams, VMReturn* results, int numresults)