Use same entered_paren local variable as 64-bit counterpart and fix register names

git-svn-id: trunk@43522 -
This commit is contained in:
pierre 2019-11-20 22:44:30 +00:00
parent 6248a127ca
commit a61a0cce4c

View File

@ -380,8 +380,10 @@ Unit rarv32gas;
hl : tasmlabel; hl : tasmlabel;
ofs : aint; ofs : aint;
refaddr: trefaddr; refaddr: trefaddr;
entered_paren: Boolean;
Begin Begin
expr:=''; expr:='';
entered_paren:=false;
refaddr:=addr_full; refaddr:=addr_full;
if actasmtoken=AS_MOD then if actasmtoken=AS_MOD then
@ -411,6 +413,7 @@ Unit rarv32gas;
consume(AS_ID); consume(AS_ID);
consume(AS_LPAREN); consume(AS_LPAREN);
entered_paren:=true;
end; end;
end; end;
@ -515,7 +518,7 @@ Unit rarv32gas;
{ add a constant expression? } { add a constant expression? }
if (actasmtoken=AS_PLUS) then if (actasmtoken=AS_PLUS) then
begin begin
l:=BuildConstExpression(true,false); l:=BuildConstExpression(true,entered_paren);
case oper.opr.typ of case oper.opr.typ of
OPR_CONSTANT : OPR_CONSTANT :
inc(oper.opr.val,l); inc(oper.opr.val,l);
@ -645,10 +648,10 @@ Unit rarv32gas;
(name: 'A1'; reg : NR_X11), (name: 'A1'; reg : NR_X11),
(name: 'A2'; reg : NR_X12), (name: 'A2'; reg : NR_X12),
(name: 'A3'; reg : NR_X13), (name: 'A3'; reg : NR_X13),
(name: 'A5'; reg : NR_X14), (name: 'A4'; reg : NR_X14),
(name: 'A6'; reg : NR_X15), (name: 'A5'; reg : NR_X15),
(name: 'A7'; reg : NR_X16), (name: 'A6'; reg : NR_X16),
(name: 'A8'; reg : NR_X17), (name: 'A7'; reg : NR_X17),
(name: 'RA'; reg : NR_X1), (name: 'RA'; reg : NR_X1),
(name: 'SP'; reg : NR_X2), (name: 'SP'; reg : NR_X2),
(name: 'GP'; reg : NR_X3), (name: 'GP'; reg : NR_X3),