Browse Source

* remove temporary stdcall hack

peter 22 years ago
parent
commit
a1cb920b51
2 changed files with 9 additions and 10 deletions
  1. 5 3
      compiler/ncgutil.pas
  2. 4 7
      compiler/pstatmnt.pas

+ 5 - 3
compiler/ncgutil.pas

@@ -289,8 +289,7 @@ implementation
         cg.a_call_name(list,'FPC_PUSHEXCEPTADDR');
         cg.deallocexplicitregisters(list,R_INTREGISTER,paramanager.get_volatile_registers_int(pocall_default));
 
-{$warning stdcall forced for SETJMP}
-        paraloc1:=paramanager.getintparaloc(pocall_stdcall,1);
+        paraloc1:=paramanager.getintparaloc(pocall_default,1);
         paramanager.allocparaloc(list,paraloc1);
         cg.a_param_reg(list,OS_ADDR,NR_FUNCTION_RESULT_REG,paraloc1);
         paramanager.freeparaloc(list,paraloc1);
@@ -1965,7 +1964,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.166  2003-11-10 22:02:52  peter
+  Revision 1.167  2003-11-11 21:10:12  peter
+    * remove temporary stdcall hack
+
+  Revision 1.166  2003/11/10 22:02:52  peter
     * cross unit inlining fixed
 
   Revision 1.165  2003/11/07 15:58:32  florian

+ 4 - 7
compiler/pstatmnt.pas

@@ -1068,12 +1068,6 @@ implementation
          if not is_void(current_procinfo.procdef.rettype.def) then
            symtablestack.rename(current_procinfo.procdef.resultname,'$hiddenresult');
 
-         { assembler routines use stdcall instead of register }
-{$warning Temporary hack for force stdcall for assembler}
-         if (po_assembler in current_procinfo.procdef.procoptions) and
-            (current_procinfo.procdef.proccalloption=pocall_register) then
-           current_procinfo.procdef.proccalloption:=pocall_stdcall;
-
          { delphi uses register calling for assembler methods }
          if (m_delphi in aktmodeswitches) and
             (po_assembler in current_procinfo.procdef.procoptions) and
@@ -1130,7 +1124,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.120  2003-11-10 22:02:52  peter
+  Revision 1.121  2003-11-11 21:10:12  peter
+    * remove temporary stdcall hack
+
+  Revision 1.120  2003/11/10 22:02:52  peter
     * cross unit inlining fixed
 
   Revision 1.119  2003/10/29 20:34:20  peter