paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-20 21:09:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fix assembling with masm according to #25858

Browse Source 
git-svn-id: trunk@29635 -
This commit is contained in:
florian 2015-02-05 21:22:39 +00:00
parent 35a04ad095
commit 632f43c490
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/ngenutil.pas
View File

@ -981,7 +981,7 @@ implementation
{ Valgrind usage }
maybe_new_object_file(current_asmdata.asmlists[al_globals]);
new_section(current_asmdata.asmlists[al_globals],sec_data,'__fpc_valgrind',sizeof(boolean));
new_section(current_asmdata.asmlists[al_globals],sec_data,'__fpc_valgrind',sizeof(pint));
current_asmdata.asmlists[al_globals].concat(Tai_symbol.Createname_global('__fpc_valgrind',AT_DATA,sizeof(boolean)));
current_asmdata.asmlists[al_globals].concat(Tai_const.create_8bit(byte(cs_gdb_valgrind in current_settings.globalswitches)));
end;

5
compiler/x86/agx86int.pas
View File

@ -231,6 +231,7 @@ implementation
1: result:='BYTE';
2: result:='WORD';
4: result:='DWORD';
0,
16: result:='PARA';
256: result:='PAGE';
else
@ -821,8 +822,10 @@ implementation
hp:=tai(hp.next);
end;
AsmWriteLn(#9'.386p');
{$ifdef i8086}
AsmWriteLn('DGROUP'#9'GROUP'#9'_BSS,_DATA');
AsmWriteLn(#9'ASSUME'#9'CS:_CODE,ES:DGROUP,DS:DGROUP,SS:DGROUP');
{$endif i8086}
{ I was told that this isn't necesarry because }
{ the labels generated by FPC are unique (FK) }
{ AsmWriteLn(#9'LOCALS '+target_asm.labelprefix); }
@ -925,8 +928,10 @@ implementation
begin
AsmWriteLn(#9'LOCALS '+target_asm.labelprefix);
end;
{$ifdef i8086}
AsmWriteLn('DGROUP'#9'GROUP'#9'_BSS,_DATA');
AsmWriteLn(#9'ASSUME'#9'CS:_CODE,ES:DGROUP,DS:DGROUP,SS:DGROUP');
{$endif i8086}
AsmLn;
end;