+ instruction table generator for arm64

+ Makefile target to build arm64 instruction tables
+ instruction table with integer instructions

git-svn-id: trunk@22900 -
This commit is contained in:
florian 2012-11-01 16:11:19 +00:00
parent 4d1e42e891
commit 0197b84b7f
10 changed files with 878 additions and 2 deletions

7
.gitattributes vendored
View File

@ -6,7 +6,13 @@ compiler/MPWMake -text
compiler/Makefile svneol=native#text/plain
compiler/Makefile.fpc svneol=native#text/plain
compiler/README.txt svneol=native#text/plain
compiler/aarch64/a64att.inc svneol=native#text/plain
compiler/aarch64/a64atts.inc svneol=native#text/plain
compiler/aarch64/a64ins.dat svneol=native#text/plain
compiler/aarch64/a64nop.inc svneol=native#text/plain
compiler/aarch64/a64op.inc svneol=native#text/plain
compiler/aarch64/a64reg.dat svneol=native#text/plain
compiler/aarch64/a64tab.inc svneol=native#text/plain
compiler/aarch64/cpuinfo.pas svneol=native#text/plain
compiler/aarch64/ra64con.inc svneol=native#text/plain
compiler/aarch64/ra64dwa.inc svneol=native#text/plain
@ -662,6 +668,7 @@ compiler/utils/fpimpdef.pp svneol=native#text/plain
compiler/utils/gia64reg.pp svneol=native#text/plain
compiler/utils/gppc386.pp svneol=native#text/plain
compiler/utils/mk68kreg.pp svneol=native#text/plain
compiler/utils/mka64ins.pp svneol=native#text/plain
compiler/utils/mka64reg.pp svneol=native#text/plain
compiler/utils/mkarmins.pp svneol=native#text/plain
compiler/utils/mkarmreg.pp svneol=native#text/plain

View File

@ -3612,7 +3612,10 @@ insdatx86 : $(COMPILER_UNITTARGETDIR) x86/x86ins.dat
insdatarm : arm/armins.dat
$(COMPILER) -FE$(COMPILERUTILSDIR) $(COMPILERUTILSDIR)/mkarmins.pp
cd arm && ..$(PATHSEP)utils$(PATHSEP)mkarmins$(SRCEXEEXT)
insdat: insdatx86 insdatarm
insdataarch64 : aarch64/a64ins.dat
$(COMPILER) -FE$(COMPILERUTILSDIR) $(COMPILERUTILSDIR)/mka64ins.pp
cd aarch64 && ..$(PATHSEP)utils$(PATHSEP)mka64ins$(SRCEXEEXT)
insdat: insdatx86 insdatarm insdataarch64
regdatarm : arm/armreg.dat
$(COMPILER) -FE$(COMPILERUTILSDIR) $(COMPILERUTILSDIR)/mkarmreg.pp
cd arm && ..$(PATHSEP)utils$(PATHSEP)mkarmreg$(SRCEXEEXT)

View File

@ -476,7 +476,11 @@ insdatarm : arm/armins.dat
$(COMPILER) -FE$(COMPILERUTILSDIR) $(COMPILERUTILSDIR)/mkarmins.pp
cd arm && ..$(PATHSEP)utils$(PATHSEP)mkarmins$(SRCEXEEXT)
insdat: insdatx86 insdatarm
insdataarch64 : aarch64/a64ins.dat
$(COMPILER) -FE$(COMPILERUTILSDIR) $(COMPILERUTILSDIR)/mka64ins.pp
cd aarch64 && ..$(PATHSEP)utils$(PATHSEP)mka64ins$(SRCEXEEXT)
insdat: insdatx86 insdatarm insdataarch64
regdatarm : arm/armreg.dat
$(COMPILER) -FE$(COMPILERUTILSDIR) $(COMPILERUTILSDIR)/mkarmreg.pp

View File

@ -0,0 +1,92 @@
{ don't edit, this file is generated from armins.dat }
(
'b',
'cb',
'tb',
'bl',
'blr',
'br',
'ret',
'ldr',
'str',
'ldp',
'stp',
'ldnp',
'stnp',
'ldtr',
'sttr',
'ldxr',
'stxr',
'ldar',
'stlr',
'ldaxr',
'stlxr',
'prfm',
'add',
'adc',
'sub',
'sbc',
'cmp',
'cmn',
'mov',
'and',
'bic',
'eor',
'eon',
'orr',
'orn',
'tst',
'mvn',
'movk',
'adrp',
'adr',
'bfm',
'sbfm',
'ubfm',
'extr',
'sxt',
'uxt',
'asrv',
'llslv',
'lsrv',
'rorv',
'cls',
'clz',
'rbit',
'rev',
'rev16',
'rev32',
'csel',
'csinc',
'csinv',
'csneg',
'ccmn',
'ccmp',
'madd',
'msub',
'smaddl',
'smsubl',
'smulh',
'umaddl',
'umsubl',
'umulh',
'sdiv',
'udiv',
'neg',
'asr',
'lsl',
'lsr',
'ror',
'cset',
'csetm',
'cinc',
'cinv',
'cneg',
'ngc',
'mneg',
'mul',
'smnegl',
'smull',
'umnegl',
'umull'
);

View File

@ -0,0 +1,92 @@
{ don't edit, this file is generated from armins.dat }
(
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE,
attsufNONE
);

179
compiler/aarch64/a64ins.dat Normal file
View File

@ -0,0 +1,179 @@
[B]
[CB]
[TB]
[BL]
[BLR]
[BR]
[RET]
[LDR]
[STR]
[LDP]
[STP]
[LDNP]
[STNP]
[LDTR]
[STTR]
[LDXR]
[STXR]
[LDAR]
[STLR]
[LDAXR]
[STLXR]
[PRFM]
[ADD]
[ADC]
[SUB]
[SBC]
[CMP]
[CMN]
[MOV]
[AND]
[BIC]
[EOR]
[EON]
[ORR]
[ORN]
[TST]
[MVN]
[MOVK]
[ADRP]
[ADR]
[BFM]
[SBFM]
[UBFM]
[EXTR]
[SXT]
[UXT]
[ASRV]
[LLSLV]
[LSRV]
[RORV]
[CLS]
[CLZ]
[RBIT]
[REV]
[REV16]
[REV32]
[CSEL]
[CSINC]
[CSINV]
[CSNEG]
[CCMN]
[CCMP]
[MADD]
[MSUB]
[SMADDL]
[SMSUBL]
[SMULH]
[UMADDL]
[UMSUBL]
[UMULH]
[SDIV]
[UDIV]
; Aliases
; they are not generated by the compiler, they are only used for inline assembler
[NEG]
[ASR]
[LSL]
[LSR]
[ROR]
[CSET]
[CSETM]
[CINC]
[CINV]
[CNEG]
[NGC]
[MNEG]
[MUL]
[SMNEGL]
[SMULL]
[UMNEGL]
[UMULL]

View File

@ -0,0 +1,2 @@
{ don't edit, this file is generated from a64ins.dat }
0;

View File

@ -0,0 +1,92 @@
{ don't edit, this file is generated from armins.dat }
(
A_B,
A_CB,
A_TB,
A_BL,
A_BLR,
A_BR,
A_RET,
A_LDR,
A_STR,
A_LDP,
A_STP,
A_LDNP,
A_STNP,
A_LDTR,
A_STTR,
A_LDXR,
A_STXR,
A_LDAR,
A_STLR,
A_LDAXR,
A_STLXR,
A_PRFM,
A_ADD,
A_ADC,
A_SUB,
A_SBC,
A_CMP,
A_CMN,
A_MOV,
A_AND,
A_BIC,
A_EOR,
A_EON,
A_ORR,
A_ORN,
A_TST,
A_MVN,
A_MOVK,
A_ADRP,
A_ADR,
A_BFM,
A_SBFM,
A_UBFM,
A_EXTR,
A_SXT,
A_UXT,
A_ASRV,
A_LLSLV,
A_LSRV,
A_RORV,
A_CLS,
A_CLZ,
A_RBIT,
A_REV,
A_REV16,
A_REV32,
A_CSEL,
A_CSINC,
A_CSINV,
A_CSNEG,
A_CCMN,
A_CCMP,
A_MADD,
A_MSUB,
A_SMADDL,
A_SMSUBL,
A_SMULH,
A_UMADDL,
A_UMSUBL,
A_UMULH,
A_SDIV,
A_UDIV,
A_NEG,
A_ASR,
A_LSL,
A_LSR,
A_ROR,
A_CSET,
A_CSETM,
A_CINC,
A_CINV,
A_CNEG,
A_NGC,
A_MNEG,
A_MUL,
A_SMNEGL,
A_SMULL,
A_UMNEGL,
A_UMULL
);

View File

@ -0,0 +1,4 @@
{ don't edit, this file is generated from armins.dat }
(
);

401
compiler/utils/mka64ins.pp Normal file
View File

@ -0,0 +1,401 @@
{
Copyright (c) 1998-2005 by Peter Vreman and Florian Klaempfl
Convert i386ins.dat from Nasm to a .inc file for usage with
the Free pascal compiler
See the file COPYING.FPC, included in this distribution,
for details about the copyright.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
**********************************************************************}
{$mode objfpc}
program mkarmins;
const
Version = '0.9';
var
s : string;
i : longint;
function lower(const s : string) : string;
{
return lowercased string of s
}
var
i : longint;
begin
for i:=1 to length(s) do
if s[i] in ['A'..'Z'] then
lower[i]:=char(byte(s[i])+32)
else
lower[i]:=s[i];
lower[0]:=s[0];
end;
function Replace(var s:string;const s1,s2:string):boolean;
var
i : longint;
begin
i:=pos(s1,s);
if i>0 then
begin
Delete(s,i,length(s1));
Insert(s2,s,i);
Replace:=true;
end
else
Replace:=false;
end;
function formatop(s:string):string;
const
replaces=19;
replacetab : array[1..replaces,1..2] of string[32]=(
(':',' or ot_colon'),
('mem8','mem or ot_bits8'),
('mem16','mem or ot_bits16'),
('mem32','mem or ot_bits32'),
('mem64','mem or ot_bits64'),
('mem80','mem or ot_bits80'),
('mem','memory'),
('memory_offs','mem_offs'),
('imm8','imm or ot_bits8'),
('imm16','imm or ot_bits16'),
('imm32','imm or ot_bits32'),
('imm64','imm or ot_bits64'),
('imm80','imm or ot_bits80'),
('imm','immediate'),
('rm8','regmem or ot_bits8'),
('rm16','regmem or ot_bits16'),
('rm32','regmem or ot_bits32'),
('rm64','regmem or ot_bits64'),
('rm80','regmem or ot_bits80')
);
var
i : longint;
begin
for i:=1to replaces do
replace(s,replacetab[i,1],replacetab[i,2]);
formatop:=s;
end;
function readnumber : longint;
var
base : longint;
begin
result:=0;
if s[i]='\' then
begin
base:=8;
inc(i);
if s[i]='x' then
begin
base:=16;
inc(i);
end;
end
else
base:=10;
s[i]:=upcase(s[i]);
while s[i] in ['0'..'9','A'..'F'] do
begin
case s[i] of
'0'..'9':
result:=result*base+ord(s[i])-ord('0');
'A'..'F':
result:=result*base+ord(s[i])-ord('A')+10;
end;
inc(i);
end;
end;
function tostr(l : longint) : string;
var
hs : string;
begin
str(l,hs);
tostr:=hs;
end;
function readstr : string;
begin
result:='';
while (s[i] in ['0'..'9','A'..'Z','a'..'z','_']) and (i<=length(s)) do
begin
result:=result+s[i];
inc(i);
end;
end;
procedure skipspace;
begin
while (s[i] in [' ',#9]) do
inc(i);
end;
procedure openinc(out f:text;const fn:string);
begin
writeln('creating ',fn);
assign(f,fn);
rewrite(f);
writeln(f,'{ don''t edit, this file is generated from armins.dat }');
writeln(f,'(');
end;
procedure closeinc(var f:text);
begin
writeln(f);
writeln(f,');');
close(f);
end;
var
attsuffix,
hs : string;
j : longint;
firstopcode,
first : boolean;
maxinfolen,
code : byte;
insns : longint;
attsuffile,{propfile,}opfile,
nopfile,attfile,
infile,insfile : text;
{ instruction fields }
skip : boolean;
{last,}
ops : longint;
attopcode,
opcode,
codes,
flags : string;
optypes : array[1..4] of string;
begin
writeln('FPC Instruction Table Converter Version ',Version);
writeln('Based on Narm Instruction Table Converter ');
insns:=0;
maxinfolen:=0;
{ open dat file }
assign(infile,'../aarch64/a64ins.dat');
{ create inc files }
openinc(insfile,'a64tab.inc');
openinc(opfile,'a64op.inc');
assign(nopfile,'a64nop.inc');
openinc(attfile,'a64att.inc');
openinc(attsuffile,'a64atts.inc');
rewrite(nopfile);
writeln(nopfile,'{ don''t edit, this file is generated from a64ins.dat }');
reset(infile);
first:=true;
opcode:='';
firstopcode:=true;
while not(eof(infile)) do
begin
{ handle comment }
readln(infile,s);
while (s[1]=' ') do
delete(s,1,1);
if (s='') or (s[1]=';') then
continue;
if (s[1]='[') then
begin
i:=pos(',',s);
j:=pos(']',s);
if i=0 then
begin
opcode:='A_'+Copy(s,2,j-2);
attopcode:=Copy(s,2,j-2);
{ Conditional }
if (attopcode[length(attopcode)]='c') and
(attopcode[length(attopcode)-1]='c') then
begin
dec(byte(attopcode[0]),2);
dec(byte(opcode[0]),2);
end;
attsuffix:='attsufNONE';
end
else
begin
opcode:='A_'+Copy(s,2,i-2);
{ intel conditional }
if (opcode[length(attopcode)]='c') and
(opcode[length(attopcode)-1]='c') then
dec(byte(opcode[0]),2);
attopcode:=Copy(s,i+1,j-i-1);
{ att Suffix }
case attopcode[length(attopcode)] of
'X' :
begin
dec(attopcode[0]);
attsuffix:='attsufINT';
end;
'F' :
begin
dec(attopcode[0]);
attsuffix:='attsufFPU';
end;
'R' :
begin
dec(attopcode[0]);
attsuffix:='attsufFPUint';
end;
else
attsuffix:='attsufNONE';
end;
{ att Conditional }
if (attopcode[length(attopcode)]='C') and
(attopcode[length(attopcode)-1]='C') then
dec(byte(attopcode[0]),2);
end;
attopcode:=Lower(attopcode);
if firstopcode then
firstopcode:=false
else
begin
writeln(opfile,',');
writeln(attfile,',');
writeln(attsuffile,',');
{ writeln(propfile,','); }
end;
write(opfile,opcode);
write(attfile,'''',attopcode,'''');
write(attsuffile,attsuffix);
{ read the next line which contains the Change options }
{
repeat
readln(infile,s);
until eof(infile) or ((s<>'') and (s[1]<>';'));
write(propfile,'(Ch: ',s,')');
}
continue;
end;
{ we must have an opcode }
if opcode='' then
runerror(234);
{ clear }
ops:=0;
optypes[1]:='';
optypes[2]:='';
optypes[3]:='';
optypes[4]:='';
codes:='';
flags:='';
skip:=false;
{ ops and optypes }
i:=1;
repeat
hs:=readstr;
if (hs='void') or (hs='ignore') then
break;
inc(ops);
optypes[ops]:=optypes[ops]+'ot_'+formatop(hs);
{ if s[i]=':' then
begin
inc(i);
optypes[ops]:=optypes[ops]+' or ot_'+formatop(readstr);
end;}
while s[i]='|' do
begin
inc(i);
optypes[ops]:=optypes[ops]+' or ot_'+formatop(readstr);
end;
if s[i] in [',',':'] then
inc(i)
else
break;
until false;
for j:=1 to 4-ops do
optypes[4-j+1]:='ot_none';
{ codes }
skipspace;
j:=0;
(* last:=0;*)
if s[i] in ['\','0'..'9'] then
begin
while not(s[i] in [' ',#9]) do
begin
code:=readnumber;
(*
{ for some codes we want also to change the optypes, but not
if the last byte was a 1 then this byte belongs to a direct
copy }
if last<>1 then
begin
case code of
12,13,14 :
optypes[code-11]:=optypes[code-11]+' or ot_signed';
end;
end;
*)
codes:=codes+'#'+tostr(code);
(* last:=code;*)
inc(j);
end;
end
else
begin
readstr;
codes:='#0';
end;
if j>maxinfolen then
maxinfolen:=j;
{ flags }
skipspace;
while not(s[i] in [' ',#9,#13,#10]) and (i<=length(s)) do
begin
hs:=readstr;
if hs<>'ND' then
begin
if flags<>'' then
flags:=flags+' or ';
flags:=flags+'if_'+lower(hs);
end;
if (s[i]=',') and (i<=length(s)) then
inc(i)
else
break;
end;
{ write instruction }
if not skip then
begin
if not(first) then
writeln(insfile,',')
else
first:=false;
writeln(insfile,' (');
writeln(insfile,' opcode : ',opcode,';');
writeln(insfile,' ops : ',ops,';');
writeln(insfile,' optypes : (',optypes[1],',',optypes[2],',',optypes[3],',',optypes[4],');');
writeln(insfile,' code : ',codes,';');
writeln(insfile,' flags : ',flags);
write(insfile,' )');
inc(insns);
end;
end;
close(infile);
closeinc(insfile);
closeinc(attfile);
closeinc(attsuffile);
closeinc(opfile);
writeln(nopfile,insns,';');
close(nopfile);
{ closeinc(propfile); }
writeln(insns,' nodes processed (maxinfolen=',maxinfolen,')');
end.