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

* in i8086 far code models, put the code in a section called module_name+'_TEXT', so each unit gets a separate code segment

Browse Source 
git-svn-id: trunk@24831 -
This commit is contained in:
nickysn 2013-06-09 12:26:33 +00:00
parent b74af9fda0
commit 3280514d2b
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
compiler/x86/agx86nsm.pas
View File

@ -36,6 +36,8 @@ interface
T386NasmAssembler = class(texternalassembler) T386NasmAssembler = class(texternalassembler)
private private
function CodeSectionName: string;
procedure WriteReference(var ref : treference); procedure WriteReference(var ref : treference);
procedure WriteOper(const o:toper;s : topsize; opcode: tasmop;ops:longint;dest : boolean); procedure WriteOper(const o:toper;s : topsize; opcode: tasmop;ops:longint;dest : boolean);
procedure WriteOper_jmp(const o:toper; op : tasmop); procedure WriteOper_jmp(const o:toper; op : tasmop);
@ -291,6 +293,18 @@ interface
T386NasmAssembler T386NasmAssembler
****************************************************************************} ****************************************************************************}
function T386NasmAssembler.CodeSectionName: string;
begin
{$ifdef i8086}
if current_settings.x86memorymodel in x86_far_code_models then
result:=current_module.modulename^ + '_TEXT'
else
{$endif}
result:='.text';
end;
procedure T386NasmAssembler.WriteReference(var ref : treference); procedure T386NasmAssembler.WriteReference(var ref : treference);
var var
first : boolean; first : boolean;
@ -517,6 +531,8 @@ interface
if (atype in [sec_rodata,sec_rodata_norel]) and if (atype in [sec_rodata,sec_rodata_norel]) and
(target_info.system=system_i386_go32v2) then (target_info.system=system_i386_go32v2) then
AsmWrite('.data') AsmWrite('.data')
else if secnames[atype]='.text' then
AsmWrite(CodeSectionName)
else else
AsmWrite(secnames[atype]); AsmWrite(secnames[atype]);
if create_smartlink_sections and if create_smartlink_sections and
@ -1069,7 +1085,7 @@ interface
end; end;
if current_settings.x86memorymodel in x86_near_code_models then if current_settings.x86memorymodel in x86_near_code_models then
AsmWriteLn('SECTION .text use16 class=code'); AsmWriteLn('SECTION ' + CodeSectionName + ' use16 class=code');
if current_settings.x86memorymodel in x86_near_data_models then if current_settings.x86memorymodel in x86_near_data_models then
begin begin
{ NASM complains if you put a missing section in the GROUP directive, so } { NASM complains if you put a missing section in the GROUP directive, so }
@ -1084,7 +1100,7 @@ interface
else else
AsmWriteLn('GROUP dgroup rodata data bss'); AsmWriteLn('GROUP dgroup rodata data bss');
end; end;
AsmWriteLn('SECTION .text'); AsmWriteLn('SECTION ' + CodeSectionName);
{$else i8086} {$else i8086}
AsmWriteLn('BITS 32'); AsmWriteLn('BITS 32');
{$endif i8086} {$endif i8086}