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

* use voidcodepointertype.size in tobjectdef.vmtmethodoffset, avoid ifdef i8086

Browse Source 
git-svn-id: trunk@27538 -
This commit is contained in:
nickysn 2014-04-11 22:09:30 +00:00
parent be08957a96
commit 8d9fda9264
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
compiler/symdef.pas
View File

@ -6278,37 +6278,27 @@ implementation
function tobjectdef.vmtmethodoffset(index:longint):longint;
var
codeptrsize: Integer;
begin
{$ifdef i8086}
if current_settings.x86memorymodel in x86_far_code_models then
codeptrsize:=4
else
codeptrsize:=2;
{$else i8086}
codeptrsize:=sizeof(pint);
{$endif i8086}
{ for offset of methods for classes, see rtl/inc/objpash.inc }
case objecttype of
odt_class:
{ the +2*sizeof(pint) is size and -size }
vmtmethodoffset:=index*codeptrsize+10*sizeof(pint)+2*sizeof(pint);
vmtmethodoffset:=index*voidcodepointertype.size+10*sizeof(pint)+2*sizeof(pint);
odt_helper,
odt_objcclass,
odt_objcprotocol:
vmtmethodoffset:=0;
odt_interfacecom,odt_interfacecorba,odt_dispinterface:
vmtmethodoffset:=index*codeptrsize;
vmtmethodoffset:=index*voidcodepointertype.size;
odt_javaclass,
odt_interfacejava:
{ invalid }
vmtmethodoffset:=-1;
else
{$ifdef WITHDMT}
vmtmethodoffset:=index*codeptrsize+4*sizeof(pint);
vmtmethodoffset:=index*voidcodepointertype.size+4*sizeof(pint);
{$else WITHDMT}
vmtmethodoffset:=index*codeptrsize+3*sizeof(pint);
vmtmethodoffset:=index*voidcodepointertype.size+3*sizeof(pint);
{$endif WITHDMT}
end;
end;