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

Rename FPC_HAS_INDIRECT_MAIN_INFORMATION to FPC_HAS_INDIRECT_ENTRY_INFORMATION which is more logical considering the record's name

Browse Source 
git-svn-id: trunk@33950 -
This commit is contained in:
svenbarth 2016-06-11 20:38:22 +00:00
parent f406867100
commit 535621faaa
10 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/options.pas
View File

@ -4072,7 +4072,7 @@ begin
set_system_macro('FPC_FULLVERSION',Format('%d%.02d%.02d',[StrToInt(version_nr),StrToInt(release_nr),StrToInt(patch_nr)]));
if target_info.system in systems_indirect_entry_information then
def_system_macro('FPC_HAS_INDIRECT_MAIN_INFORMATION');
def_system_macro('FPC_HAS_INDIRECT_ENTRY_INFORMATION');
if not (tf_winlikewidestring in target_info.flags) then
def_system_macro('FPC_WIDESTRING_EQUAL_UNICODESTRING');

14
rtl/bsd/system.pp
View File

@ -76,14 +76,14 @@ Implementation
{$endif defined(CPUARM) or defined(CPUM68K)}
{$ifdef FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
{$define FPC_SYSTEM_HAS_OSSETUPENTRYINFORMATION}
procedure OsSetupEntryInformation(const info: TEntryInformation); forward;
{$endif FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION}
{$I system.inc}
{$ifdef FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
procedure OsSetupEntryInformation(const info: TEntryInformation);
begin
argc := info.OS.argc;
@ -91,7 +91,7 @@ begin
envp := info.OS.envp;
initialstklen := info.OS.stklen;
end;
{$endif FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION}
{$ifdef FPC_HAS_SETSYSNR_INC}
{$I setsysnr.inc}
@ -310,7 +310,7 @@ end;
{$ifdef Darwin}
{$ifdef FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
procedure SysEntry(constref info: TEntryInformation);[public,alias:'FPC_SysEntry'];
begin
@ -321,7 +321,7 @@ begin
info.PascalMain();
end;
{$else FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$else FPC_HAS_INDIRECT_ENTRY_INFORMATION}
procedure pascalmain;external name '_PASCALMAIN';
@ -336,7 +336,7 @@ begin
{$endif cpui386}
pascalmain; {run the pascal main program}
end;
{$endif FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION}
{$endif Darwin}
{$endif FPC_USE_LIBC}

10
rtl/i386/fastmove.inc
View File

@ -869,19 +869,19 @@ asm
end;
{$asmmode att}
{$ifndef FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$ifndef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
var
valgrind_used : boolean;external name '__fpc_valgrind';
{$endif FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION}
procedure setup_fastmove;{$ifdef SYSTEMINLINE}inline;{$endif}
begin
{ workaround valgrind bug }
{$ifdef FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
if EntryInformation.valgrind_used then
{$else FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$else FPC_HAS_INDIRECT_ENTRY_INFORMATION}
if valgrind_used then
{$endif FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION}
begin
fastmoveproc_forward:=@Forwards_Valgrind;
fastmoveproc_backward:=@Backwards_Valgrind;

32
rtl/inc/system.inc
View File

@ -98,29 +98,29 @@ var
{$ifndef FPC_NO_GENERIC_STACK_CHECK}
{ if the OS does the stack checking, we don't need any stklen from the
main program }
initialstklen : SizeUint{$ifndef FPC_HAS_INDIRECT_MAIN_INFORMATION}; external name '__stklen';{$else} = 0;{$endif}
initialstklen : SizeUint{$ifndef FPC_HAS_INDIRECT_ENTRY_INFORMATION}; external name '__stklen';{$else} = 0;{$endif}
{$endif FPC_NO_GENERIC_STACK_CHECK}
{$ifdef FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
EntryInformation: TEntryInformation;
{$endif FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION}
var
{$ifdef FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
{$ifdef FPC_HAS_RESSTRINITS}
FPCResStrInitTables : Pointer;public name '_FPC_ResStrInitTables';
{$endif FPC_HAS_RESSTRINITS}
FPCResourceStringTables : Pointer;public name '_FPC_ResourceStringTables';
{$else FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$else FPC_HAS_INDIRECT_ENTRY_INFORMATION}
{$ifdef FPC_HAS_RESSTRINITS}
FPCResStrInitTablesVar : record end; external name 'FPC_RESSTRINITTABLES';
FPCResStrInitTables : Pointer = @FPCResStrInitTablesVar;public name '_FPC_ResStrInitTables';
{$endif FPC_HAS_RESSTRINITS}
FPCResourceStringTablesVar : record end; External Name 'FPC_RESOURCESTRINGTABLES';
FPCResourceStringTables : Pointer = @FPCResourceStringTablesVar;public name '_FPC_ResourceStringTables';
{$endif FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION}
{$ifdef FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
procedure SetupEntryInformation(const info: TEntryInformation);[public,alias:'_FPC_SetupEntryInformation'];
begin
EntryInformation := info;
@ -130,7 +130,7 @@ begin
OSSetupEntryInformation(info);
{$endif FPC_SYSTEM_HAS_OSSETUPENTRYINFORMATION}
end;
{$endif FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION}
{ checks whether the given suggested size for the stack of the current
thread is acceptable. If this is the case, returns it unaltered.
@ -872,10 +872,10 @@ type
PInitFinalTable = ^TInitFinalTable;
{$ifndef FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$ifndef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
var
InitFinalTable : TInitFinalTable;external name 'INITFINAL';
{$endif FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION}
procedure fpc_InitializeUnits;[public,alias:'FPC_INITIALIZEUNITS']; compilerproc;
@ -887,17 +887,17 @@ var
begin
{ call cpu/fpu initialisation routine }
fpc_cpuinit;
{$ifdef FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
{$ifdef DEBUG}
pt := PInitFinalTable(EntryInformation.InitFinalTable);
{$endif}
with PInitFinalTable(EntryInformation.InitFinalTable)^ do
{$else FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$else FPC_HAS_INDIRECT_ENTRY_INFORMATION}
{$ifdef DEBUG}
pt := @InitFinalTable;
{$endif}
with InitFinalTable do
{$endif FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION}
begin
for i:=1 to ALUUInt(TableCount) do
begin
@ -930,11 +930,11 @@ procedure FinalizeUnits; external name 'FPC_FINALIZE_FUNC_TABLE';
{$else CPUAVR}
procedure FinalizeUnits;[public,alias:'FPC_FINALIZEUNITS'];
begin
{$ifdef FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
with PInitFinalTable(EntryInformation.InitFinalTable)^ do
{$else FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$else FPC_HAS_INDIRECT_ENTRY_INFORMATION}
with InitFinalTable do
{$endif FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION}
begin
while (InitCount>0) do
begin

16
rtl/inc/threadvr.inc
View File

@ -33,10 +33,10 @@ type
end;
PltvInitTablesTable = ^TltvInitTablesTable;
{$ifndef FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$ifndef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
var
ThreadvarTablesTable : TltvInitTablesTable; external name 'FPC_THREADVARTABLES';
{$endif FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION}
procedure init_unit_threadvars (tableEntry : pltvInitEntry);
begin
@ -52,11 +52,11 @@ procedure init_all_unit_threadvars;
var
i : longint;
begin
{$ifdef FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
with PltvInitTablesTable(EntryInformation.ThreadvarTablesTable)^ do
{$else FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$else FPC_HAS_INDIRECT_ENTRY_INFORMATION}
with ThreadvarTablesTable do
{$endif FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION}
begin
{$ifdef DEBUG_MT}
WriteLn ('init_all_unit_threadvars (',count,') units');
@ -86,11 +86,11 @@ procedure copy_all_unit_threadvars;
var
i: longint;
begin
{$ifdef FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
with PltvInitTablesTable(EntryInformation.ThreadvarTablesTable)^ do
{$else FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$else FPC_HAS_INDIRECT_ENTRY_INFORMATION}
with ThreadvarTablesTable do
{$endif FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION}
begin
{$ifdef DEBUG_MT}
WriteLn ('copy_all_unit_threadvars (',count,') units');

16
rtl/java/jsystem.inc
View File

@ -875,10 +875,10 @@ type
PInitFinalTable = ^TInitFinalTable;
{$ifndef FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$ifndef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
var
InitFinalTable : TInitFinalTable;external name 'INITFINAL';
{$endif FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION}
procedure fpc_InitializeUnits;[public,alias:'FPC_INITIALIZEUNITS']; compilerproc;
@ -890,17 +890,17 @@ var
begin
{ call cpu/fpu initialisation routine }
fpc_cpuinit;
{$ifdef FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
{$ifdef DEBUG}
pt := PInitFinalTable(EntryInformation.InitFinalTable);
{$endif}
with PInitFinalTable(EntryInformation.InitFinalTable)^ do
{$else FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$else FPC_HAS_INDIRECT_ENTRY_INFORMATION}
{$ifdef DEBUG}
pt := @InitFinalTable;
{$endif}
with InitFinalTable do
{$endif FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION}
begin
for i:=1 to TableCount do
begin
@ -929,11 +929,11 @@ end;
procedure FinalizeUnits;[public,alias:'FPC_FINALIZEUNITS'];
begin
{$ifdef FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
with PInitFinalTable(EntryInformation.InitFinalTable)^ do
{$else FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$else FPC_HAS_INDIRECT_ENTRY_INFORMATION}
with InitFinalTable do
{$endif FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION}
begin
while (InitCount>0) do
begin

6
rtl/win/systhrd.inc
View File

@ -94,12 +94,12 @@ var
var
// public names are used by heaptrc unit
threadvarblocksize : dword; public name '_FPC_TlsSize';
{$ifdef FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
TLSKey : PDword = nil; public name '_FPC_TlsKey';
{$else FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$else FPC_HAS_INDIRECT_ENTRY_INFORMATION}
TLSKeyVar : DWord = $ffffffff;
TLSKey : PDWord = @TLSKeyVar; public name '_FPC_TlsKey';
{$endif FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION}
var
MainThreadIdWin32 : DWORD;

10
rtl/win/systlsdir.inc
View File

@ -23,7 +23,7 @@
{$ifdef FPC_INSSIDE_SYSINIT}
{$ifdef win32}
{$define FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$define FPC_HAS_INDIRECT_ENTRY_INFORMATION}
{$endif win32}
Const
@ -51,9 +51,9 @@ procedure InitSystemThreads; external name '_FPC_InitSystemThreads';
procedure SysAllocateThreadVars; external name '_FPC_SysAllocateThreadVars';
procedure InitHeap; external name '_FPC_InitHeap';
{$ifdef FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
procedure SetupEntryInformation(const info: TEntryInformation); external name '_FPC_SetupEntryInformation';
{$endif FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION}
{$endif FPC_INSSIDE_SYSINIT}
@ -77,12 +77,12 @@ procedure Exec_Tls_callback(Handle : pointer; reason : Dword; Reserved : pointer
and the EntryInformation is a constant which sholud prevent troubles }
DLL_PROCESS_ATTACH:
begin
{$ifdef FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
{ since this procedure is called before SetupEntryInformation and thus
before EXE_Entry we need to setup the entry information here so that
the threadvar handling can be correctly initialized }
SetupEntryInformation(SysInitEntryInformation);
{$endif FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION}
InitHeap;
InitSystemThreads;
end;

18
rtl/win/syswin.inc
View File

@ -356,11 +356,11 @@ Var
DLLInitState : Longint = -1;
DLLBuf : Jmp_buf;
function Dll_entry{$ifdef FPC_HAS_INDIRECT_MAIN_INFORMATION}(const info : TEntryInformation){$endif FPC_HAS_INDIRECT_MAIN_INFORMATION} : longbool; [public,alias:'_FPC_DLL_Entry'];
function Dll_entry{$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION}(const info : TEntryInformation){$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION} : longbool; [public,alias:'_FPC_DLL_Entry'];
begin
{$ifdef FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
SetupEntryInformation(info);
{$endif FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION}
IsLibrary:=true;
DllInitState:=DLLreason;
Dll_entry:=false; { return value is ignored, except when DLLreason=DLL_PROCESS_ATTACH }
@ -371,11 +371,11 @@ function Dll_entry{$ifdef FPC_HAS_INDIRECT_MAIN_INFORMATION}(const info : TEntry
If SetJmp(DLLBuf) = 0 then
begin
{$ifdef FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
EntryInformation.PascalMain();
{$else FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$else FPC_HAS_INDIRECT_ENTRY_INFORMATION}
PascalMain;
{$endif FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION}
Dll_entry:=true;
end
else
@ -660,12 +660,12 @@ type
end;
var
{$ifdef FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
WStrInitTablesTable: PWStrInitTablesTable;
{$else FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$else FPC_HAS_INDIRECT_ENTRY_INFORMATION}
WStrInitTablesTableVar: TWStrInitTablesTable; external name 'FPC_WIDEINITTABLES';
WStrInitTablesTable: PWStrInitTablesTable = @WStrInitTablesTableVar;
{$endif FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION}
function GetACP:UINT; stdcall; external 'kernel32' name 'GetACP';
function GetConsoleCP:UINT; stdcall; external 'kernel32' name 'GetConsoleCP';

2
rtl/win32/system.pp
View File

@ -20,7 +20,7 @@ interface
{$define SYSTEMEXCEPTIONDEBUG}
{$endif SYSTEMDEBUG}
{$define FPC_HAS_INDIRECT_MAIN_INFORMATION}
{$define FPC_HAS_INDIRECT_ENTRY_INFORMATION}
{$ifdef cpui386}
{$define Set_i386_Exception_handler}