* merged asm result patch part 2

compiler/i386/ra386.pas

@@ -63,7 +63,7 @@ uses
 {$else}
   hcodegen,
 {$endif}
-  globtype,systems,types,globals,verbose,cpuasm;
+  globtype,symconst,symdef,symtable,systems,types,globals,verbose,cpuasm;
 
 
 {*****************************************************************************
@@ -185,16 +185,38 @@ Begin
    begin
      opr.typ:=OPR_REGISTER;
      if is_fpu(procinfo^.returntype.def) then
-       opr.reg:=R_ST0
+       begin
+         opr.reg:=R_ST0;
+         case pfloatdef(procinfo^.returntype.def)^.typ of
+           s32real : size:=S_FS;
+           s64real : size:=S_FL;
+           s80real : size:=S_FX;
+           s64comp : size:=S_IQ;
+         else
+           begin
+             Message(asmr_e_cannot_use_RESULT_here);
+             res:=false;
+           end;
+         end;
+       end
      else if ret_in_acc(procinfo^.returntype.def) then
        case procinfo^.returntype.def^.size of
-       1 : opr.reg:=R_AL;
-       2 : opr.reg:=R_AX;
-       3,4 : opr.reg:=R_EAX;
+       1 : begin
+             opr.reg:=R_AL;
+             size:=S_B;
+           end;
+       2 : begin
+             opr.reg:=R_AX;
+             size:=S_W;
+           end;
+       3,4 : begin
+               opr.reg:=R_EAX;
+               size:=S_L;
+             end;
        else
          begin
            Message(asmr_e_cannot_use_RESULT_here);
-           exit;
+           res:=false;
          end;
        end;
      Message1(asmr_h_RESULT_is_reg,reg2str(opr.reg));
@@ -492,7 +514,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.1  2000-10-15 09:47:43  peter
+  Revision 1.2  2000-10-31 22:30:14  peter
+    * merged asm result patch part 2
+
+  Revision 1.1  2000/10/15 09:47:43  peter
     * moved to i386/
 
   Revision 1.7  2000/10/08 10:26:33  peter

compiler/rautils.pas

@@ -28,7 +28,7 @@ Interface
 
 Uses
   cutils,cobjects,
-  globtype,aasm,cpubase,symconst;
+  globtype,aasm,cpubase,symconst,symdef;
 
 Const
   RPNMax = 10;             { I think you only need 4, but just to be safe }
@@ -212,7 +212,7 @@ uses
   strings,
 {$endif}
   types,systems,verbose,globals,fmodule,
-  symbase,symtype,symdef,symsym,symtable,cpuasm
+  symbase,symtype,symsym,symtable,cpuasm
 {$ifdef NEWCG}
   ,cgbase;
 {$else}
@@ -734,8 +734,8 @@ Begin
   if assigned(procinfo^.returntype.def) and
      (procinfo^.returntype.def<>pdef(voiddef)) then
    begin
-     if (m_tp in aktmodeswitches) or
-        (m_delphi in aktmodeswitches) then
+     if (procinfo^.return_offset=0) and ((m_tp in aktmodeswitches) or
+        (m_delphi in aktmodeswitches)) then
        begin
          Message(asmr_e_cannot_use_RESULT_here);
          exit;
@@ -1548,7 +1548,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.8  2000-10-31 22:02:51  peter
+  Revision 1.9  2000-10-31 22:30:13  peter
+    * merged asm result patch part 2
+
+  Revision 1.8  2000/10/31 22:02:51  peter
     * symtable splitted, no real code changes
 
   Revision 1.7  2000/10/08 10:26:33  peter

compiler/tgeni386.pas

@@ -515,7 +515,6 @@ implementation
       begin
          if usablereg32=0 then
            internalerror(10);
-         dec(usablereg32);
 {$ifdef TEMPREGDEBUG}
          if curptree^^.usableregs-usablereg32>curptree^^.registers32 then
            internalerror(10);
@@ -524,6 +523,7 @@ implementation
          if curptree^^.usableregs-usablereg32>curptree^^.reallyusedregs then
            curptree^^.reallyusedregs:=curptree^^.usableregs-usablereg32;
 {$endif EXTTEMPREGDEBUG}
+         dec(usablereg32);
          if R_EAX in unused then
            begin
               unused:=unused-[R_EAX];
@@ -653,7 +653,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.8  2000-10-14 10:14:56  peter
+  Revision 1.9  2000-10-31 22:30:13  peter
+    * merged asm result patch part 2
+
+  Revision 1.8  2000/10/14 10:14:56  peter
     * moehrendorf oct 2000 rewrite
 
   Revision 1.7  2000/09/30 16:08:46  peter

compiler/types.pas

@@ -458,7 +458,9 @@ implementation
     { returns true, if def uses FPU }
     function is_fpu(def : pdef) : boolean;
       begin
-         is_fpu:=(def^.deftype=floatdef) and (pfloatdef(def)^.typ<>f32bit);
+         is_fpu:=(def^.deftype=floatdef) and
+                 (pfloatdef(def)^.typ<>f32bit) and
+                 (pfloatdef(def)^.typ<>f16bit);
       end;
 
 
@@ -1684,7 +1686,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.16  2000-10-31 22:02:55  peter
+  Revision 1.17  2000-10-31 22:30:13  peter
+    * merged asm result patch part 2
+
+  Revision 1.16  2000/10/31 22:02:55  peter
     * symtable splitted, no real code changes
 
   Revision 1.15  2000/10/21 18:16:12  florian