mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-11-02 05:09:49 +01:00
compiler: fix compilation problems caused by tprocdef._class -> tprocdef.struct rename which was found by make fullcycle
git-svn-id: branches/paul/extended_records@16530 -
This commit is contained in:
parent
56bf42de57
commit
b317139006
@ -2452,7 +2452,7 @@ unit cgcpu;
|
||||
if (procdef.extnumber=$ffff) then
|
||||
Internalerror(200006139);
|
||||
{ call/jmp vmtoffs(%eax) ; method offs }
|
||||
reference_reset_base(href,NR_R12,procdef._class.vmtmethodoffset(procdef.extnumber),sizeof(pint));
|
||||
reference_reset_base(href,NR_R12,tobjectdef(procdef.struct).vmtmethodoffset(procdef.extnumber),sizeof(pint));
|
||||
cg.a_load_ref_reg(list,OS_ADDR,OS_ADDR,href,NR_R12);
|
||||
list.concat(taicpu.op_reg_reg(A_MOV,NR_PC,NR_R12));
|
||||
end;
|
||||
@ -2462,7 +2462,7 @@ unit cgcpu;
|
||||
begin
|
||||
if not(procdef.proctypeoption in [potype_function,potype_procedure]) then
|
||||
Internalerror(200006137);
|
||||
if not assigned(procdef._class) or
|
||||
if not assigned(procdef.struct) or
|
||||
(procdef.procoptions*[po_classmethod, po_staticmethod,
|
||||
po_methodpointer, po_interrupt, po_iocheck]<>[]) then
|
||||
Internalerror(200006138);
|
||||
|
||||
@ -1565,7 +1565,7 @@ unit cgcpu;
|
||||
if (procdef.extnumber=$ffff) then
|
||||
Internalerror(200006139);
|
||||
{ call/jmp vmtoffs(%eax) ; method offs }
|
||||
reference_reset_base(href,NR_R11,procdef._class.vmtmethodoffset(procdef.extnumber));
|
||||
reference_reset_base(href,NR_R11,tobjectdef(procdef.struct).vmtmethodoffset(procdef.extnumber));
|
||||
if not((longint(href.offset) >= low(smallint)) and
|
||||
(longint(href.offset) <= high(smallint))) then
|
||||
begin
|
||||
@ -1583,7 +1583,7 @@ unit cgcpu;
|
||||
begin
|
||||
if not(procdef.proctypeoption in [potype_function,potype_procedure]) then
|
||||
Internalerror(200006137);
|
||||
if not assigned(procdef._class) or
|
||||
if not assigned(procdef.struct) or
|
||||
(procdef.procoptions*[po_classmethod, po_staticmethod,
|
||||
po_methodpointer, po_interrupt, po_iocheck]<>[]) then
|
||||
Internalerror(200006138);
|
||||
|
||||
@ -1649,7 +1649,7 @@ procedure TCgMPSel.g_intf_wrapper(list: tasmlist; procdef: tprocdef; const label
|
||||
if (procdef.extnumber=$ffff) then
|
||||
Internalerror(200006139);
|
||||
{ call/jmp vmtoffs(%eax) ; method offs }
|
||||
reference_reset_base(href, NR_R24, procdef._class.vmtmethodoffset(procdef.extnumber), sizeof(aint));
|
||||
reference_reset_base(href, NR_R24, tobjectdef(procdef.struct).vmtmethodoffset(procdef.extnumber), sizeof(aint));
|
||||
cg.a_load_ref_reg(list, OS_ADDR, OS_ADDR, href, NR_R24);
|
||||
list.concat(taicpu.op_reg(A_JR, NR_R24));
|
||||
end;
|
||||
@ -1659,7 +1659,7 @@ var
|
||||
begin
|
||||
if procdef.proctypeoption <> potype_none then
|
||||
Internalerror(200006137);
|
||||
if not assigned(procdef._class) or
|
||||
if not assigned(procdef.struct) or
|
||||
(procdef.procoptions * [po_classmethod, po_staticmethod,
|
||||
po_methodpointer, po_interrupt, po_iocheck] <> []) then
|
||||
Internalerror(200006138);
|
||||
|
||||
@ -666,7 +666,7 @@ unit cgppc;
|
||||
if (procdef.extnumber=$ffff) then
|
||||
Internalerror(200006139);
|
||||
{ call/jmp vmtoffs(%eax) ; method offs }
|
||||
reference_reset_base(href,NR_R11,procdef._class.vmtmethodoffset(procdef.extnumber),sizeof(pint));
|
||||
reference_reset_base(href,NR_R11,tobjectdef(procdef.struct).vmtmethodoffset(procdef.extnumber),sizeof(pint));
|
||||
if hasLargeOffset(href) then
|
||||
begin
|
||||
{$ifdef cpu64}
|
||||
@ -696,7 +696,7 @@ unit cgppc;
|
||||
begin
|
||||
if not(procdef.proctypeoption in [potype_function,potype_procedure]) then
|
||||
Internalerror(200006137);
|
||||
if not assigned(procdef._class) or
|
||||
if not assigned(procdef.struct) or
|
||||
(procdef.procoptions*[po_classmethod, po_staticmethod,
|
||||
po_methodpointer, po_interrupt, po_iocheck]<>[]) then
|
||||
Internalerror(200006138);
|
||||
|
||||
@ -1355,7 +1355,7 @@ implementation
|
||||
begin
|
||||
if not(procdef.proctypeoption in [potype_function,potype_procedure]) then
|
||||
Internalerror(200006137);
|
||||
if not assigned(procdef._class) or
|
||||
if not assigned(procdef.struct) or
|
||||
(procdef.procoptions*[po_classmethod, po_staticmethod,
|
||||
po_methodpointer, po_interrupt, po_iocheck]<>[]) then
|
||||
Internalerror(200006138);
|
||||
@ -1384,7 +1384,7 @@ implementation
|
||||
cg.a_load_ref_reg(list,OS_ADDR,OS_ADDR,href,NR_G1);
|
||||
g1_used:=true;
|
||||
{ jmp *vmtoffs(%eax) ; method offs }
|
||||
reference_reset_base(href,NR_G1,procdef._class.vmtmethodoffset(procdef.extnumber),sizeof(pint));
|
||||
reference_reset_base(href,NR_G1,tobjectdef(procdef.struct).vmtmethodoffset(procdef.extnumber),sizeof(pint));
|
||||
list.concat(taicpu.op_ref_reg(A_LD,href,NR_G1));
|
||||
list.concat(taicpu.op_reg(A_JMP,NR_G1));
|
||||
g1_used:=false;
|
||||
|
||||
@ -148,7 +148,7 @@ unit cgcpu;
|
||||
begin
|
||||
if not(procdef.proctypeoption in [potype_function,potype_procedure]) then
|
||||
Internalerror(200006137);
|
||||
if not assigned(procdef._class) or
|
||||
if not assigned(procdef.struct) or
|
||||
(procdef.procoptions*[po_classmethod, po_staticmethod,
|
||||
po_methodpointer, po_interrupt, po_iocheck]<>[]) then
|
||||
Internalerror(200006138);
|
||||
@ -180,7 +180,7 @@ unit cgcpu;
|
||||
reference_reset_base(href,NR_RDI,0,sizeof(pint));
|
||||
cg.a_load_ref_reg(list,OS_ADDR,OS_ADDR,href,NR_RAX);
|
||||
{ jmp *vmtoffs(%eax) ; method offs }
|
||||
reference_reset_base(href,NR_RAX,procdef._class.vmtmethodoffset(procdef.extnumber),sizeof(pint));
|
||||
reference_reset_base(href,NR_RAX,tobjectdef(procdef.struct).vmtmethodoffset(procdef.extnumber),sizeof(pint));
|
||||
list.concat(taicpu.op_ref_reg(A_MOV,S_Q,href,NR_RAX));
|
||||
list.concat(taicpu.op_reg(A_JMP,S_Q,NR_RAX));
|
||||
end
|
||||
|
||||
Loading…
Reference in New Issue
Block a user