zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Really fixed arrays of dynarrays this time.

This commit is contained in:
Chronos Ouroboros 2019-06-04 19:31:08 -03:00 committed by Christoph Oelckers
parent 9504d37c7b
commit 87c426dcfd
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/scripting/backend/codegen.cpp
View File

@ -7424,7 +7424,6 @@ ExpEmit FxArrayElement::Emit(VMFunctionBuilder *build)
{ {
bool ismeta = Array->ExprType == EFX_ClassMember && static_cast<FxClassMember*>(Array)->membervar->Flags & VARF_Meta; bool ismeta = Array->ExprType == EFX_ClassMember && static_cast<FxClassMember*>(Array)->membervar->Flags & VARF_Meta;
arrayvar.Free(build);
start = ExpEmit(build, REGT_POINTER); start = ExpEmit(build, REGT_POINTER);
build->Emit(OP_LP, start.RegNum, arrayvar.RegNum, build->GetConstantInt(0)); build->Emit(OP_LP, start.RegNum, arrayvar.RegNum, build->GetConstantInt(0));
@ -7444,18 +7443,18 @@ ExpEmit FxArrayElement::Emit(VMFunctionBuilder *build)
arraymemberbase->membervar = origmembervar; arraymemberbase->membervar = origmembervar;
arraymemberbase->AddressRequested = origaddrreq; arraymemberbase->AddressRequested = origaddrreq;
Array->ValueType = origvaluetype; Array->ValueType = origvaluetype;
arrayvar.Free(build);
} }
else if (Array->ExprType == EFX_ArrayElement && Array->isStaticArray()) else if (Array->ExprType == EFX_ArrayElement && Array->isStaticArray())
{ {
bool ismeta = Array->ExprType == EFX_ClassMember && static_cast<FxClassMember*>(Array)->membervar->Flags & VARF_Meta; bound = ExpEmit(build, REGT_INT);
build->Emit(OP_LW, bound.RegNum, arrayvar.RegNum, build->GetConstantInt(myoffsetof(FArray, Count)));
arrayvar.Free(build); arrayvar.Free(build);
start = ExpEmit(build, REGT_POINTER); start = ExpEmit(build, REGT_POINTER);
build->Emit(OP_LP, start.RegNum, arrayvar.RegNum, build->GetConstantInt(0)); build->Emit(OP_LP, start.RegNum, arrayvar.RegNum, build->GetConstantInt(0));
bound = ExpEmit(build, REGT_INT);
build->Emit(OP_LW, bound.RegNum, arrayvar.RegNum, build->GetConstantInt(sizeof(void*)));
nestedarray = true; nestedarray = true;
} }
else start = arrayvar; else start = arrayvar;
@ -7513,7 +7512,7 @@ ExpEmit FxArrayElement::Emit(VMFunctionBuilder *build)
else else
{ {
ExpEmit indexv(index->Emit(build)); ExpEmit indexv(index->Emit(build));
if (SizeAddr != ~0u) if (SizeAddr != ~0u || nestedarray)
{ {
build->Emit(OP_BOUND_R, indexv.RegNum, bound.RegNum); build->Emit(OP_BOUND_R, indexv.RegNum, bound.RegNum);
bound.Free(build); bound.Free(build);