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

Fix nullptr reference cause assert in linux

This commit is contained in:
drmortalwombat 2023-06-18 09:24:50 +02:00
parent 95afe011c8
commit b8478348ed
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/gfx/bitmap.c
View File

@ -1164,8 +1164,8 @@ void bmu_bitblit(const Bitmap * dbm, int dx, int dy, const Bitmap * sbm, int sx,
if (op & BLIT_SRC) if (op & BLIT_SRC)
{ {
if (!pattern) if (!pat)
pattern = sp; pat = sp;
if (reverse) if (reverse)
{ {

1
oscar64/Errors.h
View File

@ -27,6 +27,7 @@ enum ErrorID
EWARN_USE_OF_UNINITIALIZED_VARIABLE, EWARN_USE_OF_UNINITIALIZED_VARIABLE,
EWARN_MISSING_RETURN_STATEMENT, EWARN_MISSING_RETURN_STATEMENT,
EWARN_UNREACHABLE_CODE, EWARN_UNREACHABLE_CODE,
EWARN_NULL_POINTER_DEREFERENCED,
EERR_GENERIC = 3000, EERR_GENERIC = 3000,
EERR_FILE_NOT_FOUND, EERR_FILE_NOT_FOUND,

12
oscar64/NativeCodeGenerator.cpp
View File

@ -4541,7 +4541,8 @@ void NativeCodeInstruction::Assemble(NativeCodeBasicBlock* block)
} }
else else
{ {
assert(mAddress != 0); if (mAddress == 0)
block->mProc->mGenerator->mErrors->Error(mIns->mLocation, EWARN_NULL_POINTER_DEREFERENCED, "nullptr dereferenced");
block->PutByte(uint8(mAddress)); block->PutByte(uint8(mAddress));
} }
break; break;
@ -4608,6 +4609,8 @@ void NativeCodeInstruction::Assemble(NativeCodeBasicBlock* block)
} }
else else
{ {
if (mAddress == 0)
block->mProc->mGenerator->mErrors->Error(mIns->mLocation, EWARN_NULL_POINTER_DEREFERENCED, "nullptr dereferenced");
block->PutWord(uint16(mAddress)); block->PutWord(uint16(mAddress));
} }
break; break;
@ -39601,8 +39604,9 @@ void NativeCodeBasicBlock::CopyCode(NativeCodeProcedure * proc, uint8* target)
} }
} }
NativeCodeBasicBlock::NativeCodeBasicBlock(void) NativeCodeBasicBlock::NativeCodeBasicBlock(NativeCodeProcedure* proc)
{ {
mProc = proc;
mBranch = ASMIT_RTS; mBranch = ASMIT_RTS;
mBranchIns = nullptr; mBranchIns = nullptr;
mTrueJump = mFalseJump = NULL; mTrueJump = mFalseJump = NULL;
@ -41209,7 +41213,7 @@ void NativeCodeProcedure::BuildDataFlowSets(void)
NativeCodeBasicBlock* NativeCodeProcedure::AllocateBlock(void) NativeCodeBasicBlock* NativeCodeProcedure::AllocateBlock(void)
{ {
NativeCodeBasicBlock* block = new NativeCodeBasicBlock(); NativeCodeBasicBlock* block = new NativeCodeBasicBlock(this);
block->mNoFrame = mNoFrame; block->mNoFrame = mNoFrame;
block->mFrameOffset = mFrameOffset; block->mFrameOffset = mFrameOffset;
block->mIndex = mTempBlocks++; block->mIndex = mTempBlocks++;
@ -41223,7 +41227,7 @@ NativeCodeBasicBlock* NativeCodeProcedure::CompileBlock(InterCodeProcedure* ipro
if (tblocks[sblock->mIndex]) if (tblocks[sblock->mIndex])
return tblocks[sblock->mIndex]; return tblocks[sblock->mIndex];
NativeCodeBasicBlock* block = new NativeCodeBasicBlock(); NativeCodeBasicBlock* block = new NativeCodeBasicBlock(this);
block->mNoFrame = mNoFrame; block->mNoFrame = mNoFrame;
block->mFrameOffset = mFrameOffset; block->mFrameOffset = mFrameOffset;
mBlocks.Push(block); mBlocks.Push(block);

3
oscar64/NativeCodeGenerator.h
View File

@ -210,9 +210,10 @@ public:
class NativeCodeBasicBlock class NativeCodeBasicBlock
{ {
public: public:
NativeCodeBasicBlock(void); NativeCodeBasicBlock(NativeCodeProcedure * proc);
~NativeCodeBasicBlock(void); ~NativeCodeBasicBlock(void);
NativeCodeProcedure * mProc;
ExpandingArray<uint8> mCode; ExpandingArray<uint8> mCode;
ExpandingArray<CodeLocation> mCodeLocations; ExpandingArray<CodeLocation> mCodeLocations;