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

Add or/and/shift to inline assembler

This commit is contained in:
drmortalwombat 2023-08-20 19:06:24 +02:00
parent 54296bdd71
commit 5b4e5b545d
3 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oscar64/Assembler.cpp
View File

@ -333,7 +333,7 @@ void InitAssembler(void)
int AsmInsSize(AsmInsType type, AsmInsMode mode)
{
if (type < ASMIT_INV)
if (type < ASMIT_INV && mode >= ASMIM_IMPLIED && mode < NUM_ASM_INS_MODES)
return AsmInsModeSize[mode];
else
return 1;

49
oscar64/Parser.cpp
View File

@ -8045,6 +8045,53 @@ Expression* Parser::ParseAssemblerAddOperand(Declaration* pcasm, int pcoffset)
return exp;
}
Expression* Parser::ParseAssemblerShiftOperand(Declaration* pcasm, int pcoffset)
{
Expression* exp = ParseAssemblerAddOperand(pcasm, pcoffset);
while (mScanner->mToken == TK_LEFT_SHIFT || mScanner->mToken == TK_RIGHT_SHIFT)
{
Expression* nexp = new Expression(mScanner->mLocation, EX_BINARY);
nexp->mToken = mScanner->mToken;
nexp->mLeft = exp;
mScanner->NextToken();
nexp->mRight = ParseAssemblerAddOperand(pcasm, pcoffset);
exp = nexp->ConstantFold(mErrors);
}
return exp;
}
Expression* Parser::ParseAssemblerAndOperand(Declaration* pcasm, int pcoffset)
{
Expression* exp = ParseAssemblerShiftOperand(pcasm, pcoffset);
while (mScanner->mToken == TK_BINARY_AND)
{
Expression* nexp = new Expression(mScanner->mLocation, EX_BINARY);
nexp->mToken = mScanner->mToken;
nexp->mLeft = exp;
mScanner->NextToken();
nexp->mRight = ParseAssemblerShiftOperand(pcasm, pcoffset);
exp = nexp->ConstantFold(mErrors);
}
return exp;
}
Expression* Parser::ParseAssemblerOrOperand(Declaration* pcasm, int pcoffset)
{
Expression* exp = ParseAssemblerAndOperand(pcasm, pcoffset);
while (mScanner->mToken == TK_BINARY_OR)
{
Expression* nexp = new Expression(mScanner->mLocation, EX_BINARY);
nexp->mToken = mScanner->mToken;
nexp->mLeft = exp;
mScanner->NextToken();
nexp->mRight = ParseAssemblerAndOperand(pcasm, pcoffset);
exp = nexp->ConstantFold(mErrors);
}
return exp;
}
Expression* Parser::ParseAssemblerOperand(Declaration* pcasm, int pcoffset)
{
if (mScanner->mToken == TK_LESS_THAN)
@ -8188,7 +8235,7 @@ Expression* Parser::ParseAssemblerOperand(Declaration* pcasm, int pcoffset)
return exp;
}
else
return ParseAssemblerAddOperand(pcasm, pcoffset);
return ParseAssemblerOrOperand(pcasm, pcoffset);
}
void Parser::AddAssemblerRegister(const Ident* ident, int value)

3
oscar64/Parser.h
View File

@ -74,6 +74,9 @@ protected:
Expression* ParseAssemblerBaseOperand(Declaration* pcasm, int pcoffset);
Expression* ParseAssemblerMulOperand(Declaration* pcasm, int pcoffset);
Expression* ParseAssemblerAddOperand(Declaration* pcasm, int pcoffset);
Expression* ParseAssemblerShiftOperand(Declaration* pcasm, int pcoffset);
Expression* ParseAssemblerAndOperand(Declaration* pcasm, int pcoffset);
Expression* ParseAssemblerOrOperand(Declaration* pcasm, int pcoffset);
Expression* ParseAssemblerOperand(Declaration * pcasm, int pcoffset);
Expression* CheckOperatorOverload(Expression* exp);