mirror of
https://github.com/ZDoom/qzdoom.git
synced 2025-06-04 19:00:59 +00:00
- added static constant arrays. At the moment they can only be defined inside functions due to lack of dedicated storage inside classes for static data.
- added new VM instructions to access the constant tables with a variable index. - refactored VMFunctionBuilder's constant tables so that they are not limited to one entry per value. While this works fine for single values, it makes it impossible to store constant arrays in here.
This commit is contained in:
Christoph Oelckers
parent
bb25c5faaa
commit
5951a9449c
11 changed files with 413 additions and 106 deletions
|
|
@ -45,10 +45,6 @@
|
|||
|
||||
VMFunctionBuilder::VMFunctionBuilder(int numimplicits)
|
||||
{
|
||||
NumIntConstants = 0;
|
||||
NumFloatConstants = 0;
|
||||
NumAddressConstants = 0;
|
||||
NumStringConstants = 0;
|
||||
MaxParam = 0;
|
||||
ActiveParam = 0;
|
||||
NumImplicits = numimplicits;
|
||||
|
|
@ -74,25 +70,25 @@ VMFunctionBuilder::~VMFunctionBuilder()
|
|||
|
||||
void VMFunctionBuilder::MakeFunction(VMScriptFunction *func)
|
||||
{
|
||||
func->Alloc(Code.Size(), NumIntConstants, NumFloatConstants, NumStringConstants, NumAddressConstants);
|
||||
func->Alloc(Code.Size(), IntConstantList.Size(), FloatConstantList.Size(), StringConstantList.Size(), AddressConstantList.Size());
|
||||
|
||||
// Copy code block.
|
||||
memcpy(func->Code, &Code[0], Code.Size() * sizeof(VMOP));
|
||||
|
||||
// Create constant tables.
|
||||
if (NumIntConstants > 0)
|
||||
if (IntConstantList.Size() > 0)
|
||||
{
|
||||
FillIntConstants(func->KonstD);
|
||||
}
|
||||
if (NumFloatConstants > 0)
|
||||
if (FloatConstantList.Size() > 0)
|
||||
{
|
||||
FillFloatConstants(func->KonstF);
|
||||
}
|
||||
if (NumAddressConstants > 0)
|
||||
if (AddressConstantList.Size() > 0)
|
||||
{
|
||||
FillAddressConstants(func->KonstA, func->KonstATags());
|
||||
}
|
||||
if (NumStringConstants > 0)
|
||||
if (StringConstantList.Size() > 0)
|
||||
{
|
||||
FillStringConstants(func->KonstS);
|
||||
}
|
||||
|
|
@ -118,13 +114,7 @@ void VMFunctionBuilder::MakeFunction(VMScriptFunction *func)
|
|||
|
||||
void VMFunctionBuilder::FillIntConstants(int *konst)
|
||||
{
|
||||
TMapIterator<int, int> it(IntConstants);
|
||||
TMap<int, int>::Pair *pair;
|
||||
|
||||
while (it.NextPair(pair))
|
||||
{
|
||||
konst[pair->Value] = pair->Key;
|
||||
}
|
||||
memcpy(konst, &IntConstantList[0], sizeof(int) * IntConstantList.Size());
|
||||
}
|
||||
|
||||
//==========================================================================
|
||||
|
|
@ -135,13 +125,7 @@ void VMFunctionBuilder::FillIntConstants(int *konst)
|
|||
|
||||
void VMFunctionBuilder::FillFloatConstants(double *konst)
|
||||
{
|
||||
TMapIterator<double, int> it(FloatConstants);
|
||||
TMap<double, int>::Pair *pair;
|
||||
|
||||
while (it.NextPair(pair))
|
||||
{
|
||||
konst[pair->Value] = pair->Key;
|
||||
}
|
||||
memcpy(konst, &FloatConstantList[0], sizeof(double) * FloatConstantList.Size());
|
||||
}
|
||||
|
||||
//==========================================================================
|
||||
|
|
@ -152,14 +136,8 @@ void VMFunctionBuilder::FillFloatConstants(double *konst)
|
|||
|
||||
void VMFunctionBuilder::FillAddressConstants(FVoidObj *konst, VM_ATAG *tags)
|
||||
{
|
||||
TMapIterator<void *, AddrKonst> it(AddressConstants);
|
||||
TMap<void *, AddrKonst>::Pair *pair;
|
||||
|
||||
while (it.NextPair(pair))
|
||||
{
|
||||
konst[pair->Value.KonstNum].v = pair->Key;
|
||||
tags[pair->Value.KonstNum] = pair->Value.Tag;
|
||||
}
|
||||
memcpy(konst, &AddressConstantList[0], sizeof(void*) * AddressConstantList.Size());
|
||||
memcpy(tags, &AtagConstantList[0], sizeof(VM_ATAG) * AtagConstantList.Size());
|
||||
}
|
||||
|
||||
//==========================================================================
|
||||
|
|
@ -170,12 +148,9 @@ void VMFunctionBuilder::FillAddressConstants(FVoidObj *konst, VM_ATAG *tags)
|
|||
|
||||
void VMFunctionBuilder::FillStringConstants(FString *konst)
|
||||
{
|
||||
TMapIterator<FString, int> it(StringConstants);
|
||||
TMap<FString, int>::Pair *pair;
|
||||
|
||||
while (it.NextPair(pair))
|
||||
for (auto &s : StringConstantList)
|
||||
{
|
||||
konst[pair->Value] = pair->Key;
|
||||
*konst++ = s;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -183,22 +158,21 @@ void VMFunctionBuilder::FillStringConstants(FString *konst)
|
|||
//
|
||||
// VMFunctionBuilder :: GetConstantInt
|
||||
//
|
||||
// Returns a constant register initialized with the given value, or -1 if
|
||||
// there were no more constants free.
|
||||
// Returns a constant register initialized with the given value.
|
||||
//
|
||||
//==========================================================================
|
||||
|
||||
int VMFunctionBuilder::GetConstantInt(int val)
|
||||
unsigned VMFunctionBuilder::GetConstantInt(int val)
|
||||
{
|
||||
int *locp = IntConstants.CheckKey(val);
|
||||
unsigned int *locp = IntConstantMap.CheckKey(val);
|
||||
if (locp != NULL)
|
||||
{
|
||||
return *locp;
|
||||
}
|
||||
else
|
||||
{
|
||||
int loc = NumIntConstants++;
|
||||
IntConstants.Insert(val, loc);
|
||||
unsigned loc = IntConstantList.Push(val);
|
||||
IntConstantMap.Insert(val, loc);
|
||||
return loc;
|
||||
}
|
||||
}
|
||||
|
|
@ -207,22 +181,21 @@ int VMFunctionBuilder::GetConstantInt(int val)
|
|||
//
|
||||
// VMFunctionBuilder :: GetConstantFloat
|
||||
//
|
||||
// Returns a constant register initialized with the given value, or -1 if
|
||||
// there were no more constants free.
|
||||
// Returns a constant register initialized with the given value.
|
||||
//
|
||||
//==========================================================================
|
||||
|
||||
int VMFunctionBuilder::GetConstantFloat(double val)
|
||||
unsigned VMFunctionBuilder::GetConstantFloat(double val)
|
||||
{
|
||||
int *locp = FloatConstants.CheckKey(val);
|
||||
unsigned *locp = FloatConstantMap.CheckKey(val);
|
||||
if (locp != NULL)
|
||||
{
|
||||
return *locp;
|
||||
}
|
||||
else
|
||||
{
|
||||
int loc = NumFloatConstants++;
|
||||
FloatConstants.Insert(val, loc);
|
||||
unsigned loc = FloatConstantList.Push(val);
|
||||
FloatConstantMap.Insert(val, loc);
|
||||
return loc;
|
||||
}
|
||||
}
|
||||
|
|
@ -231,22 +204,21 @@ int VMFunctionBuilder::GetConstantFloat(double val)
|
|||
//
|
||||
// VMFunctionBuilder :: GetConstantString
|
||||
//
|
||||
// Returns a constant register initialized with the given value, or -1 if
|
||||
// there were no more constants free.
|
||||
// Returns a constant register initialized with the given value.
|
||||
//
|
||||
//==========================================================================
|
||||
|
||||
int VMFunctionBuilder::GetConstantString(FString val)
|
||||
unsigned VMFunctionBuilder::GetConstantString(FString val)
|
||||
{
|
||||
int *locp = StringConstants.CheckKey(val);
|
||||
unsigned *locp = StringConstantMap.CheckKey(val);
|
||||
if (locp != NULL)
|
||||
{
|
||||
return *locp;
|
||||
}
|
||||
else
|
||||
{
|
||||
int loc = NumStringConstants++;
|
||||
StringConstants.Insert(val, loc);
|
||||
int loc = StringConstantList.Push(val);
|
||||
StringConstantMap.Insert(val, loc);
|
||||
return loc;
|
||||
}
|
||||
}
|
||||
|
|
@ -260,13 +232,13 @@ int VMFunctionBuilder::GetConstantString(FString val)
|
|||
//
|
||||
//==========================================================================
|
||||
|
||||
int VMFunctionBuilder::GetConstantAddress(void *ptr, VM_ATAG tag)
|
||||
unsigned VMFunctionBuilder::GetConstantAddress(void *ptr, VM_ATAG tag)
|
||||
{
|
||||
if (ptr == NULL)
|
||||
{ // Make all NULL pointers generic. (Or should we allow typed NULLs?)
|
||||
tag = ATAG_GENERIC;
|
||||
}
|
||||
AddrKonst *locp = AddressConstants.CheckKey(ptr);
|
||||
AddrKonst *locp = AddressConstantMap.CheckKey(ptr);
|
||||
if (locp != NULL)
|
||||
{
|
||||
// There should only be one tag associated with a memory location.
|
||||
|
|
@ -275,12 +247,71 @@ int VMFunctionBuilder::GetConstantAddress(void *ptr, VM_ATAG tag)
|
|||
}
|
||||
else
|
||||
{
|
||||
AddrKonst loc = { NumAddressConstants++, tag };
|
||||
AddressConstants.Insert(ptr, loc);
|
||||
unsigned locc = AddressConstantList.Push(ptr);
|
||||
AtagConstantList.Push(tag);
|
||||
|
||||
AddrKonst loc = { locc, tag };
|
||||
AddressConstantMap.Insert(ptr, loc);
|
||||
return loc.KonstNum;
|
||||
}
|
||||
}
|
||||
|
||||
//==========================================================================
|
||||
//
|
||||
// VMFunctionBuilder :: AllocConstants*
|
||||
//
|
||||
// Returns a range of constant register initialized with the given values.
|
||||
//
|
||||
//==========================================================================
|
||||
|
||||
unsigned VMFunctionBuilder::AllocConstantsInt(unsigned count, int *values)
|
||||
{
|
||||
unsigned addr = IntConstantList.Reserve(count);
|
||||
memcpy(&IntConstantList[addr], values, count * sizeof(int));
|
||||
for (unsigned i = 0; i < count; i++)
|
||||
{
|
||||
IntConstantMap.Insert(values[i], addr + i);
|
||||
}
|
||||
return addr;
|
||||
}
|
||||
|
||||
unsigned VMFunctionBuilder::AllocConstantsFloat(unsigned count, double *values)
|
||||
{
|
||||
unsigned addr = FloatConstantList.Reserve(count);
|
||||
memcpy(&FloatConstantList[addr], values, count * sizeof(double));
|
||||
for (unsigned i = 0; i < count; i++)
|
||||
{
|
||||
FloatConstantMap.Insert(values[i], addr + i);
|
||||
}
|
||||
return addr;
|
||||
}
|
||||
|
||||
unsigned VMFunctionBuilder::AllocConstantsAddress(unsigned count, void **ptrs, VM_ATAG tag)
|
||||
{
|
||||
unsigned addr = AddressConstantList.Reserve(count);
|
||||
AtagConstantList.Reserve(count);
|
||||
memcpy(&AddressConstantList[addr], ptrs, count * sizeof(void *));
|
||||
for (unsigned i = 0; i < count; i++)
|
||||
{
|
||||
AtagConstantList[addr + i] = tag;
|
||||
AddrKonst loc = { addr+i, tag };
|
||||
AddressConstantMap.Insert(ptrs[i], loc);
|
||||
}
|
||||
return addr;
|
||||
}
|
||||
|
||||
unsigned VMFunctionBuilder::AllocConstantsString(unsigned count, FString *ptrs)
|
||||
{
|
||||
unsigned addr = StringConstantList.Reserve(count);
|
||||
for (unsigned i = 0; i < count; i++)
|
||||
{
|
||||
StringConstantList[addr + i] = ptrs[i];
|
||||
StringConstantMap.Insert(ptrs[i], addr + i);
|
||||
}
|
||||
return addr;
|
||||
}
|
||||
|
||||
|
||||
//==========================================================================
|
||||
//
|
||||
// VMFunctionBuilder :: ParamChange
|
||||
|
|
|
|||
|
|
@ -42,10 +42,16 @@ public:
|
|||
void MakeFunction(VMScriptFunction *func);
|
||||
|
||||
// Returns the constant register holding the value.
|
||||
int GetConstantInt(int val);
|
||||
int GetConstantFloat(double val);
|
||||
int GetConstantAddress(void *ptr, VM_ATAG tag);
|
||||
int GetConstantString(FString str);
|
||||
unsigned GetConstantInt(int val);
|
||||
unsigned GetConstantFloat(double val);
|
||||
unsigned GetConstantAddress(void *ptr, VM_ATAG tag);
|
||||
unsigned GetConstantString(FString str);
|
||||
|
||||
unsigned AllocConstantsInt(unsigned int count, int *values);
|
||||
unsigned AllocConstantsFloat(unsigned int count, double *values);
|
||||
unsigned AllocConstantsAddress(unsigned int count, void **ptrs, VM_ATAG tag);
|
||||
unsigned AllocConstantsString(unsigned int count, FString *ptrs);
|
||||
|
||||
|
||||
// Returns the address of the next instruction to be emitted.
|
||||
size_t GetAddress();
|
||||
|
|
@ -82,19 +88,20 @@ public:
|
|||
private:
|
||||
struct AddrKonst
|
||||
{
|
||||
int KonstNum;
|
||||
unsigned KonstNum;
|
||||
VM_ATAG Tag;
|
||||
};
|
||||
// These map from the constant value to its position in the constant table.
|
||||
TMap<int, int> IntConstants;
|
||||
TMap<double, int> FloatConstants;
|
||||
TMap<void *, AddrKonst> AddressConstants;
|
||||
TMap<FString, int> StringConstants;
|
||||
|
||||
int NumIntConstants;
|
||||
int NumFloatConstants;
|
||||
int NumAddressConstants;
|
||||
int NumStringConstants;
|
||||
TArray<int> IntConstantList;
|
||||
TArray<double> FloatConstantList;
|
||||
TArray<void *> AddressConstantList;
|
||||
TArray<VM_ATAG> AtagConstantList;
|
||||
TArray<FString> StringConstantList;
|
||||
// These map from the constant value to its position in the constant table.
|
||||
TMap<int, unsigned> IntConstantMap;
|
||||
TMap<double, unsigned> FloatConstantMap;
|
||||
TMap<void *, AddrKonst> AddressConstantMap;
|
||||
TMap<FString, unsigned> StringConstantMap;
|
||||
|
||||
int MaxParam;
|
||||
int ActiveParam;
|
||||
|
|
|
|||
|
|
@ -97,6 +97,9 @@
|
|||
|
||||
#define RIRIRI MODE_AI | MODE_BI | MODE_CI
|
||||
#define RIRII8 MODE_AI | MODE_BI | MODE_CIMMZ
|
||||
#define RFRII8 MODE_AF | MODE_BI | MODE_CIMMZ
|
||||
#define RPRII8 MODE_AP | MODE_BI | MODE_CIMMZ
|
||||
#define RSRII8 MODE_AS | MODE_BI | MODE_CIMMZ
|
||||
#define RIRIKI MODE_AI | MODE_BI | MODE_CKI
|
||||
#define RIKIRI MODE_AI | MODE_BKI | MODE_CI
|
||||
#define RIKII8 MODE_AI | MODE_BKI | MODE_CIMMZ
|
||||
|
|
|
|||
|
|
@ -84,6 +84,26 @@ begin:
|
|||
reg.a[a] = konsta[BC].v;
|
||||
reg.atag[a] = konstatag[BC];
|
||||
NEXTOP;
|
||||
|
||||
OP(LK_R) :
|
||||
ASSERTD(a); ASSERTD(B);
|
||||
reg.d[a] = konstd[reg.d[B] + C];
|
||||
NEXTOP;
|
||||
OP(LKF_R) :
|
||||
ASSERTF(a); ASSERTD(B);
|
||||
reg.f[a] = konstf[reg.d[B] + C];
|
||||
NEXTOP;
|
||||
OP(LKS_R) :
|
||||
ASSERTS(a); ASSERTD(B);
|
||||
reg.s[a] = konsts[reg.d[B] + C];
|
||||
NEXTOP;
|
||||
OP(LKP_R) :
|
||||
ASSERTA(a); ASSERTD(B);
|
||||
b = reg.d[B] + C;
|
||||
reg.a[a] = konsta[b].v;
|
||||
reg.atag[a] = konstatag[b];
|
||||
NEXTOP;
|
||||
|
||||
OP(LFP):
|
||||
ASSERTA(a); assert(sfunc != NULL); assert(sfunc->ExtraSpace > 0);
|
||||
reg.a[a] = f->GetExtra();
|
||||
|
|
|
|||
|
|
@ -10,6 +10,10 @@ xx(LK, lk, LKI), // load integer constant
|
|||
xx(LKF, lk, LKF), // load float constant
|
||||
xx(LKS, lk, LKS), // load string constant
|
||||
xx(LKP, lk, LKP), // load pointer constant
|
||||
xx(LK_R, lk, RIRII8), // load integer constant indexed
|
||||
xx(LKF_R, lk, RFRII8), // load float constant indexed
|
||||
xx(LKS_R, lk, RSRII8), // load string constant indexed
|
||||
xx(LKP_R, lk, RPRII8), // load pointer constant indexed
|
||||
xx(LFP, lf, LFP), // load frame pointer
|
||||
|
||||
// Load from memory. rA = *(rB + rkC)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue