Переглянути джерело

* fixed helper declarations

florian 22 роки тому
батько
коміт
6432af8a76
3 змінених файлів з 33 додано та 23 видалено
  1. 12 8
      rtl/inc/compproc.inc
  2. 11 8
      rtl/inc/generic.inc
  3. 10 7
      rtl/powerpc/powerpc.inc

+ 12 - 8
rtl/inc/compproc.inc

@@ -164,6 +164,7 @@ Procedure fpc_Write_Text_WideChar(Len : Longint;var t : Text;c : WideChar); comp
 
 {$ifdef HASVARIANT}
 Procedure fpc_Write_Text_Variant(Len : Longint;var f : Text;const v : variant); compilerproc;
+function fpc_variant_to_dynarray(const v : variant;typeinfo : pointer) : pointer;compilerproc;
 {$endif HASVARIANT}
 
 Procedure fpc_Read_End(var f:Text); compilerproc;
@@ -215,13 +216,13 @@ Function fpc_Catches(Objtype : TClass) : TObject; compilerproc;
 {$ifndef i386}
 Procedure fpc_DestroyException(o : TObject); compilerproc;
 procedure fpc_help_constructor; compilerproc;
-procedure fpc_help_fail(var _self:pointer;var vmt:pointer;vmt_pos:cardinal);safecall;compilerproc;
-procedure fpc_help_destructor(var _self : pointer; vmt : pointer; vmt_pos : cardinal);saveregisters;compilerproc;
-function fpc_new_class(_vmt:pointer;_self:pointer):pointer;saveregisters;compilerproc;
-procedure fpc_dispose_class(_self: tobject; flag : longint);saveregisters;compilerproc;
-function fpc_help_fail_class(_vmt:pointer;_self:pointer):pointer;saveregisters;compilerproc;
+procedure fpc_help_fail(var _self:pointer;var vmt:pointer;vmt_pos:cardinal);compilerproc;
+procedure fpc_help_destructor(var _self : pointer; vmt : pointer; vmt_pos : cardinal);compilerproc;
+function fpc_new_class(_vmt:pointer;_self:pointer):pointer;compilerproc;
+procedure fpc_dispose_class(_self: tobject; flag : longint);compilerproc;
+function fpc_help_fail_class(_vmt:pointer;_self:pointer):pointer;compilerproc;
 procedure fpc_check_object(obj:pointer); compilerproc;
-procedure fpc_check_object_ext(vmt,expvmt:pointer);saveregisters;compilerproc;
+procedure fpc_check_object_ext(vmt,expvmt:pointer);compilerproc;
 {$endif i386}
 Procedure fpc_Initialize (Data,TypeInfo : pointer); compilerproc;
 Procedure fpc_finalize (Data,TypeInfo: Pointer); compilerproc;
@@ -285,7 +286,10 @@ function fpc_qword_to_double(q: qword): double; compilerproc;
 
 {
   $Log$
-  Revision 1.33  2003-01-06 23:04:21  mazen
+  Revision 1.34  2003-01-09 20:14:20  florian
+    * fixed helper declarations
+
+  Revision 1.33  2003/01/06 23:04:21  mazen
   * functions headers modified in generic.inc to make it possible compiling sparc
     RTL based on generic code
 
@@ -354,4 +358,4 @@ function fpc_qword_to_double(q: qword): double; compilerproc;
   Revision 1.13  2002/01/21 20:16:08  peter
     * updated for dynarr:=nil
 
-}
+}

+ 11 - 8
rtl/inc/generic.inc

@@ -366,7 +366,7 @@ end;
 
 {$ifndef FPC_SYSTEM_HAS_FPC_HELP_DESTRUCTOR}
 
-procedure fpc_help_destructor(var _self : pointer; vmt : pointer; vmt_pos : cardinal);saveregisters;[public,alias:'FPC_HELP_DESTRUCTOR'];  {$ifdef hascompilerproc} compilerproc; {$endif}
+procedure fpc_help_destructor(var _self : pointer; vmt : pointer; vmt_pos : cardinal);[public,alias:'fpc_help_destructor'];  {$ifdef hascompilerproc} compilerproc; {$endif}
    type
      ppointer = ^pointer;
      pvmt = ^tvmt;
@@ -394,7 +394,7 @@ end;
 {$endif FPC_SYSTEM_HAS_FPC_HELP_DESTRUCTOR}
 
 {$ifndef FPC_SYSTEM_HAS_FPC_HELP_FAIL}
-procedure fpc_help_fail(var _self:pointer;var vmt:pointer;vmt_pos:cardinal);safecall;[public,alias:'FPC_HELP_FAIL'];compilerproc;
+procedure fpc_help_fail(var _self:pointer;var vmt:pointer;vmt_pos:cardinal);[public,alias:'FPC_HELP_FAIL'];compilerproc;
    type
      ppointer = ^pointer;
      pvmt = ^tvmt;
@@ -431,7 +431,7 @@ end;
 { RETURNS SELF                                                 }
 { IMPORTANT: SELF REGISTER should be pre-loaded before call to }
 { constructor for this to work!                                }
-function fpc_new_class(_vmt:pointer;_self:pointer):pointer;saveregisters;[public,alias:'FPC_NEW_CLASS']; {$ifdef hascompilerproc} compilerproc; {$endif}
+function fpc_new_class(_vmt:pointer;_self:pointer):pointer;[public,alias:'FPC_NEW_CLASS']; {$ifdef hascompilerproc} compilerproc; {$endif}
  begin
    if _vmt <> nil then
      begin
@@ -447,7 +447,7 @@ function fpc_new_class(_vmt:pointer;_self:pointer):pointer;saveregisters;[public
 {$endif FPC_SYSTEM_HAS_FPC_NEW_CLASS}
 
 {$ifndef FPC_SYSTEM_HAS_FPC_DISPOSE_CLASS}
-procedure fpc_dispose_class(_self: tobject; flag : longint);saveregisters;[public,alias:'FPC_DISPOSE_CLASS'];compilerproc;
+procedure fpc_dispose_class(_self: tobject; flag : longint);[public,alias:'FPC_DISPOSE_CLASS'];compilerproc;
  begin
    if (_self <> nil) and (flag = 1) then
       _self.FreeInstance;
@@ -456,7 +456,7 @@ procedure fpc_dispose_class(_self: tobject; flag : longint);saveregisters;[publi
 
 {$ifndef FPC_SYSTEM_HAS_FPC_CHECK_OBJECT}
 
-procedure fpc_check_object(obj : pointer);saveregisters;[public,alias:'FPC_CHECK_OBJECT'];  {$ifdef hascompilerproc} compilerproc; {$endif}
+procedure fpc_check_object(obj : pointer);[public,alias:'FPC_CHECK_OBJECT'];  {$ifdef hascompilerproc} compilerproc; {$endif}
    type
      pvmt = ^tvmt;
      tvmt = packed record
@@ -478,7 +478,7 @@ end;
 
 {$ifndef FPC_SYSTEM_HAS_FPC_CHECK_OBJECT_EXT}
 
-procedure fpc_check_object_ext(vmt, expvmt : pointer);saveregisters;[public,alias:'FPC_CHECK_OBJECT_EXT']; {$ifdef hascompilerproc} compilerproc; {$endif}
+procedure fpc_check_object_ext(vmt, expvmt : pointer);[public,alias:'FPC_CHECK_OBJECT_EXT']; {$ifdef hascompilerproc} compilerproc; {$endif}
    type
      pvmt = ^tvmt;
      tvmt = packed record
@@ -965,7 +965,10 @@ end;
 
 {
   $Log$
-  Revision 1.47  2003-01-07 22:04:12  mazen
+  Revision 1.48  2003-01-09 20:14:20  florian
+    * fixed helper declarations
+
+  Revision 1.47  2003/01/07 22:04:12  mazen
   - space removed
 
   Revision 1.46  2003/01/06 23:04:21  mazen
@@ -1062,4 +1065,4 @@ end;
       instead of direct comparisons of low/high values of orddefs because
       qword is a special case
 
-}
+}

+ 10 - 7
rtl/powerpc/powerpc.inc

@@ -620,7 +620,7 @@ asm
 end;
 
 {$define FPC_SYSTEM_HAS_FPC_HELP_FAIL}
-procedure fpc_help_fail;assembler;[public,alias:'FPC_HELP_FAIL']; compilerproc;
+procedure fpc_help_fail(var _self:pointer;var vmt:pointer;vmt_pos:cardinal);assembler;[public,alias:'FPC_HELP_FAIL']; compilerproc;
 assembler;
 asm
 {$warning FIX ME!}
@@ -632,12 +632,12 @@ end;
 { use generic implementation for now }
 { that's a problem currently, the generic has a another prototyp than this defined in compproc.inc (FK) }
 
-procedure fpc_help_destructor;assembler; compilerproc;
+procedure fpc_help_destructor(var _self : pointer; vmt : pointer; vmt_pos : cardinal);assembler; compilerproc;
 asm
 end;
 
 {$define FPC_SYSTEM_HAS_FPC_NEW_CLASS}
-procedure fpc_new_class;assembler;[public,alias:'FPC_NEW_CLASS']; compilerproc;
+function fpc_new_class(_vmt:pointer;_self:pointer):pointer;assembler;[public,alias:'FPC_NEW_CLASS']; compilerproc;
 assembler;
 asm
 {$warning FIX ME!}
@@ -646,7 +646,7 @@ end;
 
 
 {$define FPC_SYSTEM_HAS_FPC_DISPOSE_CLASS}
-procedure fpc_dispose_class;assembler;[public,alias:'FPC_DISPOSE_CLASS']; compilerproc;
+procedure fpc_dispose_class(_self: tobject; flag : longint);assembler;[public,alias:'FPC_DISPOSE_CLASS']; compilerproc;
 assembler;
 asm
 {$warning FIX ME!}
@@ -654,7 +654,7 @@ asm
 end;
 
 {$define FPC_SYSTEM_HAS_FPC_HELP_FAIL_CLASS}
-procedure fpc_help_fail_class;assembler;[public,alias:'FPC_HELP_FAIL_CLASS']; {$ifdef hascompilerproc} compilerproc; {$endif}
+function fpc_help_fail_class(_vmt:pointer;_self:pointer):pointer;assembler;[public,alias:'FPC_HELP_FAIL_CLASS']; {$ifdef hascompilerproc} compilerproc; {$endif}
 { a non zero class must allways be disposed
   VMT is allways at pos 0 }
 assembler;
@@ -677,7 +677,7 @@ end;
 { use generic implementation for now }
 { that's a problem currently, the generic has a another prototy than this defined in compproc.inc (FK) }
 {$define FPC_SYSTEM_HAS_FPC_CHECK_OBJECT_EXT}
-procedure fpc_check_object_ext; compilerproc;assembler;
+procedure fpc_check_object_ext(vmt,expvmt:pointer); compilerproc;assembler;
 asm
 {$warning FIX ME!}
 // !!!!!!!!!!!
@@ -948,7 +948,10 @@ end ['R3','R10'];
 
 {
   $Log$
-  Revision 1.28  2003-01-09 13:38:56  florian
+  Revision 1.29  2003-01-09 20:14:35  florian
+    * fixed helper declarations
+
+  Revision 1.28  2003/01/09 13:38:56  florian
     * dec/inclocked got defines
 
   Revision 1.27  2002/11/07 15:23:13  jonas