From 243e3bbb77467c9fdc049b33f21b6d43d34fef20 Mon Sep 17 00:00:00 2001 From: nickysn Date: Sun, 25 Aug 2013 16:45:04 +0000 Subject: [PATCH] + added i8086 memory model flags to the ppu flags and added a check that prevents the using of units compiled for different memory models git-svn-id: trunk@25365 - --- compiler/fppu.pas | 35 ++++ compiler/msg/errore.msg | 3 + compiler/msgidx.inc | 5 +- compiler/msgtxt.inc | 400 ++++++++++++++++++++-------------------- compiler/ppu.pas | 3 + 5 files changed, 243 insertions(+), 203 deletions(-) diff --git a/compiler/fppu.pas b/compiler/fppu.pas index 85f57ef9a5..ffe0c3ccc6 100644 --- a/compiler/fppu.pas +++ b/compiler/fppu.pas @@ -230,6 +230,33 @@ var Message(unit_u_ppu_invalid_target,@queuecomment); exit; end; +{$ifdef i8086} + { check i8086 memory model flags } + if ((ppufile.header.flags and uf_i8086_far_code)<>0) xor + (current_settings.x86memorymodel in [mm_medium,mm_large,mm_huge]) then + begin + ppufile.free; + ppufile:=nil; + Message(unit_u_ppu_invalid_memory_model,@queuecomment); + exit; + end; + if ((ppufile.header.flags and uf_i8086_far_data)<>0) xor + (current_settings.x86memorymodel in [mm_compact,mm_large]) then + begin + ppufile.free; + ppufile:=nil; + Message(unit_u_ppu_invalid_memory_model,@queuecomment); + exit; + end; + if ((ppufile.header.flags and uf_i8086_huge_data)<>0) xor + (current_settings.x86memorymodel=mm_huge) then + begin + ppufile.free; + ppufile:=nil; + Message(unit_u_ppu_invalid_memory_model,@queuecomment); + exit; + end; +{$endif i8086} {$ifdef cpufpemu} { check if floating point emulation is on? fpu emulation isn't unit levelwise because it affects calling convention } @@ -1061,6 +1088,14 @@ var flags:=flags or uf_release; if assigned(localsymtable) then flags:=flags or uf_local_symtable; +{$ifdef i8086} + if current_settings.x86memorymodel in [mm_medium,mm_large,mm_huge] then + flags:=flags or uf_i8086_far_code; + if current_settings.x86memorymodel in [mm_compact,mm_large] then + flags:=flags or uf_i8086_far_data; + if current_settings.x86memorymodel=mm_huge then + flags:=flags or uf_i8086_huge_data; +{$endif i8086} {$ifdef cpufpemu} if (cs_fp_emulation in current_settings.moduleswitches) then flags:=flags or uf_fpu_emulation; diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg index 557916edd5..e3b25e5af9 100644 --- a/compiler/msg/errore.msg +++ b/compiler/msg/errore.msg @@ -3055,6 +3055,9 @@ unit_u_indirect_crc_changed=10062_U_Indirect interface (objects/classes) CRC cha % in the interfaces of units directly or indirectly used by this unit in the interface) has been changed after the % implementation has been parsed. % \end{description} +unit_u_ppu_invalid_memory_model=10063_U_PPU is compiled for another i8086 memory model +% This unit file was compiled for a different i8086 memory model and +% cannot be read. # EndOfTeX # diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc index e4552ef466..402d7d8813 100644 --- a/compiler/msgidx.inc +++ b/compiler/msgidx.inc @@ -903,6 +903,7 @@ const unit_u_unload_resunit=10060; unit_e_different_wpo_file=10061; unit_u_indirect_crc_changed=10062; + unit_u_ppu_invalid_memory_model=10063; option_usage=11000; option_only_one_source_support=11001; option_def_only_for_os2=11002; @@ -976,9 +977,9 @@ const option_info=11024; option_help_pages=11025; - MsgTxtSize = 69123; + MsgTxtSize = 69178; MsgIdxMax : array[1..20] of longint=( - 26,95,335,121,88,56,126,27,202,63, + 26,95,335,121,88,56,126,27,202,64, 54,20,1,1,1,1,1,1,1,1 ); diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc index b36f6ddb8c..85d2c72b88 100644 --- a/compiler/msgtxt.inc +++ b/compiler/msgtxt.inc @@ -1083,114 +1083,115 @@ const msgtxt : array[0..000288,1..240] of char=( 'ion feedback input ($2, ','$3); recompile it without wpo or use the sam'+ 'e wpo feedback input file for this compilation invocation'#000+ '10062_U_Indirect interface (objects/classes) CRC changed for unit $1'#000+ - '11000_O_$1 [options] [options]'#000+ - '11001_W_Only one source fi','le supported, changing source file to comp'+ - 'ile from "$1" into "$2"'#000+ + '10063_U_PPU is compiled for another i8086 memory model'#000+ + '11000_O_$1 [op','tions] [options]'#000+ + '11001_W_Only one source file supported, changing source file to compil'+ + 'e from "$1" into "$2"'#000+ '11002_W_DEF file can be created only for OS/2'#000+ '11003_E_nested response files are not supported'#000+ - '11004_F_No source file name in command line'#000+ - '11005_N_No option inside $1 config f','ile'#000+ + '11004_F_No source file na','me in command line'#000+ + '11005_N_No option inside $1 config file'#000+ '11006_E_Illegal parameter: $1'#000+ '11007_H_-? writes help pages'#000+ '11008_F_Too many config files nested'#000+ '11009_F_Unable to open file $1'#000+ '11010_D_Reading further options from $1'#000+ - '11011_W_Target is already set to: $1'#000+ - '11012_W_Shared libs not supporte','d on DOS platform, reverting to stat'+ - 'ic'#000+ + '11011_W_Target',' is already set to: $1'#000+ + '11012_W_Shared libs not supported on DOS platform, reverting to static'+ + #000+ '11013_F_In options file $1 at line $2 too many \var{\#IF(N)DEFs} encou'+ 'ntered'#000+ - '11014_F_In options file $1 at line $2 unexpected \var{\#ENDIFs} encoun'+ - 'tered'#000+ - '11015_F_Open conditional at the end of the optio','ns file'#000+ + '11014_F_In options file $1 at line $2 unexpected \var{\#ENDIFs} encou', + 'ntered'#000+ + '11015_F_Open conditional at the end of the options file'#000+ '11016_W_Debug information generation is not supported by this executab'+ 'le'#000+ '11017_H_Try recompiling with -dGDB'#000+ '11018_W_You are using the obsolete switch $1'#000+ - '11019_W_You are using the obsolete switch $1, please use $2'#000+ - '11020_N_Switching a','ssembler to default source writing assembler'#000+ + '11019_W_You are using th','e obsolete switch $1, please use $2'#000+ + '11020_N_Switching assembler to default source writing assembler'#000+ '11021_W_Assembler output selected "$1" is not compatible with "$2"'#000+ '11022_W_"$1" assembler use forced'#000+ '11026_T_Reading options from file $1'#000+ - '11027_T_Reading options from environment $1'#000+ - '11028_D_Handl','ing option "$1"'#000+ + '11','027_T_Reading options from environment $1'#000+ + '11028_D_Handling option "$1"'#000+ '11029_O_*** press enter ***'#000+ '11030_H_Start of reading config file $1'#000+ '11031_H_End of reading config file $1'#000+ '11032_D_interpreting option "$1"'#000+ - '11036_D_interpreting firstpass option "$1"'#000+ + '11036_D_interpreting firstpass',' option "$1"'#000+ '11033_D_interpreting file option "$1"'#000+ - '1103','4_D_Reading config file "$1"'#000+ + '11034_D_Reading config file "$1"'#000+ '11035_D_found source file name "$1"'#000+ '11039_E_Unknown codepage "$1"'#000+ '11040_F_Config file $1 is a directory'#000+ - '11041_W_Assembler output selected "$1" cannot generate debug info, deb'+ - 'ugging disabled'#000+ - '11042_W_Use of ppc386','.cfg is deprecated, please use fpc.cfg instead'#000+ + '11041_W_Assembler output selected "$1" cannot genera','te debug info, d'+ + 'ebugging disabled'#000+ + '11042_W_Use of ppc386.cfg is deprecated, please use fpc.cfg instead'#000+ '11043_F_In options file $1 at line $2 \var{\#ELSE} directive without \'+ 'var{\#IF(N)DEF} found'#000+ - '11044_F_Option "$1" is not, or not yet, supported on the current targe'+ - 't platform'#000+ - '11045_F_The feature ','"$1" is not, or not yet, supported on the select'+ - 'ed target platform'#000+ + '11044_F_Option "$1" is not, or not yet, suppor','ted on the current tar'+ + 'get platform'#000+ + '11045_F_The feature "$1" is not, or not yet, supported on the selected'+ + ' target platform'#000+ '11046_N_DWARF debug information cannot be used with smart linking on t'+ 'his target, switching to static linking'#000+ - '11047_W_Option "$1" is ignored for the current target platform.',#000+ + '11047_W_','Option "$1" is ignored for the current target platform.'#000+ '11048_W_Disabling external debug information because it is unsupported'+ ' for the selected target/debug format combination.'#000+ - '11049_N_DWARF debug information cannot be used with smart linking with'+ - ' external assembler, disabling static library cr','eation.'#000+ + '11049_N_DWARF debug information cannot be used with smart linki','ng wi'+ + 'th external assembler, disabling static library creation.'#000+ '11050_E_Invalid value for MACOSX_DEPLOYMENT_TARGET environment variabl'+ 'e: $1'#000+ '11051_E_Invalid value for IPHONEOS_DEPLOYMENT_TARGET environment varia'+ 'ble: $1'#000+ - '11052_E_You must use a FPU type of VFPV2, VFPV3 or VFPV3_D16 when usin'+ - 'g the EA','BIHF ABI target'#000+ + '11052_E_You must use a ','FPU type of VFPV2, VFPV3 or VFPV3_D16 when us'+ + 'ing the EABIHF ABI target'#000+ '11053_W_The selected debug format is not supported on the current targ'+ 'et, not changing the current setting'#000+ - '12000_F_Cannot open whole program optimization feedback file "$1"'#000+ - '12001_D_Processing whole program optimization infor','mation in wpo fee'+ - 'dback file "$1"'#000+ + '12000_F_Cannot open whole program optimization feedback file "','$1"'#000+ + '12001_D_Processing whole program optimization information in wpo feedb'+ + 'ack file "$1"'#000+ '12002_D_Finished processing the whole program optimization information'+ ' in wpo feedback file "$1"'#000+ - '12003_E_Expected section header, but got "$2" at line $1 of wpo feedba'+ - 'ck file'#000+ - '12004_W_No handler registered fo','r whole program optimization section'+ - ' "$2" at line $1 of wpo feedback file, ignoring'#000+ + '12003_E_Expected section header, but got "$2" at line $','1 of wpo feed'+ + 'back file'#000+ + '12004_W_No handler registered for whole program optimization section "'+ + '$2" at line $1 of wpo feedback file, ignoring'#000+ '12005_D_Found whole program optimization section "$1" with information'+ ' about "$2"'#000+ - '12006_F_The selected whole program optimizations require a previously '+ - 'gene','rated feedback file (use -Fw to specify)'#000+ + '12006_F_The selecte','d whole program optimizations require a previousl'+ + 'y generated feedback file (use -Fw to specify)'#000+ '12007_E_No collected information necessary to perform "$1" whole progr'+ 'am optimization found'#000+ - '12008_F_Specify a whole program optimization feedback file to store th'+ - 'e generated info in (using -FW)'#000+ - '12009','_E_Not generating any whole program optimization information, y'+ - 'et a feedback file was specified (using -FW)'#000+ + '12008_F_Specify a whole program optimization feedbac','k file to store '+ + 'the generated info in (using -FW)'#000+ + '12009_E_Not generating any whole program optimization information, yet'+ + ' a feedback file was specified (using -FW)'#000+ '12010_E_Not performing any whole program optimizations, yet an input f'+ - 'eedback file was specified (using -Fw)'#000+ - '12011_D_Skipping whole ','program optimization section "$1", because no'+ - 't needed by the requested optimizations'#000+ + 'eedback',' file was specified (using -Fw)'#000+ + '12011_D_Skipping whole program optimization section "$1", because not '+ + 'needed by the requested optimizations'#000+ '12012_W_Overriding previously read information for "$1" from feedback '+ - 'input file using information in section "$2"'#000+ - '12013_E_Cannot extract symbol liveness i','nformation from program when'+ - ' stripping symbols, use -Xs-'#000+ + 'input file using information i','n section "$2"'#000+ + '12013_E_Cannot extract symbol liveness information from program when s'+ + 'tripping symbols, use -Xs-'#000+ '12014_E_Cannot extract symbol liveness information from program when w'+ 'hen not linking'#000+ - '12015_F_Cannot find "$1" or "$2" to extract symbol liveness informatio'+ - 'n from linked program'#000+ - '12016','_E_Error during reading symbol liveness information produced by'+ - ' "$1"'#000+ + '12015_F_Cannot find "$1" or "$2" to extrac','t symbol liveness informat'+ + 'ion from linked program'#000+ + '12016_E_Error during reading symbol liveness information produced by "'+ + '$1"'#000+ '12017_F_Error executing "$1" (exitcode: $2) to extract symbol informat'+ 'ion from linked program'#000+ - '12018_E_Collection of symbol liveness information can only help when u'+ - 'sing sm','art linking, use -CX -XX'#000+ + '12018_E_Collection of ','symbol liveness information can only help when'+ + ' using smart linking, use -CX -XX'#000+ '12019_E_Cannot create specified whole program optimisation feedback fi'+ 'le "$1"'#000+ '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPC'+ 'CPU'#010+ - 'Copyright (c) 1993-2013 by Florian Klaempfl and others'#000+ - '11024_Fr','ee Pascal Compiler version $FPCVERSION'#010+ + 'Copyrigh','t (c) 1993-2013 by Florian Klaempfl and others'#000+ + '11024_Free Pascal Compiler version $FPCVERSION'#010+ #010+ 'Compiler Date : $FPCDATE'#010+ 'Compiler CPU Target: $FPCCPU'#010+ @@ -1200,10 +1201,10 @@ const msgtxt : array[0..000288,1..240] of char=( #010+ 'Supported CPU instruction sets:'#010+ ' $INSTRUCTIONSETS'#010+ - #010+ + #010, 'Supported FPU instruction sets:'#010+ ' $FPUINSTRUCTIONSETS'#010+ - #010, + #010+ 'Supported ABI targets:'#010+ ' $ABITARGETS'#010+ #010+ @@ -1215,260 +1216,259 @@ const msgtxt : array[0..000288,1..240] of char=( ' $WPOPTIMIZATIONS'#010+ #010+ 'Supported Microcontroller types:'#010+ - ' $CONTROLLERTYPES'#010+ + ' $CON','TROLLERTYPES'#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.v2'#010+ #010+ 'Please report bugs in our bug tracker on:'#010+ ' http://bugs.freepascal.org'#010+ #010+ - 'More information may be found on our WWW pages (including directions'#010+ - 'for mailing lists useful for as','king questions or discussing potentia'+ - 'l'#010+ + 'More information may be found on our WWW page','s (including directions'+ + #010+ + 'for mailing lists useful for asking questions or discussing potential'#010+ 'new features, etc.):'#010+ ' http://www.freepascal.org'#000+ '11025_**0*_Put + after a boolean switch option to enable it, - to disa'+ 'ble it'#010+ - '**1a_The compiler doesn'#039't delete the generated assembler fil','e'#010+ + '**1a_','The compiler doesn'#039't delete the generated assembler file'#010+ '**2al_List sourcecode lines in assembler file'#010+ '**2an_List node info in assembler file (-dEXTDEBUG compiler)'#010+ '*L2ap_Use pipes instead of creating temporary assembler files'#010+ - '**2ar_List register allocation/release info in assembler file'#010+ - '**2at_L','ist temp allocation/release info in assembler file'#010+ + '**2ar_List reg','ister allocation/release info in assembler file'#010+ + '**2at_List temp allocation/release info in assembler file'#010+ '**1A_Output format:'#010+ '**2Adefault_Use default assembler'#010+ '3*2Aas_Assemble using GNU AS'#010+ - '3*2Amacho_Mach-O (Darwin, Intel 32 bit) using internal writer'#010+ - '3*2Anasmcoff_COFF (Go32v2) file using Nas','m'#010+ + '3*2Amacho_Mach-O (Darwin, Intel 32 bit) using in','ternal writer'#010+ + '3*2Anasmcoff_COFF (Go32v2) file using Nasm'#010+ '3*2Anasmelf_ELF32 (Linux) file using Nasm'#010+ '3*2Anasmwin32_Win32 object file using Nasm'#010+ '3*2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+ '3*2Awasm_Obj file using Wasm (Watcom)'#010+ - '3*2Anasmobj_Obj file using Nasm'#010+ - '3*2Amasm_Obj file using Masm (Micr','osoft)'#010+ + '3*2Anasmobj','_Obj file using Nasm'#010+ + '3*2Amasm_Obj file using Masm (Microsoft)'#010+ '3*2Atasm_Obj file using Tasm (Borland)'#010+ '3*2Aelf_ELF (Linux) using internal writer'#010+ '3*2Acoff_COFF (Go32v2) using internal writer'#010+ '3*2Apecoff_PE-COFF (Win32) using internal writer'#010+ - '4*2Aas_Assemble using GNU AS'#010+ - '4*2Agas_Assemble using GNU GA','S'#010+ + '4*2','Aas_Assemble using GNU AS'#010+ + '4*2Agas_Assemble using GNU GAS'#010+ '4*2Agas-darwin_Assemble darwin Mach-O64 using GNU GAS'#010+ '4*2Amasm_Win64 object file using ml64 (Microsoft)'#010+ '4*2Apecoff_PE-COFF (Win64) using internal writer'#010+ - '4*2Aelf_ELF (Linux-64bit) using internal writer'#010+ + '4*2Aelf_ELF (Linux-64bit) usin','g internal writer'#010+ '6*2Aas_Unix o-file using GNU AS'#010+ - '6*2Ag','as_GNU Motorola assembler'#010+ + '6*2Agas_GNU Motorola assembler'#010+ '6*2Amit_MIT Syntax (old GAS)'#010+ '6*2Amot_Standard Motorola assembler'#010+ 'A*2Aas_Assemble using GNU AS'#010+ 'P*2Aas_Assemble using GNU AS'#010+ 'S*2Aas_Assemble using GNU AS'#010+ - '**1b_Generate browser info'#010+ + '**1b_Ge','nerate browser info'#010+ '**2bl_Generate local symbol info'#010+ - '**','1B_Build all modules'#010+ + '**1B_Build all modules'#010+ '**1C_Code generation options:'#010+ '**2C3_Turn on ieee error checking for constants'#010+ '**2Ca_Select ABI, see fpc -i for possible values'#010+ - '**2Cb_Generate code for a big-endian variant of the target architectur'+ - 'e'#010+ - '**2Cc_Se','t default calling convention to '#010+ + '**2Cb_Generate code for a bi','g-endian variant of the target architect'+ + 'ure'#010+ + '**2Cc_Set default calling convention to '#010+ '**2CD_Create also dynamic library (not supported)'#010+ '**2Ce_Compilation with emulated floating point opcodes'#010+ - '**2Cf_Select fpu instruction set to use, see fpc -i for possible va'+ - 'lues'#010+ - '**2CF_Minimal floatin','g point constant precision (default, 32, 64)'+ - #010+ + '**2Cf_Select fpu instruction set to use, ','see fpc -i for possible '+ + 'values'#010+ + '**2CF_Minimal floating point constant precision (default, 32, 64)'#010+ '**2Cg_Generate PIC code'#010+ '**2Ch_ bytes heap (between 1023 and 67107840)'#010+ '**2Ci_IO-checking'#010+ '**2Cn_Omit linking stage'#010+ - 'P*2CN_Generate nil-pointer checks (AIX-only)'#010+ - '**2Co_Check overflow of integer',' operations'#010+ + 'P*2CN_Generate nil-po','inter checks (AIX-only)'#010+ + '**2Co_Check overflow of integer operations'#010+ '**2CO_Check for possible overflow of integer operations'#010+ '**2Cp_Select instruction set, see fpc -i for possible values'#010+ '**2CP=_ packing settings'#010+ - '**3CPPACKSET=_ set allocation: 0, 1 or DEFAULT or NORMAL, 2, 4 '+ - 'and 8'#010+ - '*','*2Cr_Range checking'#010+ + '**3CPPACKSET=_ ','set allocation: 0, 1 or DEFAULT or NORMAL, 2, '+ + '4 and 8'#010+ + '**2Cr_Range checking'#010+ '**2CR_Verify object method call validity'#010+ '**2Cs_Set stack checking size to '#010+ '**2Ct_Stack checking (for testing only, see manual)'#010+ - 'p*2CT_Target-specific code generation options'#010+ - 'P*2CT_Target-specific code generati','on options'#010+ + 'p*2CT_Target-specific code ge','neration options'#010+ + 'P*2CT_Target-specific code generation options'#010+ 'J*2CT_Target-specific code generation options'#010+ 'A*2CT_Target-specific code generation options'#010+ 'p*3CTsmalltoc_ Generate smaller TOCs at the expense of execution speed'+ + ' (AIX)',#010+ + 'P*3CTsmalltoc_ Generate smaller TOCs at the expense of execution speed'+ ' (AIX)'#010+ - 'P*3CTsmalltoc_ Generate smaller TOCs at the expense of',' execution spe'+ - 'ed (AIX)'#010+ 'J*3CTcompactintarrayinit_ Generate smaller (but potentially slower) co'+ 'de for initializing integer array constants'#010+ - 'J*3CTenumfieldinit_ Initialize enumeration fields in constructors to e'+ - 'numtype(0), after calling inherit','ed constructors'#010+ + 'J*3CTenumfieldinit_ Initialize enumeration field','s in constructors to'+ + ' enumtype(0), after calling inherited constructors'#010+ 'J*3CTautogetterprefix=X_ Automatically create getters for properties w'+ 'ith prefix X (empty string disables)'#010+ - 'J*3CTautosetterprefix=X_ Automatically create setters for properties w'+ - 'ith prefix X (empty string disables)'#010+ - 'A*3CTthumb','interworking_ Generate Thumb interworking-safe code if pos'+ - 'sible'#010+ + 'J*3CTautosetterprefix=X_ Automatically create setters for prop','erties'+ + ' with prefix X (empty string disables)'#010+ + 'A*3CTthumbinterworking_ Generate Thumb interworking-safe code if possi'+ + 'ble'#010+ 'J*2Cv_Var/out parameter copy-out checking'#010+ '**2CX_Create also smartlinked library'#010+ '**1d_Defines the symbol '#010+ - '**1D_Generate a DEF file'#010+ + '**1D_Gener','ate a DEF file'#010+ '**2Dd_Set description to '#010+ - '**2Dv','_Set DLL version to '#010+ + '**2Dv_Set DLL version to '#010+ '*O2Dw_PM application'#010+ '**1e_Set path to executable'#010+ '**1E_Same as -Cn'#010+ '**1fPIC_Same as -Cg'#010+ '**1F_Set file names and paths:'#010+ - '**2Fa[,y]_(for a program) load units and [y] before uses is par'+ - 'sed'#010+ - '**2Fc_Set input ','codepage to '#010+ + '**2Fa[,y]_(for a program) load unit','s and [y] before uses is p'+ + 'arsed'#010+ + '**2Fc_Set input codepage to '#010+ '**2FC_Set RC compiler binary name to '#010+ '**2Fd_Disable the compiler'#039's internal directory cache'#010+ '**2FD_Set the directory where to search for compiler utilities'#010+ - '**2Fe_Redirect error output to '#010+ - '**2Ff_Add to fr','amework path (Darwin only)'#010+ + '**2Fe','_Redirect error output to '#010+ + '**2Ff_Add to framework path (Darwin only)'#010+ '**2FE_Set exe/unit output path to '#010+ '**2Fi_Add to include path'#010+ '**2Fl_Add to library path'#010+ '**2FL_Use as dynamic linker'#010+ - '**2Fm_Load unicode conversion table from .txt in the compiler di'+ - 'r',#010+ + '**2Fm_Load un','icode conversion table from .txt in the compiler '+ + 'dir'#010+ '**2Fo_Add to object path'#010+ '**2Fr_Load error message file '#010+ '**2FR_Set resource (.res) linker to '#010+ '**2Fu_Add to unit path'#010+ - '**2FU_Set unit output path to , overrides -FE'#010+ - '**2FW_Store generated whole-program optimi','zation feedback in '#010+ + '**2FU_Set unit output path to , over','rides -FE'#010+ + '**2FW_Store generated whole-program optimization feedback in '#010+ '**2Fw_Load previously stored whole-program optimization feedback fr'+ 'om '#010+ '*g1g_Generate debug information (default format for target)'#010+ - '*g2gc_Generate checks for pointers'#010+ - '*g2gh_Use heaptrace unit (for memory leak/cor','ruption debugging)'#010+ + '*g2gc_Generate checks for',' pointers'#010+ + '*g2gh_Use heaptrace unit (for memory leak/corruption debugging)'#010+ '*g2gl_Use line info unit (show more info with backtraces)'#010+ '*g2go_Set debug information options'#010+ '*g3godwarfsets_ Enable DWARF '#039'set'#039' type debug information (bre'+ - 'aks gdb < 6.5)'#010+ - '*g3gostabsabsincludes_ Store absolute/full incl','ude file paths in Sta'+ - 'bs'#010+ + 'aks gdb',' < 6.5)'#010+ + '*g3gostabsabsincludes_ Store absolute/full include file paths in Stabs'+ + #010+ '*g3godwarfmethodclassprefix_ Prefix method names in DWARF with class n'+ 'ame'#010+ '*g2gp_Preserve case in stabs symbol names'#010+ '*g2gs_Generate Stabs debug information'#010+ - '*g2gt_Trash local variables (to detect uninitialized uses)'#010+ - '*g','2gv_Generates programs traceable with Valgrind'#010+ + '*g2gt_','Trash local variables (to detect uninitialized uses)'#010+ + '*g2gv_Generates programs traceable with Valgrind'#010+ '*g2gw_Generate DWARFv2 debug information (same as -gw2)'#010+ '*g2gw2_Generate DWARFv2 debug information'#010+ - '*g2gw3_Generate DWARFv3 debug information'#010+ - '*g2gw4_Generate DWARFv4 debug information (experiment','al)'#010+ + '*g2gw3_Generate DWARFv3 debug informatio','n'#010+ + '*g2gw4_Generate DWARFv4 debug information (experimental)'#010+ '**1i_Information'#010+ '**2iD_Return compiler date'#010+ '**2iV_Return short compiler version'#010+ '**2iW_Return full compiler version'#010+ '**2iSO_Return compiler OS'#010+ '**2iSP_Return compiler host processor'#010+ - '**2iTO_Return target OS'#010+ + '**','2iTO_Return target OS'#010+ '**2iTP_Return target processor'#010+ - '**','1I_Add to include path'#010+ + '**1I_Add to include path'#010+ '**1k_Pass to the linker'#010+ '**1l_Write logo'#010+ '**1M_Set language mode to '#010+ '**2Mfpc_Free Pascal dialect (default)'#010+ - '**2Mobjfpc_FPC mode with Object Pascal support'#010+ + '**2Mobjfpc_FPC mode with Object Pasca','l support'#010+ '**2Mdelphi_Delphi 7 compatibility mode'#010+ - '**2Mtp','_TP/BP 7.0 compatibility mode'#010+ + '**2Mtp_TP/BP 7.0 compatibility mode'#010+ '**2Mmacpas_Macintosh Pascal dialects compatibility mode'#010+ '**1n_Do not read the default config files'#010+ - '**1o_Change the name of the executable produced to '#010+ + '**1o_Change the name of the executable produced to ',#010+ '**1O_Optimizations:'#010+ '**2O-_Disable optimizations'#010+ - '**2','O1_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+ '**2O3_Level 3 optimizations (-O2 + slow optimizations)'#010+ - '**2O4_Level 4 optimizations (-O3 + optimizations which might have unex'+ - 'pect','ed side effects)'#010+ + '**2O4_Level 4 optim','izations (-O3 + optimizations which might have un'+ + 'expected side effects)'#010+ '**2Oa=_Set alignment'#010+ '**2Oo[NO]_Enable or disable optimizations, see fpc -i for possible '+ 'values'#010+ - '**2Op_Set target cpu for optimizing, see fpc -i for possible values'+ - #010+ - '**2OW_Generate whole-program optimization fee','dback for optimizati'+ - 'on , see fpc -i for possible values'#010+ + '**2Op_Set target cpu for optimizing, see fpc -i for possible ','valu'+ + 'es'#010+ + '**2OW_Generate whole-program optimization feedback for optimization'+ + ' , see fpc -i for possible values'#010+ '**2Ow_Perform whole-program optimization , see fpc -i for possib'+ 'le values'#010+ '**2Os_Optimize for size rather than speed'#010+ - '**1pg_Generate profile code for gprof (defines FPC_PROFILE)',#010+ + '**1p','g_Generate profile code for gprof (defines FPC_PROFILE)'#010+ 'F*1P_Target CPU / compiler related options:'#010+ 'F*2PB_Show default compiler binary'#010+ 'F*2PP_Show default target cpu'#010+ 'F*2P_Set target CPU (arm,i386,m68k,mips,mipsel,powerpc,powerpc64,sp'+ - 'arc,x86_64'#010+ + 'ar','c,x86_64'#010+ '**1R_Assembler reading style:'#010+ - '**2Rdefault_U','se default assembler for target'#010+ + '**2Rdefault_Use default assembler for target'#010+ '3*2Ratt_Read AT&T style assembler'#010+ '3*2Rintel_Read Intel style assembler'#010+ '6*2RMOT_Read motorola style assembler'#010+ '**1S_Syntax options:'#010+ - '**2S2_Same as -Mobjfpc'#010+ + '**2S2_Same as -Mobjf','pc'#010+ '**2Sc_Support operators like C (*=,+=,/= and -=)'#010+ - '**2','Sa_Turn on assertions'#010+ + '**2Sa_Turn on assertions'#010+ '**2Sd_Same as -Mdelphi'#010+ '**2Se_Error options. is a combination of the following:'#010+ '**3*_ : Compiler halts after the errors (default is 1)'#010+ - '**3*_w : Compiler also halts after warnings'#010+ - '**3*_n : Compiler also hal','ts after notes'#010+ + '**3*_w : Compil','er also halts after warnings'#010+ + '**3*_n : Compiler also halts after notes'#010+ '**3*_h : Compiler also halts after hints'#010+ '**2Sg_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+ - '**2Sh_Use reference counted strings (ansistring by default) instead of'+ + '**2Sh_Use reference counted strings (ansistring by default) instead of', ' shortstrings'#010+ - '**2Si_Turn on inlining of procedures/func','tions declared as "inline"'#010+ + '**2Si_Turn on inlining of procedures/functions declared as "inline"'#010+ '**2Sk_Load fpcylix unit'#010+ '**2SI_Set interface style to '#010+ '**3SIcom_COM compatible interface (default)'#010+ '**3SIcorba_CORBA compatible interface'#010+ - '**2Sm_Support macros like C (global)'#010+ + '**2Sm_Support ma','cros like C (global)'#010+ '**2So_Same as -Mtp'#010+ - '**2Ss_Construct','or name must be init (destructor must be done)'#010+ + '**2Ss_Constructor name must be init (destructor must be done)'#010+ '**2Sx_Enable exception keywords (default in Delphi/ObjFPC modes)'#010+ '**2Sy_@ returns a typed pointer, same as $T+'#010+ - '**1s_Do not call assembler and linker'#010+ - '**2sh_Generate script to link on hos','t'#010+ + '**1s_Do not call as','sembler and linker'#010+ + '**2sh_Generate script to link on host'#010+ '**2st_Generate script to link on target'#010+ '**2sr_Skip register allocation phase (use with -alr)'#010+ '**1T_Target operating system:'#010+ '3*2Tdarwin_Darwin/Mac OS X'#010+ - '3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+ + '3*2Temx_OS/2 via EMX (includin','g EMX/RSX extender)'#010+ '3*2Tfreebsd_FreeBSD'#010+ - '3*2Tgo32v2_Vers','ion 2 of DJ Delorie DOS extender'#010+ + '3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+ '3*2Tiphonesim_ iPhoneSimulator from iOS SDK 3.2+ (older versions: -Tda'+ 'rwin)'#010+ '3*2Tlinux_Linux'#010+ '3*2Tnativent_Native NT API (experimental)'#010+ - '3*2Tnetbsd_NetBSD'#010+ + '3*2Tnetbsd_NetBSD'#010, '3*2Tnetware_Novell Netware Module (clib)'#010+ - '3*2Tnetwlibc_N','ovell Netware Module (libc)'#010+ + '3*2Tnetwlibc_Novell Netware Module (libc)'#010+ '3*2Topenbsd_OpenBSD'#010+ '3*2Tos2_OS/2 / eComStation'#010+ '3*2Tsunos_SunOS/Solaris'#010+ '3*2Tsymbian_Symbian OS'#010+ '3*2Tsolaris_Solaris'#010+ '3*2Twatcom_Watcom compatible DOS extender'#010+ - '3*2Twdosx_WDOSX DOS extender'#010+ + '3','*2Twdosx_WDOSX DOS extender'#010+ '3*2Twin32_Windows 32 Bit'#010+ - '3*','2Twince_Windows CE'#010+ + '3*2Twince_Windows CE'#010+ '4*2Tdarwin_Darwin/Mac OS X'#010+ '4*2Tlinux_Linux'#010+ '4*2Twin64_Win64 (64 bit Windows systems)'#010+ '6*2Tamiga_Commodore Amiga'#010+ '6*2Tatari_Atari ST/STe/TT'#010+ '6*2Tlinux_Linux'#010+ - '6*2Tpalmos_PalmOS'#010+ + '6*2Tpalmos_Pal','mOS'#010+ 'A*2Tdarwin_Darwin/iPhoneOS/iOS'#010+ 'A*2Tlinux_Linux'#010+ - 'A*2T','wince_Windows CE'#010+ + 'A*2Twince_Windows CE'#010+ 'P*2Tamiga_AmigaOS'#010+ 'P*2Tdarwin_Darwin/Mac OS X'#010+ 'P*2Tlinux_Linux'#010+ @@ -1476,119 +1476,117 @@ const msgtxt : array[0..000288,1..240] of char=( 'P*2Tmorphos_MorphOS'#010+ 'S*2Tsolaris_Solaris'#010+ 'S*2Tlinux_Linux'#010+ - '**1u_Undefines the symbol '#010+ + '**1u_Undefines the sy','mbol '#010+ '**1U_Unit options:'#010+ - '**2Un_Do not check where th','e unit 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+ '**2Us_Compile a system unit'#010+ - '**1v_Be verbose. is a combination of the following letters:'#010+ - '**2*_e : Show errors (default) 0 : Sho','w nothing (except errors'+ - ')'#010+ + '**1v_Be verbose. is a combination of the followin','g letters:'#010+ + '**2*_e : Show errors (default) 0 : Show nothing (except errors)'#010+ '**2*_w : Show warnings u : Show unit info'#010+ '**2*_n : Show notes t : Show tried/used files'#010+ - '**2*_h : Show hints c : Show conditionals'#010+ - '**2*_i : Show general info ',' d : Show debug info'#010+ + '**2*_h : Show hints c :',' Show conditionals'#010+ + '**2*_i : Show general info d : Show debug info'#010+ '**2*_l : Show linenumbers r : Rhide/GCC compatibility mode'#010+ '**2*_s : Show time stamps q : Show message numbers'#010+ - '**2*_a : Show everything x : Executable info (Win32 only)'#010+ - '**2*_b : Write fi','le names messages p : Write tree.log with parse t'+ - 'ree'#010+ + '**2*_a : Show everything ',' x : Executable info (Win32 only'+ + ')'#010+ + '**2*_b : Write file names messages p : Write tree.log with parse tre'+ + 'e'#010+ '**2*_ with full path v : Write fpcdebug.txt with'#010+ '**2*_ lots of debugging info'#010+ - '**2*_m, : Don'#039't show messages numbered and ',#010+ + '*','*2*_m, : Don'#039't show messages numbered and '#010+ 'F*1V_Append '#039'-'#039' to the used compiler binary name (e.g. f'+ 'or version)'#010+ '**1W_Target-specific options (targets)'#010+ '3*2WA_Specify native type application (Windows)'#010+ - '4*2WA_Specify native type application (Windows)'#010+ - 'A*2WA_Specify native type a','pplication (Windows)'#010+ + '4*2WA_Specify native',' type application (Windows)'#010+ + 'A*2WA_Specify native type application (Windows)'#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+ - 'A*2Wb_Create a bundle instead of a library (Darwin)'#010+ - '4*2Wb_Creat','e a bundle instead of a library (Darwin)'#010+ + 'A*2Wb_Cr','eate a bundle instead of a library (Darwin)'#010+ + '4*2Wb_Create a bundle instead of a library (Darwin)'#010+ '3*2WB_Create a relocatable image (Windows, Symbian)'#010+ '3*2WBxxxx_Set image base to xxxx (Windows, Symbian)'#010+ - '4*2WB_Create a relocatable image (Windows)'#010+ + '4*2WB_Create a relocatable image (Window','s)'#010+ '4*2WBxxxx_Set image base to xxxx (Windows)'#010+ - 'A*2WB_Cre','ate a relocatable image (Windows, Symbian)'#010+ + 'A*2WB_Create a relocatable image (Windows, Symbian)'#010+ 'A*2WBxxxx_Set image base to xxxx (Windows, Symbian)'#010+ '3*2WC_Specify console type application (EMX, OS/2, Windows)'#010+ - '4*2WC_Specify console type application (EMX, OS/2, Windows)'#010+ - 'A*2WC_Specify console typ','e application (Windows)'#010+ + '4*2WC_Specify console type app','lication (EMX, OS/2, Windows)'#010+ + 'A*2WC_Specify console type application (Windows)'#010+ 'P*2WC_Specify console type application (Classic Mac OS)'#010+ '3*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+ - '4*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+ - 'A*2WD_Use DEFFILE to export function','s of DLL or EXE (Windows)'#010+ + '4*2WD_Use DEFFILE to export functions of DL','L or EXE (Windows)'#010+ + 'A*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+ '3*2We_Use external resources (Darwin)'#010+ '4*2We_Use external resources (Darwin)'#010+ 'A*2We_Use external resources (Darwin)'#010+ 'P*2We_Use external resources (Darwin)'#010+ - 'p*2We_Use external resources (Darwin)'#010+ - '3*2WF_Specify full-scree','n type application (EMX, OS/2)'#010+ + 'p*2We_U','se external resources (Darwin)'#010+ + '3*2WF_Specify full-screen type application (EMX, OS/2)'#010+ '3*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+ '4*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+ - 'A*2WG_Specify graphic type application (Windows)'#010+ - 'P*2WG_Specify graphic type application (','Classic Mac OS)'#010+ + 'A*2WG_Specify graphic type applica','tion (Windows)'#010+ + 'P*2WG_Specify graphic type application (Classic Mac OS)'#010+ '3*2Wi_Use internal resources (Darwin)'#010+ '4*2Wi_Use internal resources (Darwin)'#010+ 'A*2Wi_Use internal resources (Darwin)'#010+ 'P*2Wi_Use internal resources (Darwin)'#010+ - 'p*2Wi_Use internal resources (Darwin)'#010+ - '3*2WI_Turn on/off the usage of imp','ort sections (Windows)'#010+ + 'p*2Wi_Use interna','l resources (Darwin)'#010+ + '3*2WI_Turn on/off the usage of import sections (Windows)'#010+ '4*2WI_Turn on/off the usage of import sections (Windows)'#010+ 'A*2WI_Turn on/off the usage of import sections (Windows)'#010+ '8*2Wm_Set memory model'#010+ - '8*3WmTiny_Tiny memory model'#010+ + '8*3WmTiny_Tiny memory ','model'#010+ '8*3WmSmall_Small memory model (default)'#010+ - '8*3WmMedi','um_Medium memory model'#010+ + '8*3WmMedium_Medium memory model'#010+ '3*2WM_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+ 'n)'#010+ '4*2WM_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+ 'n)'#010+ - 'p*2WM_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+ - 'n',')'#010+ + 'p*2WM_Minimum',' Mac OS X deployment version: 10.4, 10.5.1, ... (Dar'+ + 'win)'#010+ 'P*2WM_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+ 'n)'#010+ '3*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+ - '4*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+ - 'A*2WN_Do not generate rel','ocation code, needed for debugging (Windows'+ + '4*2WN_Do not generate relocation code, n','eeded for debugging (Windows'+ ')'#010+ + 'A*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+ 'A*2Wpxxxx_Specify the controller type, see fpc -i for possible values'#010+ - 'V*2Wpxxxx_Specify the controller type, see fpc -i for possible values'#010+ - '3*2WP_Minimum iOS deployment version: 3.0, 5.0.1, ..','. (iphonesim)'+ - #010+ + 'V*2Wpxxxx_Specify the controller type, see fpc -i for possible values'#010, + '3*2WP_Minimum iOS deployment version: 3.0, 5.0.1, ... (iphonesim)'#010+ 'A*2WP_Minimum iOS deployment version: 3.0, 5.0.1, ... (Darwin)'#010+ '3*2WR_Generate relocation code (Windows)'#010+ '4*2WR_Generate relocation code (Windows)'#010+ - 'A*2WR_Generate relocation code (Windows)'#010+ - 'P*2WT_Specify MPW tool type applicati','on (Classic Mac OS)'#010+ + 'A*2WR_Generate relocati','on code (Windows)'#010+ + 'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+ '**2WX_Enable executable stack (Linux)'#010+ '**1X_Executable options:'#010+ '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+ 'ux)'#010+ - '**2Xd_Do not search default library path (sometimes required for cross'+ - '-compiling wh','en not using -XR)'#010+ + '**2Xd_Do not search default ','library path (sometimes required for cro'+ + 'ss-compiling when not using -XR)'#010+ '**2Xe_Use external linker'#010+ '**2Xg_Create debuginfo in a separate file and add a debuglink section '+ 'to executable'#010+ - '**2XD_Try to link units dynamically (defines FPC_LINK_DYNAMIC)'#010+ + '**2XD_Try to link units dynamically (defines FPC_LIN','K_DYNAMIC)'#010+ '**2Xi_Use internal linker'#010+ - '**2Xm_Generate lin','k map'#010+ + '**2Xm_Generate link map'#010+ '**2XM_Set the name of the '#039'main'#039' program routine (default i'+ 's '#039'main'#039')'#010+ 'F*2Xp_First search for the compiler binary in the directory '#010+ - '**2XP_Prepend the binutils names with the prefix '#010+ - '**2Xr_Set the linker'#039's rlink-path to',' (needed for cross co'+ - 'mpile, see the ld manual for more information) (BeOS, Linux)'#010+ + '**2XP_Prepend the binutils names with',' the prefix '#010+ + '**2Xr_Set the linker'#039's rlink-path to (needed for cross comp'+ + 'ile, see the ld manual for more information) (BeOS, Linux)'#010+ '**2XR_Prepend to all linker search paths (BeOS, Darwin, FreeBSD'+ ', Linux, Mac OS, Solaris)'#010+ - '**2Xs_Strip all symbols from executable'#010+ - '**2XS_Try to link ','units statically (default, defines FPC_LINK_STATIC'+ - ')'#010+ + '**2','Xs_Strip all symbols from executable'#010+ + '**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#010+ '**2Xt_Link with static libraries (-static is passed to linker)'#010+ '**2XX_Try to smartlink units (defines FPC_LINK_SMART)'#010+ - '**1*_'#010+ + '**1*','_'#010+ '**1?_Show this help'#010+ - '**1h_Shows this help without wait','ing' + '**1h_Shows this help without waiting' ); diff --git a/compiler/ppu.pas b/compiler/ppu.pas index 8442182b24..2ac9d21f66 100644 --- a/compiler/ppu.pas +++ b/compiler/ppu.pas @@ -162,6 +162,9 @@ const uf_wideinits = $400000; { this unit has winlike widestring typed constants } uf_classinits = $800000; { this unit has class constructors/destructors } uf_resstrinits = $1000000; { this unit has string consts referencing resourcestrings } + uf_i8086_far_code = $2000000; { this unit uses an i8086 memory model with far code (i.e. medium, large or huge) } + uf_i8086_far_data = $4000000; { this unit uses an i8086 memory model with far data (i.e. compact or large) } + uf_i8086_huge_data = $8000000; { this unit uses an i8086 memory model with huge data (i.e. huge) } {$ifdef generic_cpu} { We need to use the correct size of aint and pint for