From 60e0494a74e72f6a7b5915d80f4953ba684460b5 Mon Sep 17 00:00:00 2001
From: florian <florian@freepascal.org>
Date: Sun, 14 Nov 2004 16:26:29 +0000
Subject: [PATCH]   * fixed morphos syscall

---
 compiler/fpcdefs.inc         |  6 ++++-
 compiler/pdecsub.pas         | 48 ++++++++++++++++++++----------------
 compiler/powerpc/cpupara.pas | 13 ++++++++--
 3 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/compiler/fpcdefs.inc b/compiler/fpcdefs.inc
index 14995b83c8..5da7282bb1 100644
--- a/compiler/fpcdefs.inc
+++ b/compiler/fpcdefs.inc
@@ -72,6 +72,7 @@
 
 {$ifdef powerpc}
   {$define cpuflags}
+  {$define cputargethasfixedstack}
   {$define noopt}
   {define oldregvars}
 {$endif powerpc}
@@ -90,7 +91,10 @@
 
 {
   $Log$
-  Revision 1.46  2004-10-31 18:54:24  peter
+  Revision 1.47  2004-11-14 16:26:29  florian
+    * fixed morphos syscall
+
+  Revision 1.46  2004/10/31 18:54:24  peter
     * $fpctarget expands to <cpu>-<os>
     * allow * in middle of the path to support ../*/units/$fpctarget
 
diff --git a/compiler/pdecsub.pas b/compiler/pdecsub.pas
index 48ad05d6ff..dee638f6bc 100644
--- a/compiler/pdecsub.pas
+++ b/compiler/pdecsub.pas
@@ -1170,13 +1170,13 @@ begin
     internalerror(2003042614);
   tprocdef(pd).forwarddef:=false;
 {$ifdef powerpc}
-  if target_info.system in [system_powerpc_morphos,system_m68k_amiga] then
+   if target_info.system in [system_powerpc_morphos,system_m68k_amiga] then
     begin
       pd.has_paraloc_info:=true;
       include(pd.procoptions,po_explicitparaloc);
       if consume_sym(sym,symtable) then
         begin
-          if (sym.typ in [localvarsym,paravarsym]) and
+          if (sym.typ in [localvarsym,paravarsym,globalvarsym]) and
             ((tabstractvarsym(sym).vartype.def.deftype=pointerdef) or
               is_32bitint(tabstractvarsym(sym).vartype.def)
             ) then
@@ -1888,24 +1888,27 @@ const
         { insert parentfp parameter if required }
         insert_parentfp_para(pd);
 
-        currpara:=tparaitem(pd.para.first);
-        while assigned(currpara) do
-         begin
-           if not(assigned(currpara.parasym) and (currpara.parasym.typ=paravarsym)) then
-             internalerror(200304232);
-           { connect parasym to paraitem }
-           tparavarsym(currpara.parasym).paraitem:=currpara;
-           { We need a local copy for a value parameter when only the
-             address is pushed. Open arrays and Array of Const are
-             an exception because they are allocated at runtime and the
-             address that is pushed is patched }
-           if (currpara.paratyp=vs_value) and
-              paramanager.push_addr_param(currpara.paratyp,currpara.paratype.def,pd.proccalloption) and
-              not(is_open_array(currpara.paratype.def) or
-                  is_array_of_const(currpara.paratype.def)) then
-             include(tparavarsym(currpara.parasym).varoptions,vo_has_local_copy);
-           currpara:=tparaitem(currpara.next);
-         end;
+        if not(po_explicitparaloc in pd.procoptions) then
+          begin
+            currpara:=tparaitem(pd.para.first);
+            while assigned(currpara) do
+             begin
+               if not(assigned(currpara.parasym) and (currpara.parasym.typ=paravarsym)) then
+                 internalerror(200304232);
+               { connect parasym to paraitem }
+               tparavarsym(currpara.parasym).paraitem:=currpara;
+               { We need a local copy for a value parameter when only the
+                 address is pushed. Open arrays and Array of Const are
+                 an exception because they are allocated at runtime and the
+                 address that is pushed is patched }
+               if (currpara.paratyp=vs_value) and
+                  paramanager.push_addr_param(currpara.paratyp,currpara.paratype.def,pd.proccalloption) and
+                  not(is_open_array(currpara.paratype.def) or
+                      is_array_of_const(currpara.paratype.def)) then
+                 include(tparavarsym(currpara.parasym).varoptions,vo_has_local_copy);
+               currpara:=tparaitem(currpara.next);
+             end;
+          end;
       end;
 
 
@@ -2266,7 +2269,10 @@ const
 end.
 {
   $Log$
-  Revision 1.203  2004-11-11 19:31:33  peter
+  Revision 1.204  2004-11-14 16:26:29  florian
+    * fixed morphos syscall
+
+  Revision 1.203  2004/11/11 19:31:33  peter
     * fixed compile of powerpc,sparc,arm
 
   Revision 1.202  2004/11/09 22:32:59  peter
diff --git a/compiler/powerpc/cpupara.pas b/compiler/powerpc/cpupara.pas
index 9812be7b22..0bafd9f010 100644
--- a/compiler/powerpc/cpupara.pas
+++ b/compiler/powerpc/cpupara.pas
@@ -324,6 +324,11 @@ unit cpupara;
         end;
 
       begin
+{$ifdef extdebug}
+         if po_explicitparaloc in p.procoptions then
+           internalerror(200411141);
+{$endif extdebug}
+
          result:=0;
          nextintreg := curintreg;
          nextfloatreg := curfloatreg;
@@ -524,10 +529,11 @@ unit cpupara;
           system_powerpc_morphos:
             begin
               p.paraloc[callerside].alignment:=4;
+              p.paraloc[callerside].size:=def_cgsize(p.paratype.def);
               paraloc:=p.paraloc[callerside].add_location;
               paraloc^.loc:=LOC_REFERENCE;
               paraloc^.size:=def_cgsize(p.paratype.def);
-              paraloc^.reference.index:=NR_R2;
+              paraloc^.reference.index:=newreg(R_INTREGISTER,RS_R2,R_SUBWHOLE);
               { pattern is always uppercase'd }
               if s='D0' then
                 paraloc^.reference.offset:=0
@@ -583,7 +589,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.69  2004-09-25 20:28:20  florian
+  Revision 1.70  2004-11-14 16:26:29  florian
+    * fixed morphos syscall
+
+  Revision 1.69  2004/09/25 20:28:20  florian
     * indention fixed
 
   Revision 1.68  2004/09/21 17:25:13  peter