zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-06-04 19:00:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: RegAvailability never set the number of allocated registers to more than 32.

Browse source 
- fixed register allocation in ?: operator which was quite broken.
This commit is contained in:
Christoph Oelckers 2016-11-07 01:10:56 +01:00
parent 7da4e0d03d
commit b206d19df4
3 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/scripting/vm/vmbuilder.cpp
View file

@ -336,10 +336,10 @@ int VMFunctionBuilder::RegAvailability::Get(int count)
{
return -1;
}
mask = count == 32 ? ~0u : (1 << count) - 1;
for (i = 0; i < 256/32; ++i)
for (i = 0; i < 256 / 32; ++i)
{
// Find the first word with free registers
VM_UWORD bits = Used[i];
@ -362,9 +362,9 @@ int VMFunctionBuilder::RegAvailability::Get(int count)
{
if (firstbit + count <= 32)
{ // Needed bits all fit in one word, so we got it.
if (firstbit + count > MostUsed)
if (i * 32 + firstbit + count > MostUsed)
{
MostUsed = firstbit + count;
MostUsed = i * 32 + firstbit + count;
}
Used[i] |= mask << firstbit;
return i * 32 + firstbit;
@ -374,9 +374,9 @@ int VMFunctionBuilder::RegAvailability::Get(int count)
{ // There is a next word.
if (((Used[i + 1]) & (mask >> (32 - firstbit))) == 0)
{ // The next word has the needed open space, too.
if (firstbit + count > MostUsed)
if (i * 32 + firstbit + count > MostUsed)
{
MostUsed = firstbit + count;
MostUsed = i * 32 + firstbit + count;
}
Used[i] |= mask << firstbit;
Used[i + 1] |= mask >> (32 - firstbit);