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

+ Wp<Controllertype> support for arm and avr

Browse Source 
git-svn-id: trunk@12664 -
This commit is contained in:
florian 2009-02-02 20:16:25 +00:00
parent b39cc14c47
commit acb06dac1b
9 changed files with 250 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
compiler/arm/cpuinfo.pas
View File

@ -47,6 +47,13 @@ Type
fpu_vfp fpu_vfp
); );
tcontrollertype =
(ct_none,
ct_lpc2114,
ct_lpc2124,
ct_lpc2194
);
Const Const
{# Size of native extended floating point type } {# Size of native extended floating point type }
extended_size = 12; extended_size = 12;
@ -83,6 +90,21 @@ Const
'VFP' 'VFP'
); );
controllertypestr : array[tcontrollertype] of string[20] =
('',
'LPC2114',
'LPC2124',
'LPC2194'
);
controllerunitstr : array[tcontrollertype] of string[20] =
('',
'LPC21x4',
'LPC21x4',
'LPC21x4'
);
{ Supported optimizations, only used for information } { Supported optimizations, only used for information }
supported_optimizerswitches = genericlevel1optimizerswitches+ supported_optimizerswitches = genericlevel1optimizerswitches+
genericlevel2optimizerswitches+ genericlevel2optimizerswitches+

27
compiler/globals.pas
View File

@ -132,6 +132,11 @@ interface
maxfpuregisters : shortint; maxfpuregisters : shortint;
minfpconstprec : tfloattype; minfpconstprec : tfloattype;
{ CPU targets with microcontroller support can add a controller specific unit }
{$if defined(ARM)}
controllertype : tcontrollertype;
{$endif defined(ARM)}
end; end;
const const
@ -424,6 +429,9 @@ interface
function Setabitype(const s:string;var a:tabi):boolean; function Setabitype(const s:string;var a:tabi):boolean;
function Setcputype(const s:string;var a:tcputype):boolean; function Setcputype(const s:string;var a:tcputype):boolean;
function SetFpuType(const s:string;var a:tfputype):boolean; function SetFpuType(const s:string;var a:tfputype):boolean;
{$if defined(arm) or defined(avr)}
function SetControllerType(const s:string;var a:tcontrollertype):boolean;
{$endif defined(arm) or defined(avr)}
function UpdateAlignmentStr(s:string;var a:talignmentinfo):boolean; function UpdateAlignmentStr(s:string;var a:talignmentinfo):boolean;
function UpdateOptimizerStr(s:string;var a:toptimizerswitches):boolean; function UpdateOptimizerStr(s:string;var a:toptimizerswitches):boolean;
function UpdateWpoStr(s: string; var a: twpoptimizerswitches): boolean; function UpdateWpoStr(s: string; var a: twpoptimizerswitches): boolean;
@ -999,6 +1007,25 @@ implementation
end; end;
{$if defined(arm) or defined(avr)}
function SetControllerType(const s:string;var a:tcontrollertype):boolean;
var
t : tcontrollertype;
hs : string;
begin
result:=false;
hs:=Upper(s);
for t:=low(tcontrollertype) to high(tcontrollertype) do
if controllertypestr[t]=hs then
begin
a:=t;
result:=true;
break;
end;
end;
{$endif defined(arm) or defined(avr)}
function UpdateAlignmentStr(s:string;var a:talignmentinfo):boolean; function UpdateAlignmentStr(s:string;var a:talignmentinfo):boolean;
var var
tok : string; tok : string;

3
compiler/msg/errore.msg
View File

@ -2627,6 +2627,9 @@ Supported Whole Program Optimizations:
All All
$WPOPTIMIZATIONS $WPOPTIMIZATIONS
Supported Microcontroller types:
$CONTROLLERTYPES
This program comes under the GNU General Public Licence This program comes under the GNU General Public Licence
For more information read COPYING.FPC For more information read COPYING.FPC

2
compiler/msgidx.inc
View File

@ -780,7 +780,7 @@ const
option_info=11024; option_info=11024;
option_help_pages=11025; option_help_pages=11025;
MsgTxtSize = 50510; MsgTxtSize = 50563;
MsgIdxMax : array[1..20] of longint=( MsgIdxMax : array[1..20] of longint=(
24,87,251,84,65,50,108,22,201,62, 24,87,251,84,65,50,108,22,201,62,

209
compiler/msgtxt.inc
View File

@ -917,285 +917,286 @@ const msgtxt : array[0..000210,1..240] of char=(
' All'#010+ ' All'#010+
' $WPOPTIMIZATIONS'#010+ ' $WPOPTIMIZATIONS'#010+
#010+ #010+
'Supported Microcontroller types:'#010+
' $CONTROLLERTYPES'#010+
#010+
'This program comes under the GNU General Public Licence'#010+ 'This program comes under the GNU General Public Licence'#010+
'For more information read COPYING.FPC'#010+ 'For more information r','ead COPYING.FPC'#010+
#010+ #010+
'Report bugs,suggestions etc to:'#010+ 'Report bugs,suggestions etc to:'#010+
' ',' bugs@freepascal.org'#000+ ' bugs@freepascal.org'#000+
'11025_**0*_Put + after a boolean switch option to enable it, - to disa'+ '11025_**0*_Put + after a boolean switch option to enable it, - to disa'+
'ble it'#010+ 'ble it'#010+
'**1a_The compiler doesn'#039't delete the generated assembler file'#010+ '**1a_The compiler doesn'#039't delete the generated assembler file'#010+
'**2al_List sourcecode lines in assembler file'#010+ '**2al_List sour','cecode lines in assembler file'#010+
'**2an_List node info i','n assembler file'#010+ '**2an_List node info in assembler file'#010+
'*L2ap_Use pipes instead of creating temporary assembler files'#010+ '*L2ap_Use pipes instead of creating temporary assembler files'#010+
'**2ar_List register allocation/release info in assembler file'#010+ '**2ar_List register allocation/release info in assembler file'#010+
'**2at_List temp allocation/release info in assembler file'#010+ '**2at_List temp allocation/release info in ass','embler file'#010+
'**1A<x>_Output format:'#010+ '**1A<x>_Output format:'#010+
'**2Adefault_Use de','fault assembler'#010+ '**2Adefault_Use default assembler'#010+
'3*2Aas_Assemble using GNU AS'#010+ '3*2Aas_Assemble using GNU AS'#010+
'3*2Anasmcoff_COFF (Go32v2) file using Nasm'#010+ '3*2Anasmcoff_COFF (Go32v2) file using Nasm'#010+
'3*2Anasmelf_ELF32 (Linux) file using Nasm'#010+ '3*2Anasmelf_ELF32 (Linux) file using Nasm'#010+
'3*2Anasmwin32_Win32 object file using Nasm'#010+ '3*2Anasmwin32_Win32 object file using Nasm'#010+
'3*2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+ '3*2Anasmwdosx_','Win32/WDOSX object file using Nasm'#010+
'3*2Awasm_Obj file ','using Wasm (Watcom)'#010+ '3*2Awasm_Obj file using Wasm (Watcom)'#010+
'3*2Anasmobj_Obj file using Nasm'#010+ '3*2Anasmobj_Obj file using Nasm'#010+
'3*2Amasm_Obj file using Masm (Microsoft)'#010+ '3*2Amasm_Obj file using Masm (Microsoft)'#010+
'3*2Atasm_Obj file using Tasm (Borland)'#010+ '3*2Atasm_Obj file using Tasm (Borland)'#010+
'3*2Aelf_ELF (Linux) using internal writer'#010+ '3*2Aelf_ELF (Linux) using internal writer'#010+
'3*2Acoff_COFF (Go32v2) using internal writer'#010+ '3*2Acoff_COFF',' (Go32v2) using internal writer'#010+
'3*2Apecoff_PE-COFF (W','in32) using internal writer'#010+ '3*2Apecoff_PE-COFF (Win32) using internal writer'#010+
'4*2Aas_Assemble using GNU AS'#010+ '4*2Aas_Assemble using GNU AS'#010+
'6*2Aas_Unix o-file using GNU AS'#010+ '6*2Aas_Unix o-file using GNU AS'#010+
'6*2Agas_GNU Motorola assembler'#010+ '6*2Agas_GNU Motorola assembler'#010+
'6*2Amit_MIT Syntax (old GAS)'#010+ '6*2Amit_MIT Syntax (old GAS)'#010+
'6*2Amot_Standard Motorola assembler'#010+ '6*2Amot_Standard Motorola assembler'#010+
'A*2Aas_Assemble using GNU AS'#010+ 'A*','2Aas_Assemble using GNU AS'#010+
'P*2Aas_Assemble using GNU ','AS'#010+ 'P*2Aas_Assemble using GNU AS'#010+
'S*2Aas_Assemble using GNU AS'#010+ 'S*2Aas_Assemble using GNU AS'#010+
'**1b_Generate browser info'#010+ '**1b_Generate browser info'#010+
'**2bl_Generate local symbol info'#010+ '**2bl_Generate local symbol info'#010+
'**1B_Build all modules'#010+ '**1B_Build all modules'#010+
'**1C<x>_Code generation options:'#010+ '**1C<x>_Code generation options:'#010+
'**2Ca<x>_Select ABI, see fpc -i for possible values'#010+ '**2Ca<x>_Select ABI, see fpc -i for pos','sible values'#010+
'**2Cb_Generate big-endian code'#010+ '**2Cb_Generate big-endian code'#010+
'**2Cc<x>_','Set default calling convention to <x>'#010+ '**2Cc<x>_Set default calling convention to <x>'#010+
'**2CD_Create also dynamic library (not supported)'#010+ '**2CD_Create also dynamic library (not supported)'#010+
'**2Ce_Compilation with emulated floating point opcodes'#010+ '**2Ce_Compilation with emulated floating point opcodes'#010+
'**2Cf<x>_Select fpu instruction set to use, see fpc -i for possible va'+ '**2Cf<x>_Select fpu instruction set to use, ','see fpc -i for possible '+
'lues'#010+ 'values'#010+
'**2CF<x>_Minimal float','ing point constant precision (default, 32, 64)'+ '**2CF<x>_Minimal floating point constant precision (default, 32, 64)'#010+
#010+
'**2Cg_Generate PIC code'#010+ '**2Cg_Generate PIC code'#010+
'**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+ '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+
'**2Ci_IO-checking'#010+ '**2Ci_IO-checking'#010+
'**2Cn_Omit linking stage'#010+ '**2Cn_Omit linking stage'#010+
'**2Co_Check overflow of integer operations'#010+ '**2Co_Check overflow ','of integer operations'#010+
'**2CO_Check for possible overfl','ow of integer operations'#010+ '**2CO_Check for possible overflow of integer operations'#010+
'**2Cp<x>_Select instruction set, see fpc -i for possible values'#010+ '**2Cp<x>_Select instruction set, see fpc -i for possible values'#010+
'**2CP<x>=<y>_ packing settings'#010+ '**2CP<x>=<y>_ packing settings'#010+
'**3CPPACKSET=<y>_ <y> set allocation: 0, 1 or DEFAULT or NORMAL, 2, 4 '+ '**3CPPACKSET=<y>_ <y> set allocation: 0, 1 or DEFAULT or NORMAL, 2,',' '+
'and 8'#010+ '4 and 8'#010+
'**2Cr_Range checking'#010+ '**2Cr_Range checking'#010+
'**2CR_Verify object met','hod call validity'#010+ '**2CR_Verify object method call validity'#010+
'**2Cs<n>_Set stack checking size to <n>'#010+ '**2Cs<n>_Set stack checking size to <n>'#010+
'**2Ct_Stack checking (for testing only, see manual)'#010+ '**2Ct_Stack checking (for testing only, see manual)'#010+
'**2CX_Create also smartlinked library'#010+ '**2CX_Create also smartlinked library'#010+
'**1d<x>_Defines the symbol <x>'#010+ '**1d<x>_Defines the symbol <x>'#010+
'**1D_Generate a DEF file'#010+ '**1D_Gen','erate a DEF file'#010+
'**2Dd<x>_Set description to <x>'#010+ '**2Dd<x>_Set description to <x>'#010+
'**2D','v<x>_Set DLL version to <x>'#010+ '**2Dv<x>_Set DLL version to <x>'#010+
'*O2Dw_PM application'#010+ '*O2Dw_PM application'#010+
'**1e<x>_Set path to executable'#010+ '**1e<x>_Set path to executable'#010+
'**1E_Same as -Cn'#010+ '**1E_Same as -Cn'#010+
'**1fPIC_Same as -Cg'#010+ '**1fPIC_Same as -Cg'#010+
'**1F<x>_Set file names and paths:'#010+ '**1F<x>_Set file names and paths:'#010+
'**2Fa<x>[,y]_(for a program) load units <x> and [y] before uses is par'+ '**2Fa<x>[,y]_(for a program) load un','its <x> and [y] before uses is p'+
'sed'#010+ 'arsed'#010+
'**2Fc<x>_Set in','put codepage to <x>'#010+ '**2Fc<x>_Set input codepage to <x>'#010+
'**2FC<x>_Set RC compiler binary name to <x>'#010+ '**2FC<x>_Set RC compiler binary name to <x>'#010+
'**2FD<x>_Set the directory where to search for compiler utilities'#010+ '**2FD<x>_Set the directory where to search for compiler utilities'#010+
'**2Fe<x>_Redirect error output to <x>'#010+ '**2Fe<x>_Redirect error output to <x>'#010+
'**2Ff<x>_Add <x> to framework path (Darwin only)'#010+ '**2Ff<x>_Add <x> to',' framework path (Darwin only)'#010+
'**2FE<x>_Set exe/unit o','utput path to <x>'#010+ '**2FE<x>_Set exe/unit output path to <x>'#010+
'**2Fi<x>_Add <x> to include path'#010+ '**2Fi<x>_Add <x> to include path'#010+
'**2Fl<x>_Add <x> to library path'#010+ '**2Fl<x>_Add <x> to library path'#010+
'**2FL<x>_Use <x> as dynamic linker'#010+ '**2FL<x>_Use <x> as dynamic linker'#010+
'**2Fm<x>_Load unicode conversion table from <x>.txt in the compiler di'+ '**2Fm<x>_Load unicode conversion table from <x>.txt in the compiler ','d'+
'r'#010+ 'ir'#010+
'**2Fo<x>_Add <x> to object path'#010+ '**2Fo<x>_Add <x> to object path'#010+
'**2Fr<x>_Load err','or message file <x>'#010+ '**2Fr<x>_Load error message file <x>'#010+
'**2FR<x>_Set resource (.res) linker to <x>'#010+ '**2FR<x>_Set resource (.res) linker to <x>'#010+
'**2Fu<x>_Add <x> to unit path'#010+ '**2Fu<x>_Add <x> to unit path'#010+
'**2FU<x>_Set unit output path to <x>, overrides -FE'#010+ '**2FU<x>_Set unit output path to <x>, overrides -FE'#010+
'**2FW<x>_Store generated whole-program optimization feedback in <x>'#010+ '**2FW<x>_Store generated whole-program opt','imization feedback in <x>'#010+
'**2Fw<x>_Load previously st','ored whole-program optimization feedback '+ '**2Fw<x>_Load previously stored whole-program optimization feedback fr'+
'from <x>'#010+ 'om <x>'#010+
'*g1g_Generate debug information (default format for target)'#010+ '*g1g_Generate debug information (default format for target)'#010+
'*g2gc_Generate checks for pointers'#010+ '*g2gc_Generate checks for pointers'#010+
'*g2gh_Use heaptrace unit (for memory leak/corruption debugging)'#010+ '*g2gh_Use heaptrace unit (for memory leak/','corruption debugging)'#010+
'*g2gl_Use line info unit (show ','more info with backtraces)'#010+ '*g2gl_Use line info unit (show more info with backtraces)'#010+
'*g2go<x>_Set debug information options'#010+ '*g2go<x>_Set debug information options'#010+
'*g3godwarfsets_ Enable Dwarf set debug information (breaks gdb < 6.5)'#010+ '*g3godwarfsets_ Enable Dwarf set debug information (breaks gdb < 6.5)'#010+
'*g2gp_Preserve case in stabs symbol names'#010+ '*g2gp_Preserve case in stabs symbol names'#010+
'*g2gs_Generate stabs debug information'#010+ '*g2gs_Gen','erate stabs debug information'#010+
'*g2gt_Trash local varia','bles (to detect uninitialized uses)'#010+ '*g2gt_Trash local variables (to detect uninitialized uses)'#010+
'*g2gv_Generates programs traceable with valgrind'#010+ '*g2gv_Generates programs traceable with valgrind'#010+
'*g2gw_Generate dwarf-2 debug information (same as -gw2)'#010+ '*g2gw_Generate dwarf-2 debug information (same as -gw2)'#010+
'*g2gw2_Generate dwarf-2 debug information'#010+ '*g2gw2_Generate dwarf-2 debug information'#010+
'*g2gw3_Generate dwarf-3 debug information'#010+ '*g2g','w3_Generate dwarf-3 debug information'#010+
'**1i_Informatio','n'#010+ '**1i_Information'#010+
'**2iD_Return compiler date'#010+ '**2iD_Return compiler date'#010+
'**2iV_Return short compiler version'#010+ '**2iV_Return short compiler version'#010+
'**2iW_Return full compiler version'#010+ '**2iW_Return full compiler version'#010+
'**2iSO_Return compiler OS'#010+ '**2iSO_Return compiler OS'#010+
'**2iSP_Return compiler host processor'#010+ '**2iSP_Return compiler host processor'#010+
'**2iTO_Return target OS'#010+ '**2iTO_Return target OS',#010+
'**2iTP_Return target processor'#010+ '**2iTP_Return target processor'#010+
'**1I<x>_Add <x> to in','clude path'#010+ '**1I<x>_Add <x> to include path'#010+
'**1k<x>_Pass <x> to the linker'#010+ '**1k<x>_Pass <x> to the linker'#010+
'**1l_Write logo'#010+ '**1l_Write logo'#010+
'**1M<x>_Set language mode to <x>'#010+ '**1M<x>_Set language mode to <x>'#010+
'**2Mfpc_Free Pascal dialect (default)'#010+ '**2Mfpc_Free Pascal dialect (default)'#010+
'**2Mobjfpc_FPC mode with Object Pascal support'#010+ '**2Mobjfpc_FPC mode with Object Pascal support'#010+
'**2Mdelphi_Delphi 7 compatibility mode'#010+ '**2Mdelphi_','Delphi 7 compatibility mode'#010+
'**2Mtp_TP/BP 7.0 compatib','ility mode'#010+ '**2Mtp_TP/BP 7.0 compatibility mode'#010+
'**2Mmacpas_Macintosh Pascal dialects compatibility mode'#010+ '**2Mmacpas_Macintosh Pascal dialects compatibility mode'#010+
'**1n_Do not read the default config files'#010+ '**1n_Do not read the default config files'#010+
'**1N<x>_Node tree optimizations'#010+ '**1N<x>_Node tree optimizations'#010+
'**2Nu_Unroll loops'#010+ '**2Nu_Unroll loops'#010+
'**1o<x>_Change the name of the executable produced to <x>'#010+ '**1o<x>_Change the name of ','the executable produced to <x>'#010+
'**1O<x>_Optimizations:',#010+ '**1O<x>_Optimizations:'#010+
'**2O-_Disable optimizations'#010+ '**2O-_Disable optimizations'#010+
'**2O1_Level 1 optimizations (quick and debugger friendly)'#010+ '**2O1_Level 1 optimizations (quick and debugger friendly)'#010+
'**2O2_Level 2 optimizations (-O1 + quick optimizations)'#010+ '**2O2_Level 2 optimizations (-O1 + quick optimizations)'#010+
'**2O3_Level 3 optimizations (-O2 + slow optimizations)'#010+ '**2O3_Level 3 optimizations (-O2 + slow opti','mizations)'#010+
'**2Oa<x>=<y>_Set alignment'#010+ '**2Oa<x>=<y>_Set alignment'#010+
'**2Oo[NO]<x>_En','able or disable optimizations, see fpc -i for possibl'+ '**2Oo[NO]<x>_Enable or disable optimizations, see fpc -i for possible '+
'e values'#010+ 'values'#010+
'**2Op<x>_Set target cpu for optimizing, see fpc -i for possible values'+ '**2Op<x>_Set target cpu for optimizing, see fpc -i for possible values'+
#010+ #010+
'**2OW<x>_Generate whole-program optimization feedback for optimization'+ '**2OW<x>_Generate whole-program optimization feedback ','for optimizati'+
' <x>, see fpc -i for possible values'#010, 'on <x>, see fpc -i for possible values'#010+
'**2Ow<x>_Perform whole-program optimization <x>, see fpc -i for possib'+ '**2Ow<x>_Perform whole-program optimization <x>, see fpc -i for possib'+
'le values'#010+ 'le values'#010+
'**2Os_Optimize for size rather than speed'#010+ '**2Os_Optimize for size rather than speed'#010+
'**1pg_Generate profile code for gprof (defines FPC_PROFILE)'#010+ '**1pg_Generate profile code for gprof (defines FPC_PROFILE)'#010+
'**1R<x>_Assembler reading style:'#010+ '**1R<','x>_Assembler reading style:'#010+
'**2Rdefault_Use default a','ssembler for target'#010+ '**2Rdefault_Use default assembler for target'#010+
'3*2Ratt_Read AT&T style assembler'#010+ '3*2Ratt_Read AT&T style assembler'#010+
'3*2Rintel_Read Intel style assembler'#010+ '3*2Rintel_Read Intel style assembler'#010+
'6*2RMOT_Read motorola style assembler'#010+ '6*2RMOT_Read motorola style assembler'#010+
'**1S<x>_Syntax options:'#010+ '**1S<x>_Syntax options:'#010+
'**2S2_Same as -Mobjfpc'#010+ '**2S2_Same as -Mobjfpc'#010+
'**2Sc_Support operators like C (*=,+=,/= and -=)'#010+ '**2Sc_Suppo','rt operators like C (*=,+=,/= and -=)'#010+
'**2Sa_Turn on a','ssertions'#010+ '**2Sa_Turn on assertions'#010+
'**2Sd_Same as -Mdelphi'#010+ '**2Sd_Same as -Mdelphi'#010+
'**2Se<x>_Error options. <x> is a combination of the following:'#010+ '**2Se<x>_Error options. <x> is a combination of the following:'#010+
'**3*_<n> : Compiler halts after the <n> errors (default is 1)'#010+ '**3*_<n> : Compiler halts after the <n> errors (default is 1)'#010+
'**3*_w : Compiler also halts after warnings'#010+ '**3*_w : Compiler also halts ','after warnings'#010+
'**3*_n : Compiler also halts after not','es'#010+ '**3*_n : Compiler also halts after notes'#010+
'**3*_h : Compiler also halts after hints'#010+ '**3*_h : Compiler also halts after hints'#010+
'**2Sg_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+ '**2Sg_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+
'**2Sh_Use ansistrings by default instead of shortstrings'#010+ '**2Sh_Use ansistrings by default instead of shortstrings'#010+
'**2Si_Turn on inlining of procedures/functions declared as "inline"'#010+ '**2Si_Turn on inlining of p','rocedures/functions declared as "inline"'#010+
'**2Sk_Load f','pcylix unit'#010+ '**2Sk_Load fpcylix unit'#010+
'**2SI<x>_Set interface style to <x>'#010+ '**2SI<x>_Set interface style to <x>'#010+
'**3SIcom_COM compatible interface (default)'#010+ '**3SIcom_COM compatible interface (default)'#010+
'**3SIcorba_CORBA compatible interface'#010+ '**3SIcorba_CORBA compatible interface'#010+
'**2Sm_Support macros like C (global)'#010+ '**2Sm_Support macros like C (global)'#010+
'**2So_Same as -Mtp'#010+ '**2So_Same as -Mtp'#010+
'**2Ss_Constructor name must be init (destructor must b','e done)'#010+ '*','*2Ss_Constructor name must be init (destructor must be done)'#010+
'**2St_Allow static keyword in objects'#010+ '**2St_Allow static keyword in objects'#010+
'**2Sx_Enable exception keywords (default in Delphi/ObjFPC modes)'#010+ '**2Sx_Enable exception keywords (default in Delphi/ObjFPC modes)'#010+
'**1s_Do not call assembler and linker'#010+ '**1s_Do not call assembler and linker'#010+
'**2sh_Generate script to link on host'#010+ '**2sh_Generate script to link on host'#010,
'**2st_Generate script to link on target'#010+ '**2st_Generate script to link on target'#010+
'**2sr_Skip re','gister allocation phase (use with -alr)'#010+ '**2sr_Skip register allocation phase (use with -alr)'#010+
'**1T<x>_Target operating system:'#010+ '**1T<x>_Target operating system:'#010+
'3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+ '3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+
'3*2Tfreebsd_FreeBSD'#010+ '3*2Tfreebsd_FreeBSD'#010+
'3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+ '3*2Tgo32v2_Version 2 of DJ Delorie DOS exten','der'#010+
'3*2Tlinux_Linux'#010+ '3*2Tlinux_Linux'#010+
'3*2Tnetbsd_NetBSD'#010+ '3*2Tnetbsd_NetBSD'#010+
'3*2Tnetware_Nov','ell Netware Module (clib)'#010+ '3*2Tnetware_Novell Netware Module (clib)'#010+
'3*2Tnetwlibc_Novell Netware Module (libc)'#010+ '3*2Tnetwlibc_Novell Netware Module (libc)'#010+
'3*2Topenbsd_OpenBSD'#010+ '3*2Topenbsd_OpenBSD'#010+
'3*2Tos2_OS/2 / eComStation'#010+ '3*2Tos2_OS/2 / eComStation'#010+
'3*2Tsunos_SunOS/Solaris'#010+ '3*2Tsunos_SunOS/Solaris'#010+
'3*2Tsymbian_Symbian OS'#010+ '3*2Tsymbian_Symbian OS'#010+
'3*2Twatcom_Watcom compatible DOS extender'#010+ '3*2Twatcom_Watcom compati','ble DOS extender'#010+
'3*2Twdosx_WDOSX DOS extender'#010+ '3*2Twdosx_WDOSX DOS extender'#010+
'3*2Twin','32_Windows 32 Bit'#010+ '3*2Twin32_Windows 32 Bit'#010+
'3*2Twince_Windows CE'#010+ '3*2Twince_Windows CE'#010+
'4*2Tlinux_Linux'#010+ '4*2Tlinux_Linux'#010+
'6*2Tamiga_Commodore Amiga'#010+ '6*2Tamiga_Commodore Amiga'#010+
'6*2Tatari_Atari ST/STe/TT'#010+ '6*2Tatari_Atari ST/STe/TT'#010+
'6*2Tlinux_Linux/m68k'#010+ '6*2Tlinux_Linux/m68k'#010+
'6*2Tmacos_Macintosh m68k (not supported)'#010+ '6*2Tmacos_Macintosh m68k (not supported)'#010+
'6*2Tpalmos_PalmOS'#010+ '6*2Tpalmos_PalmOS'#010,
'A*2Tlinux_Linux'#010+ 'A*2Tlinux_Linux'#010+
'A*2Twince_Windows CE'#010+ 'A*2Twince_Windows CE'#010+
'P*2Tamiga_AmigaO','S on PowerPC'#010+ 'P*2Tamiga_AmigaOS on PowerPC'#010+
'P*2Tdarwin_Darwin and Mac OS X on PowerPC'#010+ 'P*2Tdarwin_Darwin and Mac OS X on PowerPC'#010+
'P*2Tlinux_Linux on PowerPC'#010+ 'P*2Tlinux_Linux on PowerPC'#010+
'P*2Tmacos_Mac OS (classic) on PowerPC'#010+ 'P*2Tmacos_Mac OS (classic) on PowerPC'#010+
'P*2Tmorphos_MorphOS'#010+ 'P*2Tmorphos_MorphOS'#010+
'S*2Tlinux_Linux'#010+ 'S*2Tlinux_Linux'#010+
'**1u<x>_Undefines the symbol <x>'#010+ '**1u<x>_Undefines the symbol <x','>'#010+
'**1U_Unit options:'#010+ '**1U_Unit options:'#010+
'**2Un_Do not check where the uni','t name matches the file name'#010+ '**2Un_Do not check where the unit name matches the file name'#010+
'**2Ur_Generate release unit files (never automatically recompiled)'#010+ '**2Ur_Generate release unit files (never automatically recompiled)'#010+
'**2Us_Compile a system unit'#010+ '**2Us_Compile a system unit'#010+
'**1v<x>_Be verbose. <x> is a combination of the following letters:'#010+ '**1v<x>_Be verbose. <x> is a combination of the following lette','rs:'#010+
'**2*_e : Show errors (default) 0 : Show not','hing (except errors'+ '**2*_e : Show errors (default) 0 : Show nothing (except errors)'#010+
')'#010+
'**2*_w : Show warnings u : Show unit info'#010+ '**2*_w : Show warnings u : Show unit info'#010+
'**2*_n : Show notes t : Show tried/used files'#010+ '**2*_n : Show notes t : Show tried/used files'#010+
'**2*_h : Show hints c : Show conditionals'#010+ '**2*_h : Show hints c : Show c','onditionals'#010+
'**2*_i : Show general info d : ','Show debug info'#010+ '**2*_i : Show general info d : Show debug info'#010+
'**2*_l : Show linenumbers r : Rhide/GCC compatibility mode'#010+ '**2*_l : Show linenumbers r : Rhide/GCC compatibility mode'#010+
'**2*_a : Show everything x : Executable info (Win32 only)'#010+ '**2*_a : Show everything x : Executable info (Win32 only)'#010+
'**2*_b : Write file names messages with full path'#010+ '**2*_b : Write file names messa','ges with full path'#010+
'**2*_v : Write fpcdebug.txt with ',' p : Write tree.log with parse t'+ '**2*_v : Write fpcdebug.txt with p : Write tree.log with parse tre'+
'ree'#010+ 'e'#010+
'**2*_ lots of debugging info q : Show message numbers'#010+ '**2*_ lots of debugging info q : Show message numbers'#010+
'**2*_m<x>,<y> : Don'#039't show messages numbered <x> and <y>'#010+ '**2*_m<x>,<y> : Don'#039't show messages numbered <x> and <y>'#010+
'3*1W<x>_Target-specific options (targets)'#010+ '3*1W<x>_Target-specific option','s (targets)'#010+
'A*1W<x>_Target-specific options (targets)',#010+ 'A*1W<x>_Target-specific options (targets)'#010+
'P*1W<x>_Target-specific options (targets)'#010+ 'P*1W<x>_Target-specific options (targets)'#010+
'p*1W<x>_Target-specific options (targets)'#010+ 'p*1W<x>_Target-specific options (targets)'#010+
'3*2Wb_Create a bundle instead of a library (Darwin)'#010+ '3*2Wb_Create a bundle instead of a library (Darwin)'#010+
'P*2Wb_Create a bundle instead of a library (Darwin)'#010+ 'P*2Wb_Create a bundle instead of a library (Darwin',')'#010+
'p*2Wb_Create a bundle instead of a library (Darwin)',#010+ 'p*2Wb_Create a bundle instead of a library (Darwin)'#010+
'3*2WB_Create a relocatable image (Windows)'#010+ '3*2WB_Create a relocatable image (Windows)'#010+
'A*2WB_Create a relocatable image (Windows, Symbian)'#010+ 'A*2WB_Create a relocatable image (Windows, Symbian)'#010+
'3*2WC_Specify console type application (EMX, OS/2, Windows)'#010+ '3*2WC_Specify console type application (EMX, OS/2, Windows)'#010+
'A*2WC_Specify console type application (Windows)'#010+ 'A*2WC_Specify console type appl','ication (Windows)'#010+
'P*2WC_Specify console type applicat','ion (Classic Mac OS)'#010+ 'P*2WC_Specify console type application (Classic Mac OS)'#010+
'3*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+ '3*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
'A*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+ 'A*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
'3*2We_Use external resources (Darwin)'#010+ '3*2We_Use external resources (Darwin)'#010+
'P*2We_Use external resources (Darwin)'#010+ 'P*2W','e_Use external resources (Darwin)'#010+
'p*2We_Use external ','resources (Darwin)'#010+ 'p*2We_Use external resources (Darwin)'#010+
'3*2WF_Specify full-screen type application (EMX, OS/2)'#010+ '3*2WF_Specify full-screen type application (EMX, OS/2)'#010+
'3*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+ '3*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+
'A*2WG_Specify graphic type application (Windows)'#010+ 'A*2WG_Specify graphic type application (Windows)'#010+
'P*2WG_Specify graphic type application (Classic Mac OS)'#010+ 'P*2W','G_Specify graphic type application (Classic Mac OS)'#010+
'3','*2Wi_Use internal resources (Darwin)'#010+ '3*2Wi_Use internal resources (Darwin)'#010+
'P*2Wi_Use internal resources (Darwin)'#010+ 'P*2Wi_Use internal resources (Darwin)'#010+
'p*2Wi_Use internal resources (Darwin)'#010+ 'p*2Wi_Use internal resources (Darwin)'#010+
'3*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+ '3*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
'A*2WN_Do not generate relocation code, needed for debuggi','ng (Windows'+ 'A*2W','N_Do not generate relocation code, needed for debugging (Windows'+
')'#010+ ')'#010+
'3*2WR_Generate relocation code (Windows)'#010+ '3*2WR_Generate relocation code (Windows)'#010+
'A*2WR_Generate relocation code (Windows)'#010+ 'A*2WR_Generate relocation code (Windows)'#010+
'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+ 'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+
'3*2WX_Enable executable stack (Linux)'#010+ '3*2WX_Enable executable stack (Linu','x)'#010+
'A*2WX_Enable executable stack (Linux)'#010+ 'A*2WX_Enable executable stack (Linux)'#010+
'p*2WX_Enable',' executable stack (Linux)'#010+ 'p*2WX_Enable executable stack (Linux)'#010+
'P*2WX_Enable executable stack (Linux)'#010+ 'P*2WX_Enable executable stack (Linux)'#010+
'**1X_Executable options:'#010+ '**1X_Executable options:'#010+
'**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+ '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+
'ux)'#010+ 'ux)'#010+
'**2Xd_Do not use standard library search path (needed for cross compil'+ '**2Xd_Do not use standar','d library search path (needed for cross comp'+
'e)'#010+ 'ile)'#010+
'**2X','e_Use external linker'#010+ '**2Xe_Use external linker'#010+
'**2Xg_Create debuginfo in a separate file and add a debuglink section '+ '**2Xg_Create debuginfo in a separate file and add a debuglink section '+
'to executable'#010+ 'to executable'#010+
'**2XD_Try to link units dynamically (defines FPC_LINK_DYNAMIC)'#010+ '**2XD_Try to link units dynamically (defines FPC_LINK_DYNAMIC)'#010+
'**2Xi_Use internal linker'#010+ '**2Xi_Use int','ernal linker'#010+
'**2Xm_Generate link map'#010+ '**2Xm_Generate link map'#010+
'**2XM<x>_Set the',' name of the '#039'main'#039' program routine (default'+ '**2XM<x>_Set the name of the '#039'main'#039' program routine (default i'+
' is '#039'main'#039')'#010+ 's '#039'main'#039')'#010+
'**2XP<x>_Prepend the binutils names with the prefix <x>'#010+ '**2XP<x>_Prepend the binutils names with the prefix <x>'#010+
'**2Xr<x>_Set library search path to <x> (needed for cross compile) (Be'+ '**2Xr<x>_Set library search path to <x> (needed for cross compile) (Be'+
'OS, Linux)'#010+ 'OS, L','inux)'#010+
'**2XR<x>_Prepend <x> to all linker search paths',' (BeOS, Darwin, FreeB'+ '**2XR<x>_Prepend <x> to all linker search paths (BeOS, Darwin, FreeBSD'+
'SD, Linux, Mac OS, Solaris)'#010+ ', Linux, Mac OS, Solaris)'#010+
'**2Xs_Strip all symbols from executable'#010+ '**2Xs_Strip all symbols from executable'#010+
'**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#010+ '**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#010+
'**2Xt_Link with static libraries (-static is passed to linker)'#010+ '**2Xt_Link with static libra','ries (-static is passed to linker)'#010+
'**2XX_Try to smart','link units (defines FPC_LINK_SMART)'#010+ '**2XX_Try to smartlink units (defines FPC_LINK_SMART)'#010+
'**1*_'#010+ '**1*_'#010+
'**1?_Show this help'#010+ '**1?_Show this help'#010+
'**1h_Shows this help without waiting' '**1h_Shows this help without waiting'

39
compiler/options.pas
View File

@ -173,6 +173,9 @@ var
opt : toptimizerswitch; opt : toptimizerswitch;
wpopt: twpoptimizerswitch; wpopt: twpoptimizerswitch;
abi : tabi; abi : tabi;
{$if defined(arm) or defined(avr)}
controllertype : tcontrollertype;
{$endif defined(arm) or defined(avr)}
begin begin
p:=MessagePchar(option_info); p:=MessagePchar(option_info);
while assigned(p) do while assigned(p) do
@ -263,8 +266,28 @@ begin
Comment(V_Normal,hs); Comment(V_Normal,hs);
end; end;
end; end;
end; end
end end
{$if defined(arm) or defined(avr)}
else if pos('$CONTROLLERTYPES',s)>0 then
begin
for controllertype:=low(tcontrollertype) to high(tcontrollertype) do
begin
{ currently all whole program optimizations are platform-independent
if opt in supported_wpoptimizerswitches then
}
begin
hs:=s;
hs1:=ControllerTypeStr[controllertype];
if hs1<>'' then
begin
Replace(hs,'$CONTROLLERTYPES',hs1);
Comment(V_Normal,hs);
end;
end;
end
end
{$endif defined(arm) or defined(avr)}
else else
Comment(V_Normal,s); Comment(V_Normal,s);
end; end;
@ -1487,6 +1510,20 @@ begin
RelocSection:=UnsetBool(More,j); RelocSection:=UnsetBool(More,j);
RelocSectionSetExplicitly:=true; RelocSectionSetExplicitly:=true;
end; end;
'p':
begin
{$if defined(arm) or defined(avr)}
if (target_info.system in systems_embedded) then
begin
s:=upper(copy(more,j+1,length(more)-j));
if not(SetControllerType(s,init_settings.controllertype)) then
IllegalPara(opt);
break;
end
else
{$endif defined(arm) or defined(avr)}
IllegalPara(opt);
end;
'R': 'R':
begin begin
{ support -WR+ / -WR- as synonyms to -WR / -WN } { support -WR+ / -WR- as synonyms to -WR / -WN }

7
compiler/pmodules.pas
View File

@ -47,6 +47,7 @@ implementation
pexports, pexports,
wpobase, wpobase,
scanner,pbase,pexpr,psystem,psub,pdecsub,ptype scanner,pbase,pexpr,psystem,psub,pdecsub,ptype
,cpuinfo
{$ifdef i386} {$ifdef i386}
{ fix me! } { fix me! }
,cpubase ,cpubase
@ -587,6 +588,12 @@ implementation
AddUnit('fpcylix'); AddUnit('fpcylix');
AddUnit('dynlibs'); AddUnit('dynlibs');
end; end;
{ CPU targets with microcontroller support can add a controller specific unit }
{$if defined(ARM)}
if (target_info.system in system_embedded) and (current_settings.controllertype<>ct_none) then
AddUnit(controllerunitstr[current_settings.controllertype]);
{$endif ARM}
end; end;

8
compiler/systems.pas
View File

@ -400,6 +400,14 @@ interface
system_powerpc64_darwin,system_x86_64_darwin, system_powerpc64_darwin,system_x86_64_darwin,
system_arm_darwin]; system_arm_darwin];
{ all embedded systems }
systems_embedded = [system_i386_embedded,system_m68k_embedded,
system_alpha_embedded,system_powerpc_embedded,
system_sparc_embedded,system_vm_embedded,
system_iA64_embedded,system_x86_64_embedded,
system_mips_embedded,system_arm_embedded,
system_powerpc64_embedded];
{ all systems supporting exports from programs or units } { all systems supporting exports from programs or units }
system_unit_program_exports = [system_i386_win32, system_unit_program_exports = [system_i386_win32,
system_i386_wdosx, system_i386_wdosx,

64
compiler/systems/t_embed.pas
View File

@ -32,7 +32,8 @@ implementation
uses uses
SysUtils, SysUtils,
cutils,cfileutl,cclasses, cutils,cfileutl,cclasses,
globtype,globals,systems,verbose,script,fmodule,i_embed,link; globtype,globals,systems,verbose,script,fmodule,i_embed,link,
cpuinfo;
type type
TlinkerEmbedded=class(texternallinker) TlinkerEmbedded=class(texternallinker)
@ -214,32 +215,41 @@ begin
end; end;
{$ifdef ARM} {$ifdef ARM}
with linkres do case current_settings.controllertype of
begin ct_none:
add('ENTRY(_START)'); ;
Add('SECTIONS'); ct_lpc2114,
Add('{'); ct_lpc2124,
Add(' . = 0x0; /* start of flash */'); ct_lpc2194:
Add(' /* code and constants */'); with linkres do
Add(' .text :'); begin
Add(' {'); Add('ENTRY(_START)');
Add(' *(.init, .init.*)'); Add('SECTIONS');
Add(' *(.text, .text.*)'); Add('{');
Add(' *(.strings)'); Add(' . = 0x0; /* start of flash */');
Add(' *(.rodata.*)'); Add(' /* code and constants */');
Add(' *(.comment)'); Add(' .text :');
Add(' }'); Add(' {');
Add(' /* uninitialized data */'); Add(' *(.init, .init.*)');
Add(' . = 0x40000000; /* start of ram */'); Add(' *(.text, .text.*)');
Add(' .bss :'); Add(' *(.strings)');
Add(' {'); Add(' *(.rodata.*)');
Add(' *(.bss, .bss.*)'); Add(' *(.comment)');
Add(' *(COMMON)'); Add(' }');
Add(' *(.data, .data.*)'); Add(' /* uninitialized data */');
Add(' KEEP (*(.fpc .fpc.n_version .fpc.n_links))'); Add(' . = 0x40000000; /* start of ram */');
Add(' }'); Add(' .bss :');
Add('}'); Add(' {');
end; Add(' *(.bss, .bss.*)');
Add(' *(COMMON)');
Add(' *(.data, .data.*)');
Add(' KEEP (*(.fpc .fpc.n_version .fpc.n_links))');
Add(' }');
Add('}');
end;
else
internalerror(200902011);
end;
{$endif ARM} {$endif ARM}
{ Write and Close response } { Write and Close response }