* moved call to "cleanup_regvars" to cga.pas for i386 because it has

    to insert "fstp %st0" instructions after the exit label

compiler/i386/cga.pas

@@ -2518,7 +2518,7 @@ implementation
   begin
       oldexprasmlist:=exprasmlist;
       exprasmlist:=alist;
-
+      
       if aktexit2label.is_used and
          ((procinfo^.flags and (pi_needs_implicit_finally or pi_uses_exceptions)) <> 0) then
         begin
@@ -2530,6 +2530,8 @@ implementation
       if aktexitlabel.is_used then
         exprasmList.concat(Tai_label.Create(aktexitlabel));
 
+      cleanup_regvars(alist);
+
       { call the destructor help procedure }
       if (aktprocdef.proctypeoption=potype_destructor) and
          assigned(procinfo^._class) then
@@ -2974,7 +2976,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.9  2001-11-02 22:58:09  peter
+  Revision 1.10  2001-11-06 16:39:02  jonas
+    * moved call to "cleanup_regvars" to cga.pas for i386 because it has
+      to insert "fstp %st0" instructions after the exit label
+
+  Revision 1.9  2001/11/02 22:58:09  peter
     * procsym definition rewrite
 
   Revision 1.8  2001/10/25 21:22:41  peter

compiler/pass_2.pas

@@ -288,8 +288,13 @@ implementation
               { process register variable stuff (JM) }
               assign_regvars(p);
               load_regvars(procinfo^.aktentrycode,p);
-              cleanup_regvars(procinfo^.aktexitcode);
 
+              { for the i386 it must be done in genexitcode because it has  }
+              { to add 'fstp' instructions when using fpu regvars and those }
+              { must come after the "exitlabel" (JM)                        }
+{$ifndef i386}
+              cleanup_regvars(procinfo^.aktexitcode);
+{$endif i386}
               if assigned(aktprocsym) and
                  (aktprocdef.proccalloption=pocall_inline) then
                 make_const_global:=true;
@@ -306,7 +311,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.20  2001-11-02 22:58:02  peter
+  Revision 1.21  2001-11-06 16:39:02  jonas
+    * moved call to "cleanup_regvars" to cga.pas for i386 because it has
+      to insert "fstp %st0" instructions after the exit label
+
+  Revision 1.20  2001/11/02 22:58:02  peter
     * procsym definition rewrite
 
   Revision 1.19  2001/10/25 21:22:35  peter