From 22552e468b9312f4c9c78863c74cd4be8ca334ee Mon Sep 17 00:00:00 2001
From: svenbarth <pascaldragon@googlemail.com>
Date: Sun, 4 Nov 2012 16:11:16 +0000
Subject: [PATCH] m68k/cgcpu.pas, tcg68k.g_concatcopy:   * in case of copying
 from the parameter location to the local location we need to use the
 alignment size for the source as byte/word values are passed as LongInts
 (this is how the ABI is specified)

git-svn-id: trunk@22924 -
---
 compiler/m68k/cgcpu.pas | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/compiler/m68k/cgcpu.pas b/compiler/m68k/cgcpu.pas
index d7b2a93ec5..f6b7fc645e 100644
--- a/compiler/m68k/cgcpu.pas
+++ b/compiler/m68k/cgcpu.pas
@@ -1490,7 +1490,8 @@ unit cgcpu;
          hl2: tasmlabel;
          popaddress : boolean;
          srcref,dstref : treference;
-
+         alignsize : tcgsize;
+         orglen : tcgint;
       begin
          popaddress := false;
 
@@ -1504,6 +1505,8 @@ unit cgcpu;
 //         if delsource then
 //            reference_release(list,source);
 
+         orglen:=len;
+
          { from 12 bytes movs is being used }
          if {(not loadref) and} ((len<=8) or (not(cs_opt_size in current_settings.optimizerswitches) and (len<=12))) then
            begin
@@ -1522,7 +1525,14 @@ unit cgcpu;
               { move a word }
               if len>1 then
                 begin
-                   a_load_ref_reg(list,OS_16,OS_16,srcref,hregister);
+                   if (orglen<source.alignment) and
+                       (source.base=NR_FRAME_POINTER_REG) and
+                       (source.offset>0) then
+                     { copy of param to local location }
+                     alignsize:=int_cgsize(source.alignment)
+                   else
+                     alignsize:=OS_16;
+                   a_load_ref_reg(list,alignsize,OS_16,srcref,hregister);
                    a_load_reg_ref(list,OS_16,OS_16,hregister,dstref);
                    inc(srcref.offset,2);
                    inc(dstref.offset,2);
@@ -1531,7 +1541,14 @@ unit cgcpu;
               { move a single byte }
               if len>0 then
                 begin
-                   a_load_ref_reg(list,OS_8,OS_8,srcref,hregister);
+                   if (orglen<source.alignment) and
+                       (source.base=NR_FRAME_POINTER_REG) and
+                       (source.offset>0) then
+                     { copy of param to local location }
+                     alignsize:=int_cgsize(source.alignment)
+                   else
+                     alignsize:=OS_8;
+                   a_load_ref_reg(list,alignsize,OS_8,srcref,hregister);
                    a_load_reg_ref(list,OS_8,OS_8,hregister,dstref);
                 end
            end