paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-17 19:29:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Some watcom assembler wasm improvements

Browse Source 
git-svn-id: trunk@36850 -
This commit is contained in:
pierre 2017-08-04 21:15:10 +00:00
parent 38704411b2
commit c98e9b230f
1 changed files with 79 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
compiler/x86/agx86int.pas
View File

@ -62,6 +62,39 @@ implementation
const const
line_length = 70; line_length = 70;
wasm_cpu_name : array[tcputype] of string = (
{$if defined(x86_64)}
'IA64', // cpu_none,
'686', // cpu_athlon64,
'686', // cpu_core_i,
'686', // cpu_core_avx,
'686' // cpu_core_avx2
{$elseif defined(i386)}
'IA64', // cpu_none,
'386', // cpu_386,
'486', // cpu_486,
'586', // cpu_Pentium,
'686', // cpu_Pentium2,
'686', // cpu_Pentium3,
'686', // cpu_Pentium4,
'686', // cpu_PentiumM,
'686', // cpu_core_i,
'686', // cpu_core_avx,
'686' // cpu_core_avx2
{$elseif defined(i8086)}
'IA64', // cpu_none
'8086', // cpu_8086
'186', // cpu_186
'286', // cpu_286
'386', // cpu_386
'486', // cpu_486
'586', // cpu_Pentium
'686', // cpu_Pentium2
'686', // cpu_Pentium3
'686', // cpu_Pentium4
'686' // cpu_PentiumM
{$endif}
);
secnames : array[TAsmSectiontype] of string[4] = ('','', secnames : array[TAsmSectiontype] of string[4] = ('','',
'CODE','DATA','DATA','DATA','BSS','TLS', 'CODE','DATA','DATA','DATA','BSS','TLS',
'','','','','','', '','','','','','',
@ -461,6 +494,7 @@ implementation
prefix, prefix,
suffix : string; suffix : string;
hp : tai; hp : tai;
cpu: tcputype;
counter, counter,
lines, lines,
InlineLevel : longint; InlineLevel : longint;
@ -832,7 +866,13 @@ implementation
lasTSecType:=tai_section(hp.next).sectype; lasTSecType:=tai_section(hp.next).sectype;
hp:=tai(hp.next); hp:=tai(hp.next);
end; end;
writer.AsmWriteLn(#9'.386p'); if (asminfo^.id = as_i386_wasm) then
begin
writer.AsmWriteLn(#9'.686p');
writer.AsmWriteLn(#9'.mmx');
end
else
writer.AsmWriteLn(#9'.386p');
{$ifdef i8086} {$ifdef i8086}
writer.AsmWriteLn('DGROUP'#9'GROUP'#9'_BSS,_DATA'); writer.AsmWriteLn('DGROUP'#9'GROUP'#9'_BSS,_DATA');
writer.AsmWriteLn(#9'ASSUME'#9'CS:_CODE,ES:DGROUP,DS:DGROUP,SS:DGROUP'); writer.AsmWriteLn(#9'ASSUME'#9'CS:_CODE,ES:DGROUP,DS:DGROUP,SS:DGROUP');
@ -859,17 +899,42 @@ implementation
begin begin
case tai_directive(hp).directive of case tai_directive(hp).directive of
asd_nasm_import : asd_nasm_import :
writer.AsmWrite('import '); begin
writer.AsmWrite('import ');
writer.AsmWrite(tai_directive(hp).name);
writer.AsmLn;
end;
asd_extern : asd_extern :
writer.AsmWrite('EXTRN '); begin
writer.AsmWrite('EXTRN ');
writer.AsmWrite(tai_directive(hp).name);
writer.AsmLn;
end;
asd_cpu : asd_cpu :
{ TODO: implement this properly for TASM/MASM/WASM (.686p, etc.) } begin
writer.AsmWrite(asminfo^.comment+' CPU '); if (asminfo^.id = as_i386_wasm) then
begin
writer.AsmWrite('.');
for cpu:=low(tcputype) to high(tcputype) do
begin
if tai_directive(hp).name=CPUTypeStr[CPU] then
begin
writer.AsmWriteLn(wasm_cpu_name[cpu]);
break;
end;
end;
end
else
begin
{ TODO: implement this properly for TASM/MASM/WASM (.686p, etc.) }
writer.AsmWrite(asminfo^.comment+' CPU ');
writer.AsmWrite(tai_directive(hp).name);
writer.AsmLn;
end;
end
else else
internalerror(200509192); internalerror(200509192);
end; end;
writer.AsmWrite(tai_directive(hp).name);
writer.AsmLn;
end; end;
ait_seh_directive : ait_seh_directive :
{ Ignore for now }; { Ignore for now };
@ -936,7 +1001,13 @@ implementation
{$endif} {$endif}
if asminfo^.id<>as_x86_64_masm then if asminfo^.id<>as_x86_64_masm then
begin begin
writer.AsmWriteLn(#9'.386p'); if (asminfo^.id = as_i386_wasm) then
begin
writer.AsmWriteLn(#9'.686p');
writer.AsmWriteLn(#9'.mmx');
end
else
writer.AsmWriteLn(#9'.386p');
{ masm 6.11 does not seem to like LOCALS PM } { masm 6.11 does not seem to like LOCALS PM }
if (asminfo^.id = as_i386_tasm) then if (asminfo^.id = as_i386_tasm) then
begin begin