From 759803f2689c544947533e29231cd63e42f6bf9e Mon Sep 17 00:00:00 2001 From: florian Date: Mon, 6 Apr 2020 20:44:32 +0000 Subject: [PATCH] * improve assembler reader git-svn-id: trunk@44621 - --- compiler/xtensa/racpugas.pas | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/compiler/xtensa/racpugas.pas b/compiler/xtensa/racpugas.pas index a188c94087..521ab2112e 100644 --- a/compiler/xtensa/racpugas.pas +++ b/compiler/xtensa/racpugas.pas @@ -596,9 +596,10 @@ Unit racpugas; BuildReference(oper); end; - AS_HASH: { Constant expression } + AS_MINUS, + AS_PLUS, + AS_INTNUM: { Constant expression } Begin - Consume(AS_HASH); BuildConstantOperand(oper); end; AS_ID: { A constant expression, or a Variable ref. } @@ -841,14 +842,13 @@ Unit racpugas; actcondition:=C_None; - { first, handle B else BLS is read wrong } - if ((hs[1]='J') and (length(hs)=3)) then + if hs[1]='B' then begin for icond:=low(tasmcond) to high(tasmcond) do begin - if copy(hs,2,3)=uppercond2str[icond] then + if copy(hs,2,length(hs)-1)=uppercond2str[icond] then begin - actopcode:=A_J; + actopcode:=A_Bcc; actasmtoken:=AS_OPCODE; actcondition:=icond; is_asmopcode:=true; @@ -856,7 +856,7 @@ Unit racpugas; end; end; end; - maxlen:=min(length(hs),6); + maxlen:=min(length(hs),7); actopcode:=A_NONE; j2:=maxlen; hs2:=hs;