From a29eab36c7c6d5c71df8b4ccdca8872124f37eb4 Mon Sep 17 00:00:00 2001
From: peter <peter@freepascal.org>
Date: Sun, 21 Nov 2004 18:13:31 +0000
Subject: [PATCH]   * fixed funcretloc for sparc

---
 compiler/ncgcal.pas        | 10 ++++++----
 compiler/ncgutil.pas       |  8 ++++++--
 compiler/sparc/cpupara.pas |  6 +++++-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/compiler/ncgcal.pas b/compiler/ncgcal.pas
index d529cdc4ba..fd4af09c4d 100644
--- a/compiler/ncgcal.pas
+++ b/compiler/ncgcal.pas
@@ -493,7 +493,6 @@ implementation
         retloc    : tlocation;
         hregister : tregister;
         tempnode  : tnode;
-        resultparaloc : pcgparalocation;
       begin
         cgsize:=procdefinition.funcretloc[callerside].size;
 
@@ -557,8 +556,8 @@ implementation
 {$ifdef x86}
                        tcgx86(cg).inc_fpu_stack;
 {$else x86}
-                       if getsupreg(resultparaloc^.register)<first_fpu_imreg then
-                         cg.ungetcpuregister(exprasmlist,resultparaloc^.register);
+                       if getsupreg(procdefinition.funcretloc[callerside].register)<first_fpu_imreg then
+                         cg.ungetcpuregister(exprasmlist,procdefinition.funcretloc[callerside].register);
                        hregister:=cg.getfpuregister(exprasmlist,location.size);
                        cg.a_loadfpu_reg_reg(exprasmlist,location.size,location.register,hregister);
                        location.register:=hregister;
@@ -1248,7 +1247,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.187  2004-11-21 17:54:59  peter
+  Revision 1.188  2004-11-21 18:13:31  peter
+    * fixed funcretloc for sparc
+
+  Revision 1.187  2004/11/21 17:54:59  peter
     * ttempcreatenode.create_reg merged into .create with parameter
       whether a register is allowed
     * funcret_paraloc renamed to funcretloc
diff --git a/compiler/ncgutil.pas b/compiler/ncgutil.pas
index 2ce0cf2e68..f1f75f1b69 100644
--- a/compiler/ncgutil.pas
+++ b/compiler/ncgutil.pas
@@ -1769,7 +1769,8 @@ implementation
         cg.g_proc_exit(list,parasize,(po_nostackframe in current_procinfo.procdef.procoptions));
 
         { release return registers, needed for optimizer }
-        location_free(list,current_procinfo.procdef.funcretloc[calleeside]);
+        if not is_void(current_procinfo.procdef.rettype.def) then
+          location_free(list,current_procinfo.procdef.funcretloc[calleeside]);
 
         { end of frame marker for call frame info }
         dwarfcfi.end_frame(list);
@@ -2259,7 +2260,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.244  2004-11-21 17:54:59  peter
+  Revision 1.245  2004-11-21 18:13:31  peter
+    * fixed funcretloc for sparc
+
+  Revision 1.244  2004/11/21 17:54:59  peter
     * ttempcreatenode.create_reg merged into .create with parameter
       whether a register is allowed
     * funcret_paraloc renamed to funcretloc
diff --git a/compiler/sparc/cpupara.pas b/compiler/sparc/cpupara.pas
index 37c917fad7..0368d925e2 100644
--- a/compiler/sparc/cpupara.pas
+++ b/compiler/sparc/cpupara.pas
@@ -176,6 +176,7 @@ implementation
 {$ifndef cpu64bit}
             if retcgsize in [OS_64,OS_S64] then
              begin
+               p.funcretloc[side].loc:=LOC_REGISTER;
                { high }
                if (side=callerside)  or (p.proccalloption=pocall_inline)then
                  p.funcretloc[side].register64.reghi:=NR_FUNCTION_RESULT64_HIGH_REG
@@ -316,7 +317,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.49  2004-11-21 17:54:59  peter
+  Revision 1.50  2004-11-21 18:13:31  peter
+    * fixed funcretloc for sparc
+
+  Revision 1.49  2004/11/21 17:54:59  peter
     * ttempcreatenode.create_reg merged into .create with parameter
       whether a register is allowed
     * funcret_paraloc renamed to funcretloc