paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-26 14:30:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

m68k: fixed parsing of absolute addresses in the assembler reader

Browse Source 
git-svn-id: trunk@47418 -
This commit is contained in:
Károly Balogh 2020-11-15 03:43:26 +00:00 committed by Karoly Balogh
parent fc78671215
commit 538b8e8e71
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compiler/m68k/ra68kmot.pas
View File

@ -1127,10 +1127,17 @@ const
end; end;
else else
begin begin
if actasmtoken in [AS_COMMA,AS_SEPARATOR] then
begin
{ no longer in an expression }
if not ErrorFlag then
BuildRefExpression := CalculateExpression(expr);
exit;
end;
{ write error only once. } { write error only once. }
if not errorflag then if not errorflag then
Message(asmr_e_invalid_constant_expression); Message(asmr_e_invalid_constant_expression);
if actasmtoken in [AS_COMMA,AS_SEPARATOR] then exit;
{ consume tokens until we find COMMA or SEPARATOR } { consume tokens until we find COMMA or SEPARATOR }
errorflag := true; errorflag := true;
end; end;
@ -1400,7 +1407,7 @@ const
Message(asmr_e_invalid_operand_type); Message(asmr_e_invalid_operand_type);
{ identifiers are handled by BuildExpression } { identifiers are handled by BuildExpression }
oper.opr.typ := OPR_CONSTANT; oper.opr.typ := OPR_CONSTANT;
l:=BuildExpression(true,@tempstr); l:=BuildExpression(true,@tempstr);
oper.opr.val :=aint(l); oper.opr.val :=aint(l);
if tempstr<>'' then if tempstr<>'' then
begin begin
@ -1411,13 +1418,13 @@ const
end; end;
end; end;
{ // Constant memory offset . // } { // Constant memory offset . // }
{ // This must absolutely be followed by ( // }
AS_HEXNUM,AS_INTNUM, AS_HEXNUM,AS_INTNUM,
AS_BINNUM,AS_OCTALNUM,AS_PLUS: AS_BINNUM,AS_OCTALNUM,AS_PLUS:
begin begin
Oper.InitRef; Oper.InitRef;
oper.opr.ref.offset:=BuildRefExpression; oper.opr.ref.offset:=BuildRefExpression;
BuildReference(oper); if actasmtoken = AS_LPAREN then
BuildReference(oper);
end; end;
{ // A constant expression, or a Variable ref. // } { // A constant expression, or a Variable ref. // }
AS_ID: begin AS_ID: begin