+ support for VMTOFFSET in assembler readers to get VMT offset of virtual

methods (mantis #8153)

git-svn-id: trunk@6168 -
This commit is contained in:
Jonas Maebe 2007-01-24 18:26:23 +00:00
parent c1dddf5df2
commit c866400823
14 changed files with 331 additions and 185 deletions

2
.gitattributes vendored
View File

@ -7991,6 +7991,8 @@ tests/webtbs/tw8145.pp svneol=native#text/plain
tests/webtbs/tw8148.pp svneol=native#text/plain
tests/webtbs/tw8150a.pp svneol=native#text/plain
tests/webtbs/tw8150d.pp svneol=native#text/plain
tests/webtbs/tw8153.pp svneol=native#text/plain
tests/webtbs/tw8153a.pp svneol=native#text/plain
tests/webtbs/tw8155.pp svneol=native#text/plain
tests/webtbs/tw8156.pp svneol=native#text/plain
tests/webtbs/tw8171.pp svneol=native#text/plain

View File

@ -142,7 +142,7 @@ Unit raarmgas;
{ record.field ? }
if actasmtoken=AS_DOT then
begin
BuildRecordOffsetSize(tempstr,l,k,mangledname);
BuildRecordOffsetSize(tempstr,l,k,mangledname,false);
if (mangledname<>'') then
Message(asmr_e_invalid_reference_syntax);
inc(oper.opr.ref.offset,l);
@ -309,7 +309,7 @@ Unit raarmgas;
begin
if expr<>'' then
begin
BuildRecordOffsetSize(expr,toffset,tsize,mangledname);
BuildRecordOffsetSize(expr,toffset,tsize,mangledname,false);
if (oper.opr.typ<>OPR_CONSTANT) and
(mangledname<>'') then
Message(asmr_e_wrong_sym_type);

View File

@ -1912,9 +1912,10 @@ asmr_w_direct_ebp_for_parameter_regcall=07103_W_Use of +offset(%ebp) is not comp
% if parameters are in registers.
asmr_w_direct_ebp_neg_offset=07104_W_Use of -offset(%ebp) is not recommended for local variable access
% Using -8(%ebp) to access a local variable is not recommended
asmr_w_direct_esp_neg_offset=07105_W_Use of -offset(%esp), value may be crashed
asmr_w_direct_esp_neg_offset=07105_W_Use of -offset(%esp), access may cause a crash or value may be lost
% Using -8(%esp) to access a local stack is not recommended, as
% this stack portion can be overwritten by any function calls or interrupts.
asmr_e_no_vmtoffset_possible=07106_E_VMTOffset must be used in combination with a virtual method, and "$1" is not virtual
%
#
# Assembler/binary writers

View File

@ -560,6 +560,7 @@ const
asmr_w_direct_ebp_for_parameter_regcall=07103;
asmr_w_direct_ebp_neg_offset=07104;
asmr_w_direct_esp_neg_offset=07105;
asmr_e_no_vmtoffset_possible=07106;
asmw_f_too_many_asm_files=08000;
asmw_f_assembler_output_not_supported=08001;
asmw_f_comp_not_supported=08002;
@ -716,9 +717,9 @@ const
option_info=11024;
option_help_pages=11025;
MsgTxtSize = 42573;
MsgTxtSize = 42691;
MsgIdxMax : array[1..20] of longint=(
24,82,232,79,63,48,106,22,135,60,
24,82,232,79,63,48,107,22,135,60,
41,1,1,1,1,1,1,1,1,1
);

View File

@ -621,170 +621,172 @@ const msgtxt : array[0..000177,1..240] of char=(
#000+
'07104_W_Use',' of -offset(%ebp) is not recommended for local variable a'+
'ccess'#000+
'07105_W_Use of -offset(%esp), value may be crashed'#000+
'08000_F_Too many assembler files'#000+
'07105_W_Use of -offset(%esp), access may cause a crash or value may be'+
' lost'#000+
'07106_E_VMTOffset must be used in combination with a virtual method, a'+
'nd "$1" is not virtual'#000+
'08000_F_','Too many assembler files'#000+
'08001_F_Selected assembler output not supported'#000+
'08002_F_Comp not supported'#000+
'08003_F_Direct not',' support for binary writers'#000+
'08003_F_Direct not support for binary writers'#000+
'08004_E_Allocating of data is only allowed in bss section'#000+
'08005_F_No binary writer selected'#000+
'08006_E_Asm: Opcode $1 not in table'#000+
'08','006_E_Asm: Opcode $1 not in table'#000+
'08007_E_Asm: $1 invalid combination of opcode and operands'#000+
'08008_E_Asm: 16 Bit refer','ences not supported'#000+
'08008_E_Asm: 16 Bit references not supported'#000+
'08009_E_Asm: Invalid effective address'#000+
'08010_E_Asm: Immediate or reference expected'#000+
'08011_E_Asm: $1 value exceeds bounds $2'#000+
'08011_E_Asm: $1 va','lue exceeds bounds $2'#000+
'08012_E_Asm: Short jump is out of range $1'#000+
'08013_E_Asm: Undefined label $1'#000+
'08014_E_Asm: Comp typ','e not supported for this target'#000+
'08014_E_Asm: Comp type not supported for this target'#000+
'08015_E_Asm: Extended type not supported for this target'#000+
'08016_E_Asm: Duplicate label $1'#000+
'08017_E_Asm: Redefined label $1'#000+
'0','8017_E_Asm: Redefined label $1'#000+
'08018_E_Asm: First defined here'#000+
'08019_E_Asm: Invalid register $1'#000+
'08020_E_Asm: 16 or 32 ','Bit references not supported'#000+
'08020_E_Asm: 16 or 32 Bit references not supported'#000+
'08021_E_Asm: 64 Bit operands not supported'#000+
'09000_W_Source operating system redefined'#000+
'09001_I_Assembling (pipe) $1'#000+
'09001_I_','Assembling (pipe) $1'#000+
'09002_E_Can'#039't create assembler file: $1'#000+
'09003_E_Can'#039't create object file: $1'#000+
'09004_E_Can'#039't create',' archive file: $1'#000+
'09004_E_Can'#039't create archive file: $1'#000+
'09005_E_Assembler $1 not found, switching to external assembling'#000+
'09006_T_Using assembler: $1'#000+
'09007_E_Error while assembling exitcode $1'#000+
'09007_E_Err','or while assembling exitcode $1'#000+
'09008_E_Can'#039't call the assembler, error $1 switching to external a'+
'ssembling'#000+
'09009_I_As','sembling $1'#000+
'09009_I_Assembling $1'#000+
'09010_I_Assembling with smartlinking $1'#000+
'09011_W_Object $1 not found, Linking may fail !'#000+
'09012_W_Library $1 not found, Linking may fail !'#000+
'09012_W_Library $1 not',' found, Linking may fail !'#000+
'09013_E_Error while linking'#000+
'09014_E_Can'#039't call the linker, switching to external linking'#000+
'09','015_I_Linking $1'#000+
'09015_I_Linking $1'#000+
'09016_E_Util $1 not found, switching to external linking'#000+
'09017_T_Using util $1'#000+
'09018_E_Creation of Executables not supported'#000+
'09018_E_Creation of Execut','ables not supported'#000+
'09019_E_Creation of Dynamic/Shared Libraries not supported'#000+
'09020_I_Closing script $1'#000+
'09021_E_resou','rce compiler not found, switching to external mode'#000+
'09021_E_resource compiler not found, switching to external mode'#000+
'09022_I_Compiling resource $1'#000+
'09023_T_unit $1 can'#039't be statically linked, switching to smart lin'+
'king'#000+
'09023_T_unit $1 can'#039't be statically linke','d, switching to smart l'+
'inking'#000+
'09024_T_unit $1 can'#039't be smart linked, switching to static linking'+
#000+
'09025_T_unit $1 can'#039't',' be shared linked, switching to static link'+
'ing'#000+
'09025_T_unit $1 can'#039't be shared linked, switching to static linkin'+
'g'#000+
'09026_E_unit $1 can'#039't be smart or static linked'#000+
'09027_E_unit $1 can'#039't be shared or static linked'#000+
'09027_E_unit $1 can'#039't be sh','ared or static linked'#000+
'09028_D_Calling resource compiler "$1" with "$2" as command line'#000+
'09128_F_Can'#039't post process exec','utable $1'#000+
'09128_F_Can'#039't post process executable $1'#000+
'09129_F_Can'#039't open executable $1'#000+
'09130_X_Size of Code: $1 bytes'#000+
'09131_X_Size of initialized data: $1 bytes'#000+
'09132_X_Size of uninitialized data: $1 bytes'#000+
'09132','_X_Size of uninitialized data: $1 bytes'#000+
'09133_X_Stack space reserved: $1 bytes'#000+
'09134_X_Stack space committed: $1 bytes',#000+
'09134_X_Stack space committed: $1 bytes'#000+
'10000_T_Unitsearch: $1'#000+
'10001_T_PPU Loading $1'#000+
'10002_U_PPU Name: $1'#000+
'10003_U_PPU Flags: $1'#000+
'10004_U_PPU Crc: $1'#000+
'10005_U_PPU Time: $1'#000+
'10005_U_PPU ','Time: $1'#000+
'10006_U_PPU File too short'#000+
'10007_U_PPU Invalid Header (no PPU at the begin)'#000+
'10008_U_PPU Invalid Version $1'#000+
'10','009_U_PPU is compiled for another processor'#000+
'10009_U_PPU is compiled for another processor'#000+
'10010_U_PPU is compiled for an other target'#000+
'10011_U_PPU Source: $1'#000+
'10012_U_Writing $1'#000+
'10012_U_Wri','ting $1'#000+
'10013_F_Can'#039't Write PPU-File'#000+
'10014_F_Error reading PPU-File'#000+
'10015_F_unexpected end of PPU-File'#000+
'10016_F_Invalid',' PPU-File entry: $1'#000+
'10016_F_Invalid PPU-File entry: $1'#000+
'10017_F_PPU Dbx count problem'#000+
'10018_E_Illegal unit name: $1'#000+
'10019_F_Too much units'#000+
'10020_F_Circular unit reference between $1 and $2'#000+
'10020_F_Circular un','it reference between $1 and $2'#000+
'10021_F_Can'#039't compile unit $1, no sources available'#000+
'10022_F_Can'#039't find unit $1'#000+
'10023_W_','Unit $1 was not found but $2 exists'#000+
'10023_W_Unit $1 was not found but $2 exists'#000+
'10024_F_Unit $1 searched but $2 found'#000+
'10025_W_Compiling the system unit requires the -Us switch'#000+
'10025_W_Compiling the system unit requires the -','Us switch'#000+
'10026_F_There were $1 errors compiling module, stopping'#000+
'10027_U_Load from $1 ($2) unit $3'#000+
'10028_U_Recompilin','g $1, checksum changed for $2'#000+
'10028_U_Recompiling $1, checksum changed for $2'#000+
'10029_U_Recompiling $1, source found only'#000+
'10030_U_Recompiling unit, static lib is older than ppufile'#000+
'10030_U_Recompiling unit, static lib is older than',' ppufile'#000+
'10031_U_Recompiling unit, shared lib is older than ppufile'#000+
'10032_U_Recompiling unit, obj and asm are older th','an ppufile'#000+
'10032_U_Recompiling unit, obj and asm are older than ppufile'#000+
'10033_U_Recompiling unit, obj is older than asm'#000+
'10034_U_Parsing interface of $1'#000+
'10035_U_Parsing implementation of $1'#000+
'10035_U_Parsing implementation ','of $1'#000+
'10036_U_Second load for unit $1'#000+
'10037_U_PPU Check file $1 time $2'#000+
'10040_W_Can'#039't recompile unit $1, but found mod','ifed include files'+
#000+
'10040_W_Can'#039't recompile unit $1, but found modifed include files'#000+
'10041_U_File $1 is newer than PPU file $2'#000+
'10042_U_Using a unit which was not compiled with correct FPU mode'#000+
'10042_U_Using a unit which was not compiled with correct FPU ','mode'#000+
'10043_U_Loading interface units from $1'#000+
'10044_U_Loading implementation units from $1'#000+
'10045_U_Interface CRC change','d for unit $1'#000+
'10045_U_Interface CRC changed for unit $1'#000+
'10046_U_Implementation CRC changed for unit $1'#000+
'10047_U_Finished compiling unit $1'#000+
'10048_U_Add dependency of $1 to $2'#000+
'10048_U_Add dependency of ','$1 to $2'#000+
'10049_U_No reload, is caller: $1'#000+
'10050_U_No reload, already in second compile: $1'#000+
'10051_U_Flag for reload: $1',#000+
'10051_U_Flag for reload: $1'#000+
'10052_U_Forced reloading'#000+
'10053_U_Previous state of $1: $2'#000+
'10054_U_Already compiling $1, setting second compile'#000+
'10055_U_Loading unit $1'#000+
'10055_U_Lo','ading unit $1'#000+
'10056_U_Finished loading unit $1'#000+
'10057_U_Registering new unit $1'#000+
'10058_U_Re-resolving unit $1'#000+
'10059_U_Sk','ipping re-resolving unit $1, still loading used units'#000+
'10059_U_Skipping re-resolving unit $1, still loading used units'#000+
'11000_O_$1 [options] <inputfile> [options]'#000+
'11001_W_Only one source file supported'#000+
'11001_W_Only one source f','ile supported'#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+
'11004_F_No source file name 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+
'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+
'11010_D_Reading further options from $1'#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_too many IF(N)DEFs'#000+
'11013_F_too m','any IF(N)DEFs'#000+
'11014_F_too many ENDIFs'#000+
'11015_F_open conditional at the end of the file'#000+
'11016_W_Debug information genera','tion is not supported by this execut'+
'able'#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 assembler to default source writing assem','bler'#000+
'1','1019_W_You are using the 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+
'11026_T_Reading ','options from file $1'#000+
'11027_T_Reading options from environment $1'#000+
'11028_D_Handling option "$1"'#000+
'11029__*** press enter *','**'#000+
'11029__*** 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+
'11034_D_Reading config file "$1"'#000+
'11035_D_foun','d source file name "$1"'#000+
'11035_D_found source file name "$1"'#000+
'11039_E_Unknown code page'#000+
'11040_F_Config file $1 is a directory'#000+
'11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPC'+
'CPU'#010+
'11023_Free Pascal Compiler version',' $FPCFULLVERSION [$FPCDATE] for $F'+
'PCCPU'#010+
'Copyright (c) 1993-2007 by Florian Klaempfl'#000+
'11024_Free Pascal Compiler version',' $FPCVERSION'#010+
'11024_Free Pascal Compiler version $FPCVERSION'#010+
#010+
'Compiler Date : $FPCDATE'#010+
'Compiler CPU Target: $FPCCPU'#010+
@ -792,245 +794,245 @@ const msgtxt : array[0..000177,1..240] of char=(
'Supported targets:'#010+
' $OSTARGETS'#010+
#010+
'Supported CPU instruction sets:'#010+
'Supported CPU i','nstruction sets:'#010+
' $INSTRUCTIONSETS'#010+
#010+
'Supported FPU instruction sets:'#010+
' $FPUINSTRUCTIONSETS'#010+
#010+
'Supported Optimizations:'#010+
' ',' $OPTIMIZATIONS'#010+
' $OPTIMIZATIONS'#010+
#010+
'This program comes under the GNU General Public Licence'#010+
'For more information read COPYING.FPC'#010+
#010+
'Report bugs,suggestions etc to:'#010+
'Report bug','s,suggestions etc to:'#010+
' bugs@freepascal.org'#000+
'11025_**0*_put + after a boolean switch option to enable it',', - to di'+
'sable it'#010+
'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 file'#010+
'**2al_list sourcecode lines in assembler file'#010+
'**2al_list sourcecode lines in assembler f','ile'#010+
'**2an_list node info in assembler file'#010+
'*L2ap_use pipes instead of creating temporary assembler files'#010+
'**2ar_list re','gister 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+
'**1A<x>_output format:'#010+
'**1A<x>_output ','format:'#010+
'**2Adefault_use default assembler'#010+
'3*2Aas_assemble using GNU AS'#010+
'3*2Anasmcoff_coff (Go32v2) file using Nasm'#010+
'3*2A','nasmelf_elf32 (Linux) 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*2Anasmwdosx_Win32/WDOSX object file usi','ng Nasm'#010+
'3*2Awasm_obj file using Wasm (Watcom)'#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*2Aelf_elf32 (Linux) using internal writer'#010+
'3*2Acoff_coff (Go32v2) using internal writer'#010+
'3*2Acoff_coff (Go32v2) using internal ','writer'#010+
'3*2Apecoff_pecoff (Win32) using internal writer'#010+
'4*2Aas_assemble 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*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+
'S*2Aas_assemble using GNU AS'#010+
'**1b_generate browser info'#010+
'**2bl_generate local symbol info',#010+
'**2bl_generate local symbol info'#010+
'**1B_build all modules'#010+
'**1C<x>_code generation options:'#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+
'**2Cf<x>_Select fpu instruction',' set to use, see fpc -i for possible '+
'values'#010+
'**2Cf<x>_Select fpu instruction set to use, see fpc -i for possible va'+
'lues'#010+
'**2Cg_Generate PIC code'#010+
'**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+
'**2Ci_IO-checking'#010+
'**','2Ci_IO-checking'#010+
'**2Cn_omit linking stage'#010+
'**2Co_check overflow of integer operations'#010+
'**2Cp<x>_select instruction set, s','ee fpc -i for possible values'#010+
'**2Cp<x>_select instruction set, see fpc -i for possible values'#010+
'**2CP<x>=<y>_ packing settings'#010+
'**3CPPACKSET=<y>_ <y> set allocation: 0, 1 or DEFAULT or NORMAL, 2, 4 '+
'and 8'#010+
'**3CPPACKSET=<y>_ <y> set allocation: 0, 1 or DEFAULT or NORM','AL, 2, '+
'4 and 8'#010+
'**2Cr_range checking'#010+
'**2CR_verify object method call validity'#010+
'**2Cs<n>_set stack size to <n>'#010+
'**2Ct_stac','k checking'#010+
'**2Ct_stack checking'#010+
'**2CX_create also smartlinked library'#010+
'**1d<x>_defines the symbol <x>'#010+
'**1D_generate a DEF file'#010+
'**2Dd<x>_set description to <x>'#010+
'**2Dd<x>_set desc','ription to <x>'#010+
'**2Dv<x>_set DLL version to <x>'#010+
'*O2Dw_PM application'#010+
'**1e<x>_set path to executable'#010+
'**1E_same as -Cn'#010+
'**','1fPIC_same as -Cg'#010+
'**1fPIC_same as -Cg'#010+
'**1F<x>_set file names and paths:'#010+
'**2Fa<x>[,y]_for a program load first units <x> and [y] before uses is'+
'**2Fa<x>[,y]_for a program load first units <x> and [y] before uses is',
' parsed'#010+
'**2Fc<x>_sets input codepage to <x>'#010+
'**2FD<x>_sets 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+
'**2FE<x>_set exe/unit output path to <x>'#010+
'**2Fi<x>_adds <x> to include path'#010+
'**2Fl<x>_adds <x> to library path'#010+
'**2Fl<x>_adds <x','> to library path'#010+
'**2FL<x>_uses <x> as dynamic linker'#010+
'**2Fo<x>_adds <x> to object path'#010+
'**2Fr<x>_load error message fil','e <x>'#010+
'**2Fr<x>_load error message file <x>'#010+
'**2Fu<x>_adds <x> to unit path'#010+
'**2FU<x>_set unit output path to <x>, overrides -FE'#010+
'*g1g_generate debugger information:'#010+
'*g1g_generate debugger informatio','n:'#010+
'*g2gc_generate checks for pointers'#010+
'*g2gd_use dbx'#010+
'*g2gg_use gsym'#010+
'*g2gh_use heap trace unit (for memory leak debuggin','g)'#010+
'*g2gh_use heap trace unit (for memory leak debugging)'#010+
'*g2gl_use line info unit to show more info for backtraces'#010+
'*g2gt_trash local variables (to detect uninitialized uses)'#010+
'*g2gv_generates programs traceable with valgrind'#010+
'*g','2gv_generates programs traceable with valgrind'#010+
'*g2gw_generate dwarf debugging info'#010+
'**1i_information'#010+
'**2iD_return compi','ler date'#010+
'**2iD_return compiler date'#010+
'**2iV_return compiler version'#010+
'**2iW_return full compiler version'#010+
'**2iSO_return compiler OS'#010+
'**2iSP_return compiler processor'#010+
'**2iSP_return compiler',' processor'#010+
'**2iTO_return target OS'#010+
'**2iTP_return target processor'#010+
'**1I<x>_adds <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+
'**1M<x>_set language mode to <x>'#010+
'**2Mfpc_free pascal dialect (default)'#010+
'**2Mobjfpc_switch some Delphi 2 extensions on'#010+
'**2Mobjfpc_switch some ','Delphi 2 extensions on'#010+
'**2Mdelphi_tries to be Delphi compatible'#010+
'**2Mtp_tries to be TP/BP 7.0 compatible'#010+
'**2Mgpc_tries ','to be gpc compatible'#010+
'**2Mgpc_tries to be gpc compatible'#010+
'**2Mmacpas_tries to be compatible to the macintosh pascal dialects'#010+
'**1n_don'#039't read the default config file'#010+
'**1n_don'#039't read the default config',' file'#010+
'**1N<x>_node tree optimizations'#010+
'**2Nu_unroll loops'#010+
'**1o<x>_change the name of the executable produced to <x>'#010+
'**1','O<x>_optimizations:'#010+
'**1O<x>_optimizations:'#010+
'**2O-_disable optimizations'#010+
'**2O1_level 1 optimizations (quick and debugger friendly)'#010+
'**2O2_level 2 optimizations (-O1 + quick optimizations)'#010+
'**2O2_level 2 op','timizations (-O1 + quick optimizations)'#010+
'**2O3_level 3 optimizations (-O2 + slow optimizations)'#010+
'**2Oa<x>=<y>_set alignm','ent'#010+
'**2Oa<x>=<y>_set alignment'#010+
'**2Oo[NO]<x>_enable or disable optimizations, see fpc -i for possible '+
'values'#010+
'**2Op<x>_set target cpu for optimizing, see fpc -i for possible values'+
#010+
'**2Op<x>_set target cpu for optimizing, s','ee fpc -i for possible valu'+
'es'#010+
'**2Os_generate smaller code'#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+
'**2Rdefault_use default 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+
'**1S<x>_syntax options:'#010+
'**2S2_same as -Mobjfpc'#010+
'**2Sc_supports op','erators like C (*=,+=,/= and -=)'#010+
'**2Sc_supports operators like C (*=,+=,/= and -=)'#010+
'**2Sa_include assertion code.'#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 com','bination of the following:'#010+
'**3*_<n> : compiler stops after the <n> errors (default is 1)'#010+
'**3*_w : compiler stops also ','after warnings'#010+
'**3*_w : compiler stops also after warnings'#010+
'**3*_n : compiler stops also after notes'#010+
'**3*_h : compiler stops also after hints'#010+
'**2Sg_allow LABEL and GOTO'#010+
'**2Sg_allow LABEL and GOT','O'#010+
'**2Sh_Use ansistrings'#010+
'**2Si_support C++ styled INLINE'#010+
'**2Sk_load fpcylix unit'#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+
'**2Sm_support macros like C (global)'#010+
'**2So_same as -Mtp'#010+
'**2So','_same as -Mtp'#010+
'**2Sp_same as -Mgpc'#010+
'**2Ss_constructor name must be init (destructor must be done)'#010+
'**2St_allow static key','word in objects'#010+
'**2St_allow static keyword in objects'#010+
'**2Sx_enable exception keywords (default in Delphi/ObjFPC modes)'#010+
'**1s_don'#039't call assembler and linker'#010+
'**2sh_Generate script to link on host'#010+
'**2s','h_Generate script to link on host'#010+
'**2st_Generate script to link on target'#010+
'**2sr_Skip register allocation phase (use wi','th -alr)'#010+
'**2sr_Skip register allocation phase (use with -alr)'#010+
'**1T<x>_Target operating system:'#010+
'3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+
'3*2Tfreebsd_FreeBSD'#010+
'3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+
'3*2Tgo32v2','_Version 2 of DJ Delorie DOS extender'#010+
'3*2Tlinux_Linux'#010+
'3*2Tnetbsd_NetBSD'#010+
'3*2Tnetware_Novell Netware Module (clib)'#010+
'3*2Tn','etwlibc_Novell 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*2Twatcom_Watcom compatible DOS extender'#010+
'3*2Twatcom_Wat','com compatible DOS extender'#010+
'3*2Twdosx_WDOSX DOS extender'#010+
'3*2Twin32_Windows 32 Bit'#010+
'3*2Twince_Windows CE'#010+
'4*2Tlinux_Linux',#010+
'4*2Tlinux_Linux'#010+
'6*2Tamiga_Commodore Amiga'#010+
'6*2Tatari_Atari ST/STe/TT'#010+
'6*2Tlinux_Linux/m68k'#010+
'6*2Tmacos_Macintosh m68k (not supported)'#010+
'6*2Tpalmos_PalmOS'#010+
'6*2Tpal','mos_PalmOS'#010+
'A*2Tlinux_Linux'#010+
'A*2Twince_Windows CE'#010+
'P*2Tamiga_AmigaOS on PowerPC'#010+
'P*2Tdarwin_Darwin and MacOS X on PowerPC'#010,
'P*2Tdarwin_Darwin and MacOS X on PowerPC'#010+
'P*2Tlinux_Linux on PowerPC'#010+
'P*2Tmacos_MacOS (classic) on PowerPC'#010+
'P*2Tmorphos_MorphOS'#010+
'S*2Tlinux_Linux'#010+
'**1u<x>_undefines the symbol <x>'#010+
'**1u<x>_undefines the ','symbol <x>'#010+
'**1U_unit options:'#010+
'**2Un_don'#039't check the unit name'#010+
'**2Ur_generate release unit files'#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+
'**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*_l : Show linenumbers r : Rhide/GCC compatibility mode'#010+
'**2*_a : Show everything ',' x : Executable info (Win32 only'+
'**2*_e : Show errors (default) 0 : Show not','hing (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*_l : Show linenumbers r : Rhide/GCC compatibility mode'#010+
'**2*_a : Show everything x : Executable info (Win32 only)'#010+
'**2*_b : Write file names messages with full path'#010+
'**2*_v : write fpcdebug.txt with p : Write tree.log with parse tre'+
'e'#010+
'**2*_v : write fpcdebug.txt with ',' p : Write tree.log with parse t'+
'ree'#010+
'**2*_ lots of debugging info'#010+
'3*1W<x>_Win32-like target options'#010+
'3*2WB_Create a',' relocatable image'#010+
'3*2WB_Create a relocatable image'#010+
'3*2WB<x>_Set Image base to Hexadecimal <x> value'#010+
'3*2WC_Specify console type application'#010+
'3*2WD_Use DEFFILE to export functions of DLL or EXE'#010+
'3*2WD_Use DEFFI','LE to export functions of DLL or EXE'#010+
'3*2WF_Specify full-screen type application (OS/2 only)'#010+
'3*2WG_Specify graphic type',' application'#010+
'3*2WG_Specify graphic type application'#010+
'3*2WN_Do not generate relocation code (necessary for debugging)'#010+
'3*2WR_Generate relocation code'#010+
'P*2WC_Specify console type application (MacOS only)'#010+
'P*2WC_Specify ','console type application (MacOS only)'#010+
'P*2WG_Specify graphic type application (MacOS only)'#010+
'P*2WT_Specify tool type appl','ication (MPW tool, MacOS only)'#010+
'P*2WT_Specify tool type application (MPW tool, MacOS only)'#010+
'**1X_executable options:'#010+
'**2Xc_pass --shared to the linker (Unix only)'#010+
'**2Xd_don'#039't use standard library search path (needed for cross com'+
'pile)'#010+
'**2Xd_don'#039't use stan','dard library search path (needed for cross c'+
'ompile)'#010+
'**2Xe_use external linker'#010+
'**2XD_try to link units dynamic ',' (defines FPC_LINK_DYNAMIC)'#010+
'**2XD_try to link units dynamic (defines FPC_LINK_DYNAMIC)'#010+
'**2Xi_use internal linker'#010+
'**2Xm_generate link map'#010+
'**2XM<x>_set the name of the '#039'main'#039' program routine (default i'+
's '#039'main'#039')'#010+
'**2XM<x>_set the name of the '#039'main'#039' program ','routine (default'+
' is '#039'main'#039')'#010+
'**2XP<x>_prepend the binutils names with the prefix <x>'#010+
'**2Xr<x>_set library search path t','o <x> (needed for cross compile)'#010+
'**2Xr<x>_set library search path to <x> (needed for cross compile)'#010+
'**2Xs_strip all symbols from executable'#010+
'**2XS_try to link units static (default) (defines FPC_LINK_STATIC)'#010+
'**2XS_try to link units static (default) (defines',' FPC_LINK_STATIC)'#010+
'**2Xt_link with static libraries (-static is passed to linker)'#010+
'**2XX_try to link units smart ',' (defines FPC_LINK_SMART)'#010+
'**2XX_try to link units smart (defines FPC_LINK_SMART)'#010+
'**1*_'#010+
'**1?_shows this help'#010+
'**1h_shows this help without waiting'#000

View File

@ -83,7 +83,7 @@ Unit rappcgas;
{ record.field ? }
if actasmtoken=AS_DOT then
begin
BuildRecordOffsetSize(tempstr,l,k,mangledname);
BuildRecordOffsetSize(tempstr,l,k,mangledname,false);
if (mangledname<>'') then
Message(asmr_e_invalid_reference_syntax);
inc(oper.opr.ref.offset,l);
@ -276,7 +276,7 @@ Unit rappcgas;
begin
if expr<>'' then
begin
BuildRecordOffsetSize(expr,toffset,tsize,mangledname);
BuildRecordOffsetSize(expr,toffset,tsize,mangledname,false);
if (oper.opr.typ<>OPR_CONSTANT) and
(mangledname<>'') then
Message(asmr_e_wrong_sym_type);

View File

@ -82,7 +82,7 @@ begin
{ record.field ? }
if actasmtoken = AS_DOT then
begin
BuildRecordOffsetSize(tempstr, l, k, mangledname);
BuildRecordOffsetSize(tempstr, l, k, mangledname, false);
if (mangledname<>'') then
Message(asmr_e_invalid_reference_syntax);
inc(oper.opr.ref.offset, l);
@ -281,7 +281,7 @@ var
begin
if expr <> '' then
begin
BuildRecordOffsetSize(expr, toffset, tsize, mangledname);
BuildRecordOffsetSize(expr, toffset, tsize, mangledname, false);
if (oper.opr.typ<>OPR_CONSTANT) and
(mangledname<>'') then
Message(asmr_e_wrong_sym_type);

View File

@ -54,7 +54,7 @@ unit raatt;
AS_ASCIIZ,AS_LCOMM,AS_COMM,AS_SINGLE,AS_DOUBLE,AS_EXTENDED,
AS_DATA,AS_TEXT,AS_INIT,AS_END,
{------------------ Assembler Operators --------------------}
AS_TYPE,AS_SIZEOF,AS_MOD,AS_SHL,AS_SHR,AS_NOT,AS_AND,AS_OR,AS_XOR,AS_NOR,AS_AT,
AS_TYPE,AS_SIZEOF,AS_VMTOFFSET,AS_MOD,AS_SHL,AS_SHR,AS_NOT,AS_AND,AS_OR,AS_XOR,AS_NOR,AS_AT,
AS_LO,AS_HI);
tasmkeyword = string[10];
@ -75,7 +75,7 @@ unit raatt;
'.align','.balign','.p2align','.ascii',
'.asciz','.lcomm','.comm','.single','.double','.tfloat',
'.data','.text','.init','END',
'TYPE','SIZEOF','%','<<','>>','!','&','|','^','~','@','lo','hi');
'TYPE','SIZEOF','VMTOFFSET','%','<<','>>','!','&','|','^','~','@','lo','hi');
type
tattreader = class(tasmreader)
@ -86,7 +86,7 @@ unit raatt;
procedure BuildConstantOperand(oper : toperand);
procedure BuildRealConstant(typ : tfloattype);
procedure BuildStringConstant(asciiz: boolean);
procedure BuildRecordOffsetSize(const expr: string;var offset:aint;var size:aint; var mangledname: string);
procedure BuildRecordOffsetSize(const expr: string;var offset:aint;var size:aint; var mangledname: string; needvmtofs: boolean);
procedure BuildConstSymbolExpression(allowref,betweenbracket,needofs:boolean;var value:aint;var asmsym:string;var asmsymtyp:TAsmsymtype);
function BuildConstExpression(allowref,betweenbracket:boolean): aint;
function Assemble: tlinkedlist;override;
@ -353,6 +353,11 @@ unit raatt;
actasmtoken:=AS_SIZEOF;
exit;
end;
if actasmpattern = 'VMTOFFSET' then
Begin
actasmtoken:=AS_VMTOFFSET;
exit;
end;
if is_register(actasmpattern) then
begin
actasmtoken:=AS_REGISTER;
@ -787,6 +792,7 @@ unit raatt;
AS_TYPE,
AS_SIZEOF,
AS_NOT,
AS_VMTOFFSET,
AS_ID :
Begin
BuildConstSymbolExpression(false,false,false,value,asmsym,asmsymtyp);
@ -1165,7 +1171,7 @@ unit raatt;
Parsing Helpers
*****************************************************************************}
Procedure tattreader.BuildRecordOffsetSize(const expr: string;var offset:aint;var size:aint; var mangledname: string);
Procedure tattreader.BuildRecordOffsetSize(const expr: string;var offset:aint;var size:aint; var mangledname: string; needvmtofs: boolean);
{ Description: This routine builds up a record offset after a AS_DOT }
{ token is encountered. }
{ On entry actasmtoken should be equal to AS_DOT }
@ -1186,7 +1192,7 @@ unit raatt;
break;
end;
end;
if not GetRecordOffsetSize(s,offset,size,mangledname) then
if not GetRecordOffsetSize(s,offset,size,mangledname,needvmtofs) then
Message(asmr_e_building_record_offset);
end;
@ -1341,7 +1347,7 @@ unit raatt;
Consume(AS_ID);
if actasmtoken=AS_DOT then
begin
BuildRecordOffsetSize(tempstr,k,l,mangledname);
BuildRecordOffsetSize(tempstr,k,l,mangledname,false);
if mangledname<>'' then
Message(asmr_e_wrong_sym_type);
end
@ -1368,6 +1374,22 @@ unit raatt;
str(l, tempstr);
expr:=expr + tempstr;
end;
AS_VMTOFFSET:
begin
Consume(actasmtoken);
if actasmtoken<>AS_ID then
Message(asmr_e_type_without_identifier)
else
begin
tempstr:=actasmpattern;
consume(AS_ID);
BuildRecordOffsetSize(tempstr,k,l,mangledname,true);
if (mangledname <> '') then
Message(asmr_e_wrong_sym_type);
str(k,tempstr);
expr := expr + tempstr;
end
end;
AS_ID:
Begin
hs:='';
@ -1447,7 +1469,7 @@ unit raatt;
end;
if actasmtoken=AS_DOT then
begin
BuildRecordOffsetSize(tempstr,l,k,hs);
BuildRecordOffsetSize(tempstr,l,k,hs,false);
if (hs<>'') then
hssymtyp:=AT_FUNCTION
else

View File

@ -184,7 +184,7 @@ Function EscapeToPascal(const s:string): string;
---------------------------------------------------------------------}
procedure AsmSearchSym(const s:string;var srsym:tsym;var srsymtable:TSymtable);
Function GetRecordOffsetSize(s:string;Var Offset: aint;var Size:aint; var mangledname: string):boolean;
Function GetRecordOffsetSize(s:string;Var Offset: aint;var Size:aint; var mangledname: string; needvmtofs: boolean):boolean;
Function SearchType(const hs:string;var size:aint): Boolean;
Function SearchRecordType(const s:string): boolean;
Function SearchIConstant(const s:string; var l:aint): boolean;
@ -1267,7 +1267,7 @@ Begin
end;
Function GetRecordOffsetSize(s:string;Var Offset: aint;var Size:aint; var mangledname: string):boolean;
Function GetRecordOffsetSize(s:string;Var Offset: aint;var Size:aint; var mangledname: string; needvmtofs: boolean):boolean;
{ search and returns the offset and size of records/objects of the base }
{ with field name setup in field. }
{ returns FALSE if not found. }
@ -1279,6 +1279,7 @@ var
srsymtable : TSymtable;
i : longint;
base : string;
procdef: tprocdef;
Begin
GetRecordOffsetSize:=FALSE;
Offset:=0;
@ -1362,7 +1363,24 @@ Begin
st:=nil;
if Tprocsym(sym).ProcdefList.Count>1 then
Message(asmr_w_calling_overload_func);
mangledname:=tprocdef(tprocsym(sym).ProcdefList[0]).mangledname;
procdef:=tprocdef(tprocsym(sym).ProcdefList[0]);
if (not needvmtofs) then
begin
mangledname:=procdef.mangledname;
end
else
begin
{ can only get the vmtoffset of virtual methods }
if not(po_virtualmethod in procdef.procoptions) then
Message1(asmr_e_no_vmtoffset_possible,FullTypeName(procdef,nil))
else
begin
{ size = sizeof(target_system_pointer) }
size:=sizeof(aint);
offset:=procdef._class.vmtmethodoffset(procdef.extnumber)
end;
end;
{ if something comes after the procsym, it's invalid assembler syntax }
GetRecordOffsetSize:=(s='');
exit;
end;

View File

@ -85,7 +85,7 @@ Interface
{ record.field ? }
if actasmtoken=AS_DOT then
begin
BuildRecordOffsetSize(tempstr,l,k,mangledname);
BuildRecordOffsetSize(tempstr,l,k,mangledname,false);
if (mangledname<>'') then
Message(asmr_e_invalid_reference_syntax);
inc(oper.opr.ref.offset,l);
@ -252,7 +252,7 @@ Interface
begin
if expr<>'' then
begin
BuildRecordOffsetSize(expr,toffset,tsize,mangledname);
BuildRecordOffsetSize(expr,toffset,tsize,mangledname,false);
if (oper.opr.typ<>OPR_CONSTANT) and
(mangledname<>'') then
Message(asmr_e_wrong_sym_type);

View File

@ -298,7 +298,7 @@ Implementation
begin
if expr<>'' then
begin
BuildRecordOffsetSize(expr,toffset,tsize,mangledname);
BuildRecordOffsetSize(expr,toffset,tsize,mangledname,false);
if (oper.opr.typ<>OPR_CONSTANT) and
(mangledname<>'') then
Message(asmr_e_wrong_sym_type);
@ -386,7 +386,7 @@ Implementation
{ record.field ? }
if actasmtoken=AS_DOT then
begin
BuildRecordOffsetSize(tempstr,l,k,mangledname);
BuildRecordOffsetSize(tempstr,l,k,mangledname,false);
if (mangledname<>'') then
Message(asmr_e_invalid_reference_syntax);
inc(oper.opr.ref.offset,l);

View File

@ -43,7 +43,7 @@ Unit Rax86int;
AS_ALIGN,AS_DB,AS_DW,AS_DD,AS_END,
{------------------ Assembler Operators --------------------}
AS_BYTE,AS_WORD,AS_DWORD,AS_QWORD,AS_TBYTE,AS_DQWORD,AS_NEAR,AS_FAR,
AS_HIGH,AS_LOW,AS_OFFSET,AS_SIZEOF,AS_SEG,AS_TYPE,AS_PTR,AS_MOD,AS_SHL,AS_SHR,AS_NOT,
AS_HIGH,AS_LOW,AS_OFFSET,AS_SIZEOF,AS_VMTOFFSET,AS_SEG,AS_TYPE,AS_PTR,AS_MOD,AS_SHL,AS_SHR,AS_NOT,
AS_AND,AS_OR,AS_XOR);
type
@ -61,7 +61,7 @@ Unit Rax86int;
procedure GetToken;
function consume(t : tasmtoken):boolean;
procedure RecoverConsume(allowcomma:boolean);
procedure BuildRecordOffsetSize(const expr: string;var offset:aint;var size:aint; var mangledname: string);
procedure BuildRecordOffsetSize(const expr: string;var offset:aint;var size:aint; var mangledname: string; needvmtofs: boolean);
procedure BuildConstSymbolExpression(needofs,isref:boolean;var value:aint;var asmsym:string;var asmsymtyp:TAsmsymtype);
function BuildConstExpression:aint;
function BuildRefConstExpression:aint;
@ -94,7 +94,7 @@ Unit Rax86int;
;
type
tasmkeyword = string[6];
tasmkeyword = string[9];
const
@ -115,7 +115,7 @@ Unit Rax86int;
{ context sensitive. }
_asmoperators : array[0.._count_asmoperators] of tasmkeyword = (
'BYTE','WORD','DWORD','QWORD','TBYTE','DQWORD','NEAR','FAR','HIGH',
'LOW','OFFSET','SIZEOF','SEG','TYPE','PTR','MOD','SHL','SHR','NOT','AND',
'LOW','OFFSET','SIZEOF','VMTOFFSET','SEG','TYPE','PTR','MOD','SHL','SHR','NOT','AND',
'OR','XOR');
token2str : array[tasmtoken] of string[10] = (
@ -125,7 +125,7 @@ Unit Rax86int;
';','identifier','register','opcode','/',
'','','','','END',
'','','','','','','','','',
'','','sizeof','','type','ptr','mod','shl','shr','not',
'','','sizeof','vmtoffset','','type','ptr','mod','shl','shr','not',
'and','or','xor'
);
@ -706,7 +706,7 @@ Unit Rax86int;
{ This routine builds up a record offset after a AS_DOT
token is encountered.
On entry actasmtoken should be equal to AS_DOT }
Procedure tx86intreader.BuildRecordOffsetSize(const expr: string;var offset:aint;var size:aint; var mangledname: string);
Procedure tx86intreader.BuildRecordOffsetSize(const expr: string;var offset:aint;var size:aint; var mangledname: string; needvmtofs: boolean);
var
s: string;
Begin
@ -728,7 +728,7 @@ Unit Rax86int;
break;
end;
end;
if not GetRecordOffsetSize(s,offset,size,mangledname) then
if not GetRecordOffsetSize(s,offset,size,mangledname,needvmtofs) then
Message(asmr_e_building_record_offset);
end;
@ -739,7 +739,8 @@ Unit Rax86int;
parenlevel : longint;
l,k : aint;
hasparen,
errorflag : boolean;
errorflag,
needvmtofs : boolean;
prevtok : tasmtoken;
hl : tasmlabel;
hssymtyp : Tasmsymtype;
@ -756,6 +757,7 @@ Unit Rax86int;
expr:='';
inexpression:=TRUE;
parenlevel:=0;
needvmtofs:=FALSE;
Repeat
{ Support ugly delphi constructs like: [ECX].1+2[EDX] }
if isref and (actasmtoken=AS_LBRACKET) then
@ -840,10 +842,14 @@ Unit Rax86int;
expr:=expr + actasmpattern;
Consume(AS_INTNUM);
end;
AS_VMTOFFSET,
AS_OFFSET:
begin
Consume(AS_OFFSET);
needofs:=true;
if (actasmtoken = AS_OFFSET) then
needofs:=true
else
needvmtofs:=true;
Consume(actasmtoken);
if actasmtoken<>AS_ID then
Message(asmr_e_offset_without_identifier);
end;
@ -866,7 +872,7 @@ Unit Rax86int;
Consume(AS_ID);
if actasmtoken=AS_DOT then
begin
BuildRecordOffsetSize(tempstr,k,l,mangledname);
BuildRecordOffsetSize(tempstr,k,l,mangledname,false);
if mangledname<>'' then
{ procsym }
Message(asmr_e_wrong_sym_type);
@ -1022,7 +1028,7 @@ Unit Rax86int;
(assigned(sym) and
(sym.typ = fieldvarsym)) then
begin
BuildRecordOffsetSize(tempstr,l,k,hs);
BuildRecordOffsetSize(tempstr,l,k,hs,needvmtofs);
if hs <> '' then
hssymtyp:=AT_FUNCTION
else
@ -1140,15 +1146,16 @@ Unit Rax86int;
Message(asmr_e_invalid_reference_syntax);
Case actasmtoken of
AS_ID: { Constant reference expression OR variable reference expression }
AS_ID, { Constant reference expression OR variable reference expression }
AS_VMTOFFSET:
Begin
if not GotPlus then
Message(asmr_e_invalid_reference_syntax);
GotStar:=false;
GotPlus:=false;
if SearchIConstant(actasmpattern,l) or
SearchRecordType(actasmpattern) then
if (actasmtoken = AS_VMTOFFSET) or
(SearchIConstant(actasmpattern,l) or
SearchRecordType(actasmpattern)) then
begin
l:=BuildRefConstExpression;
GotPlus:=(prevasmtoken=AS_PLUS);
@ -1216,7 +1223,7 @@ Unit Rax86int;
{ record.field ? }
if actasmtoken=AS_DOT then
begin
BuildRecordOffsetSize(tempstr,l,k,hs);
BuildRecordOffsetSize(tempstr,l,k,hs,false);
if (hs<>'') then
Message(asmr_e_invalid_symbol_ref);
case oper.opr.typ of
@ -1536,7 +1543,7 @@ Unit Rax86int;
begin
if expr<>'' then
begin
BuildRecordOffsetSize(expr,toffset,tsize, hs);
BuildRecordOffsetSize(expr,toffset,tsize,hs,false);
if (oper.opr.typ<>OPR_NONE) and
(hs<>'') then
Message(asmr_e_wrong_sym_type);
@ -1589,6 +1596,7 @@ Unit Rax86int;
case actasmtoken of
AS_OFFSET,
AS_SIZEOF,
AS_VMTOFFSET,
AS_TYPE,
AS_NOT,
AS_STRING,

49
tests/webtbs/tw8153.pp Normal file
View File

@ -0,0 +1,49 @@
{ %cpu=i386 }
{$ifdef fpc}
{$mode delphi}
{$endif}
type
tc = class
procedure v; virtual;
procedure testintel; virtual;
procedure testatt; virtual;
end;
procedure tc.testintel; assembler;
asm
mov ecx,[eax]
jmp [ecx + vmtoffset tc.v]
end;
{$asmmode att}
procedure tc.testatt; assembler;
asm
movl (%eax),%ecx
jmpl +vmtoffset tc.v(%ecx)
end;
var
l : longint;
procedure tc.v;
begin
l := 5;
end;
var
c: tc;
begin
c := tc.create;
c.testintel;
if l <> 5 then
halt(1);
l := 0;
c.testatt;
if l <> 5 then
halt(1);
c.free;
end.

43
tests/webtbs/tw8153a.pp Normal file
View File

@ -0,0 +1,43 @@
{ %cpu=powerpc,powerpc64 }
{$ifdef fpc}
{$mode delphi}
{$endif}
type
tc = class
procedure v; virtual;
procedure test; virtual;
end;
procedure tc.test; assembler;
asm
{$ifdef cpu64bit}
ld r4,0(r3)
ld r4,+vmtoffset tc.v(r4)
{$else}
lwz r4,0(r3)
lwz r4,+vmtoffset tc.v(r4)
{$endif}
mtctr r4
bctr
end;
var
l : longint;
procedure tc.v;
begin
l := 5;
end;
var
c: tc;
begin
c := tc.create;
c.test;
if l <> 5 then
halt(1);
c.free;
end.