Răsfoiți Sursa

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 -
paul 14 ani în urmă
părinte
comite
b317139006

+ 2 - 2
compiler/arm/cgcpu.pas

@@ -2452,7 +2452,7 @@ unit cgcpu;
           if (procdef.extnumber=$ffff) then
           if (procdef.extnumber=$ffff) then
             Internalerror(200006139);
             Internalerror(200006139);
           { call/jmp  vmtoffs(%eax) ; method offs }
           { 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);
           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));
           list.concat(taicpu.op_reg_reg(A_MOV,NR_PC,NR_R12));
         end;
         end;
@@ -2462,7 +2462,7 @@ unit cgcpu;
       begin
       begin
         if not(procdef.proctypeoption in [potype_function,potype_procedure]) then
         if not(procdef.proctypeoption in [potype_function,potype_procedure]) then
           Internalerror(200006137);
           Internalerror(200006137);
-        if not assigned(procdef._class) or
+        if not assigned(procdef.struct) or
            (procdef.procoptions*[po_classmethod, po_staticmethod,
            (procdef.procoptions*[po_classmethod, po_staticmethod,
              po_methodpointer, po_interrupt, po_iocheck]<>[]) then
              po_methodpointer, po_interrupt, po_iocheck]<>[]) then
           Internalerror(200006138);
           Internalerror(200006138);

+ 2 - 2
compiler/m68k/cgcpu.pas

@@ -1565,7 +1565,7 @@ unit cgcpu;
           if (procdef.extnumber=$ffff) then
           if (procdef.extnumber=$ffff) then
             Internalerror(200006139);
             Internalerror(200006139);
           { call/jmp  vmtoffs(%eax) ; method offs }
           { 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
           if not((longint(href.offset) >= low(smallint)) and
                  (longint(href.offset) <= high(smallint))) then
                  (longint(href.offset) <= high(smallint))) then
             begin
             begin
@@ -1583,7 +1583,7 @@ unit cgcpu;
       begin
       begin
         if not(procdef.proctypeoption in [potype_function,potype_procedure]) then
         if not(procdef.proctypeoption in [potype_function,potype_procedure]) then
           Internalerror(200006137);
           Internalerror(200006137);
-        if not assigned(procdef._class) or
+        if not assigned(procdef.struct) or
            (procdef.procoptions*[po_classmethod, po_staticmethod,
            (procdef.procoptions*[po_classmethod, po_staticmethod,
              po_methodpointer, po_interrupt, po_iocheck]<>[]) then
              po_methodpointer, po_interrupt, po_iocheck]<>[]) then
           Internalerror(200006138);
           Internalerror(200006138);

+ 2 - 2
compiler/mips/cgcpu.pas

@@ -1649,7 +1649,7 @@ procedure TCgMPSel.g_intf_wrapper(list: tasmlist; procdef: tprocdef; const label
           if (procdef.extnumber=$ffff) then
           if (procdef.extnumber=$ffff) then
             Internalerror(200006139);
             Internalerror(200006139);
           { call/jmp  vmtoffs(%eax) ; method offs }
           { 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);
           cg.a_load_ref_reg(list, OS_ADDR, OS_ADDR, href, NR_R24);
           list.concat(taicpu.op_reg(A_JR, NR_R24));
           list.concat(taicpu.op_reg(A_JR, NR_R24));
         end;
         end;
@@ -1659,7 +1659,7 @@ var
 begin
 begin
   if procdef.proctypeoption <> potype_none then
   if procdef.proctypeoption <> potype_none then
     Internalerror(200006137);
     Internalerror(200006137);
-  if not assigned(procdef._class) or
+  if not assigned(procdef.struct) or
     (procdef.procoptions * [po_classmethod, po_staticmethod,
     (procdef.procoptions * [po_classmethod, po_staticmethod,
     po_methodpointer, po_interrupt, po_iocheck] <> []) then
     po_methodpointer, po_interrupt, po_iocheck] <> []) then
     Internalerror(200006138);
     Internalerror(200006138);

+ 2 - 2
compiler/ppcgen/cgppc.pas

@@ -666,7 +666,7 @@ unit cgppc;
           if (procdef.extnumber=$ffff) then
           if (procdef.extnumber=$ffff) then
             Internalerror(200006139);
             Internalerror(200006139);
           { call/jmp  vmtoffs(%eax) ; method offs }
           { 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
           if hasLargeOffset(href) then
             begin
             begin
 {$ifdef cpu64}
 {$ifdef cpu64}
@@ -696,7 +696,7 @@ unit cgppc;
       begin
       begin
         if not(procdef.proctypeoption in [potype_function,potype_procedure]) then
         if not(procdef.proctypeoption in [potype_function,potype_procedure]) then
           Internalerror(200006137);
           Internalerror(200006137);
-        if not assigned(procdef._class) or
+        if not assigned(procdef.struct) or
            (procdef.procoptions*[po_classmethod, po_staticmethod,
            (procdef.procoptions*[po_classmethod, po_staticmethod,
              po_methodpointer, po_interrupt, po_iocheck]<>[]) then
              po_methodpointer, po_interrupt, po_iocheck]<>[]) then
           Internalerror(200006138);
           Internalerror(200006138);

+ 2 - 2
compiler/sparc/cgcpu.pas

@@ -1355,7 +1355,7 @@ implementation
       begin
       begin
         if not(procdef.proctypeoption in [potype_function,potype_procedure]) then
         if not(procdef.proctypeoption in [potype_function,potype_procedure]) then
           Internalerror(200006137);
           Internalerror(200006137);
-        if not assigned(procdef._class) or
+        if not assigned(procdef.struct) or
            (procdef.procoptions*[po_classmethod, po_staticmethod,
            (procdef.procoptions*[po_classmethod, po_staticmethod,
              po_methodpointer, po_interrupt, po_iocheck]<>[]) then
              po_methodpointer, po_interrupt, po_iocheck]<>[]) then
           Internalerror(200006138);
           Internalerror(200006138);
@@ -1384,7 +1384,7 @@ implementation
             cg.a_load_ref_reg(list,OS_ADDR,OS_ADDR,href,NR_G1);
             cg.a_load_ref_reg(list,OS_ADDR,OS_ADDR,href,NR_G1);
             g1_used:=true; 
             g1_used:=true; 
             { jmp *vmtoffs(%eax) ; method offs }
             { 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_ref_reg(A_LD,href,NR_G1));
             list.concat(taicpu.op_reg(A_JMP,NR_G1));
             list.concat(taicpu.op_reg(A_JMP,NR_G1));
 	    g1_used:=false;
 	    g1_used:=false;

+ 2 - 2
compiler/x86_64/cgcpu.pas

@@ -148,7 +148,7 @@ unit cgcpu;
       begin
       begin
         if not(procdef.proctypeoption in [potype_function,potype_procedure]) then
         if not(procdef.proctypeoption in [potype_function,potype_procedure]) then
           Internalerror(200006137);
           Internalerror(200006137);
-        if not assigned(procdef._class) or
+        if not assigned(procdef.struct) or
            (procdef.procoptions*[po_classmethod, po_staticmethod,
            (procdef.procoptions*[po_classmethod, po_staticmethod,
              po_methodpointer, po_interrupt, po_iocheck]<>[]) then
              po_methodpointer, po_interrupt, po_iocheck]<>[]) then
           Internalerror(200006138);
           Internalerror(200006138);
@@ -180,7 +180,7 @@ unit cgcpu;
               reference_reset_base(href,NR_RDI,0,sizeof(pint));
               reference_reset_base(href,NR_RDI,0,sizeof(pint));
             cg.a_load_ref_reg(list,OS_ADDR,OS_ADDR,href,NR_RAX);
             cg.a_load_ref_reg(list,OS_ADDR,OS_ADDR,href,NR_RAX);
             { jmp *vmtoffs(%eax) ; method offs }
             { 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_ref_reg(A_MOV,S_Q,href,NR_RAX));
             list.concat(taicpu.op_reg(A_JMP,S_Q,NR_RAX));
             list.concat(taicpu.op_reg(A_JMP,S_Q,NR_RAX));
           end
           end