frederik
/
oscar64
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix negative array indices

This commit is contained in:
drmortalwombat 2021-10-26 14:44:25 +02:00
parent 342634d5e4
commit 8ab8b3c2a1
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
oscar64/ByteCodeGenerator.cpp
View File

@ -916,7 +916,7 @@ void ByteCodeBasicBlock::StoreDirectValue(InterCodeProcedure* proc, const InterI
if (ins->mSrc[1].mMemory == IM_INDIRECT) if (ins->mSrc[1].mMemory == IM_INDIRECT)
{ {
int index = ins->mSrc[1].mIntConst; int index = ins->mSrc[1].mIntConst;
if (index + 4 <= 256) if (index >= 0 && index + 4 <= 256)
{ {
ByteCodeInstruction lins(BC_ADDR_REG); ByteCodeInstruction lins(BC_ADDR_REG);
lins.mRegister = BC_REG_TMP + proc->mTempOffset[ins->mSrc[1].mTemp]; lins.mRegister = BC_REG_TMP + proc->mTempOffset[ins->mSrc[1].mTemp];
@ -944,7 +944,7 @@ void ByteCodeBasicBlock::StoreDirectValue(InterCodeProcedure* proc, const InterI
if (ins->mSrc[1].mMemory == IM_INDIRECT) if (ins->mSrc[1].mMemory == IM_INDIRECT)
{ {
int index = ins->mSrc[1].mIntConst; int index = ins->mSrc[1].mIntConst;
if (index + 4 <= 256) if (index >= 0 && index + 4 <= 256)
{ {
ByteCodeInstruction lins(BC_ADDR_REG); ByteCodeInstruction lins(BC_ADDR_REG);
lins.mRegister = BC_REG_TMP + proc->mTempOffset[ins->mSrc[1].mTemp]; lins.mRegister = BC_REG_TMP + proc->mTempOffset[ins->mSrc[1].mTemp];
@ -1113,7 +1113,7 @@ void ByteCodeBasicBlock::StoreDirectValue(InterCodeProcedure* proc, const InterI
if (ins->mSrc[1].mMemory == IM_INDIRECT) if (ins->mSrc[1].mMemory == IM_INDIRECT)
{ {
int index = ins->mSrc[1].mIntConst; int index = ins->mSrc[1].mIntConst;
if (index + 2 <= 256) if (index >= 0 && index + 2 <= 256)
{ {
ByteCodeInstruction lins(BC_ADDR_REG); ByteCodeInstruction lins(BC_ADDR_REG);
lins.mRegister = BC_REG_TMP + proc->mTempOffset[ins->mSrc[1].mTemp]; lins.mRegister = BC_REG_TMP + proc->mTempOffset[ins->mSrc[1].mTemp];
@ -1141,7 +1141,7 @@ void ByteCodeBasicBlock::StoreDirectValue(InterCodeProcedure* proc, const InterI
if (ins->mSrc[1].mMemory == IM_INDIRECT) if (ins->mSrc[1].mMemory == IM_INDIRECT)
{ {
int index = ins->mSrc[1].mIntConst; int index = ins->mSrc[1].mIntConst;
if (index + 2 <= 256) if (index >= 0 && index + 2 <= 256)
{ {
ByteCodeInstruction lins(BC_ADDR_REG); ByteCodeInstruction lins(BC_ADDR_REG);
lins.mRegister = BC_REG_TMP + proc->mTempOffset[ins->mSrc[1].mTemp]; lins.mRegister = BC_REG_TMP + proc->mTempOffset[ins->mSrc[1].mTemp];
@ -1579,7 +1579,7 @@ void ByteCodeBasicBlock::StoreDirectValue(InterCodeProcedure* proc, const InterI
if (ins->mSrc[1].mMemory == IM_INDIRECT) if (ins->mSrc[1].mMemory == IM_INDIRECT)
{ {
int index = ins->mSrc[1].mIntConst; int index = ins->mSrc[1].mIntConst;
if (index + InterTypeSize[ins->mSrc[0].mType] <= 256) if (index >= 0 && index + InterTypeSize[ins->mSrc[0].mType] <= 256)
{ {
ByteCodeInstruction lins(BC_ADDR_REG); ByteCodeInstruction lins(BC_ADDR_REG);
lins.mRegister = BC_REG_TMP + proc->mTempOffset[ins->mSrc[1].mTemp]; lins.mRegister = BC_REG_TMP + proc->mTempOffset[ins->mSrc[1].mTemp];
@ -1624,7 +1624,7 @@ void ByteCodeBasicBlock::StoreDirectValue(InterCodeProcedure* proc, const InterI
if (ins->mSrc[1].mMemory == IM_INDIRECT) if (ins->mSrc[1].mMemory == IM_INDIRECT)
{ {
int index = ins->mSrc[1].mIntConst; int index = ins->mSrc[1].mIntConst;
if (index + InterTypeSize[ins->mSrc[0].mType] <= 256) if (index >= 0 && index + InterTypeSize[ins->mSrc[0].mType] <= 256)
{ {
ByteCodeInstruction lins(BC_ADDR_REG); ByteCodeInstruction lins(BC_ADDR_REG);
lins.mRegister = BC_REG_TMP + proc->mTempOffset[ins->mSrc[1].mTemp]; lins.mRegister = BC_REG_TMP + proc->mTempOffset[ins->mSrc[1].mTemp];
@ -1736,7 +1736,7 @@ void ByteCodeBasicBlock::LoadDirectValue(InterCodeProcedure* proc, const InterIn
if (ins->mSrc[0].mMemory == IM_INDIRECT) if (ins->mSrc[0].mMemory == IM_INDIRECT)
{ {
int index = ins->mSrc[0].mIntConst; int index = ins->mSrc[0].mIntConst;
if (index + 4 <= 256) if (index >= 0 && index + 4 <= 256)
{ {
ByteCodeInstruction lins(BC_ADDR_REG); ByteCodeInstruction lins(BC_ADDR_REG);
lins.mRegister = BC_REG_TMP + proc->mTempOffset[ins->mSrc[0].mTemp]; lins.mRegister = BC_REG_TMP + proc->mTempOffset[ins->mSrc[0].mTemp];
@ -1823,7 +1823,7 @@ void ByteCodeBasicBlock::LoadDirectValue(InterCodeProcedure* proc, const InterIn
if (ins->mSrc[0].mMemory == IM_INDIRECT) if (ins->mSrc[0].mMemory == IM_INDIRECT)
{ {
int index = ins->mSrc[0].mIntConst; int index = ins->mSrc[0].mIntConst;
if (index + 2 <= 256) if (index >= 0 && index + 2 <= 256)
{ {
ByteCodeInstruction lins(BC_ADDR_REG); ByteCodeInstruction lins(BC_ADDR_REG);
lins.mRegister = BC_REG_TMP + proc->mTempOffset[ins->mSrc[0].mTemp]; lins.mRegister = BC_REG_TMP + proc->mTempOffset[ins->mSrc[0].mTemp];
@ -2025,7 +2025,7 @@ void ByteCodeBasicBlock::LoadDirectValue(InterCodeProcedure* proc, const InterIn
if (ins->mSrc[0].mMemory == IM_INDIRECT) if (ins->mSrc[0].mMemory == IM_INDIRECT)
{ {
int index = ins->mSrc[0].mIntConst; int index = ins->mSrc[0].mIntConst;
if (index + InterTypeSize[ins->mDst.mType] <= 256) if (index >= 0 && index + InterTypeSize[ins->mDst.mType] <= 256)
{ {
ByteCodeInstruction lins(BC_ADDR_REG); ByteCodeInstruction lins(BC_ADDR_REG);
lins.mRegister = BC_REG_TMP + proc->mTempOffset[ins->mSrc[0].mTemp]; lins.mRegister = BC_REG_TMP + proc->mTempOffset[ins->mSrc[0].mTemp];

2
oscar64/NativeCodeGenerator.cpp
View File

@ -2513,7 +2513,7 @@ void NativeCodeBasicBlock::LoadConstant(InterCodeProcedure* proc, const InterIns
void NativeCodeBasicBlock::CheckFrameIndex(int& reg, int& index, int size) void NativeCodeBasicBlock::CheckFrameIndex(int& reg, int& index, int size)
{ {
if (index + size > 256) if (index < 0 || index + size > 256)
{ {
mIns.Push(NativeCodeInstruction(ASMIT_CLC, ASMIM_IMPLIED)); mIns.Push(NativeCodeInstruction(ASMIT_CLC, ASMIM_IMPLIED));
mIns.Push(NativeCodeInstruction(ASMIT_LDA, ASMIM_ZERO_PAGE, reg)); mIns.Push(NativeCodeInstruction(ASMIT_LDA, ASMIM_ZERO_PAGE, reg));