From 2e99c5918213733c345ff17aa78b1080654e5f34 Mon Sep 17 00:00:00 2001
From: peter <peter@freepascal.org>
Date: Sat, 14 Aug 1999 00:36:05 +0000
Subject: [PATCH]   * array constructor support

---
 compiler/cg386mem.pas |  7 +++++--
 compiler/cgai386.pas  | 30 +++++++++++++++++++++---------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/compiler/cg386mem.pas b/compiler/cg386mem.pas
index 8e50be1b9f..6556164c06 100644
--- a/compiler/cg386mem.pas
+++ b/compiler/cg386mem.pas
@@ -632,7 +632,7 @@ implementation
                         hightree:=genloadnode(pvarsym(srsym),p^.left^.symtable);
                         firstpass(hightree);
                         secondpass(hightree);
-                        emit_mov_loc_ref(hightree^.location,href);
+                        emit_mov_loc_ref(hightree^.location,href,S_L);
                         disposetree(hightree);
                       end;
                      emitrangecheck(p^.right,p^.left^.resulttype);
@@ -849,7 +849,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.49  1999-08-04 00:22:53  florian
+  Revision 1.50  1999-08-14 00:36:05  peter
+    * array constructor support
+
+  Revision 1.49  1999/08/04 00:22:53  florian
     * renamed i386asm and i386base to cpuasm and cpubase
 
   Revision 1.48  1999/08/03 22:02:47  peter
diff --git a/compiler/cgai386.pas b/compiler/cgai386.pas
index 8400313782..b1d0f4ae9a 100644
--- a/compiler/cgai386.pas
+++ b/compiler/cgai386.pas
@@ -44,7 +44,7 @@ unit cgai386;
     procedure emit_flag2reg(flag:tresflags;hregister:tregister);
     procedure emit_reg_reg(i : tasmop;s : topsize;reg1,reg2 : tregister);
     procedure emitcall(const routine:string);
-    procedure emit_mov_loc_ref(const t:tlocation;const ref:treference);
+    procedure emit_mov_loc_ref(const t:tlocation;const ref:treference;siz:topsize);
     procedure emit_mov_loc_reg(const t:tlocation;reg:tregister);
     procedure emit_push_loc(const t:tlocation);
 
@@ -310,26 +310,35 @@ procedure mov_reg_to_dest(p : ptree; s : topsize; reg : tregister);
       end;
 
 
-    procedure emit_mov_loc_ref(const t:tlocation;const ref:treference);
+    procedure emit_mov_loc_ref(const t:tlocation;const ref:treference;siz:topsize);
+      var
+        hreg : tregister;
       begin
         case t.loc of
           LOC_REGISTER,
          LOC_CREGISTER : begin
-                           exprasmlist^.concat(new(pai386,op_reg_ref(A_MOV,S_L,
+                           exprasmlist^.concat(new(pai386,op_reg_ref(A_MOV,siz,
                              t.register,newreference(ref))));
                            ungetregister32(t.register); { the register is not needed anymore }
                          end;
                LOC_MEM,
          LOC_REFERENCE : begin
                            if t.reference.is_immediate then
-                             exprasmlist^.concat(new(pai386,op_const_ref(A_MOV,S_L,
+                             exprasmlist^.concat(new(pai386,op_const_ref(A_MOV,siz,
                                t.reference.offset,newreference(ref))))
                            else
                              begin
-                               exprasmlist^.concat(new(pai386,op_ref_reg(A_MOV,S_L,
-                                 newreference(t.reference),R_EDI)));
-                               exprasmlist^.concat(new(pai386,op_reg_ref(A_MOV,S_L,
-                                 R_EDI,newreference(ref))));
+                               case siz of
+                                 S_B : hreg:=reg32toreg8(getregister32);
+                                 S_W : hreg:=reg32toreg16(getregister32);
+                                 S_L : hreg:=R_EDI;
+                               end;
+                               exprasmlist^.concat(new(pai386,op_ref_reg(A_MOV,siz,
+                                 newreference(t.reference),hreg)));
+                               exprasmlist^.concat(new(pai386,op_reg_ref(A_MOV,siz,
+                                 hreg,newreference(ref))));
+                               if siz<>S_L then
+                                ungetregister(hreg);
                                { we can release the registers }
                                { but only AFTER the MOV! Important for the optimizer!
                                  (JM)}
@@ -3188,7 +3197,10 @@ procedure mov_reg_to_dest(p : ptree; s : topsize; reg : tregister);
 end.
 {
   $Log$
-  Revision 1.28  1999-08-07 14:20:57  florian
+  Revision 1.29  1999-08-14 00:36:07  peter
+    * array constructor support
+
+  Revision 1.28  1999/08/07 14:20:57  florian
     * some small problems fixed
 
   Revision 1.27  1999/08/05 23:45:09  peter