* fixed FieldAddress for 64 bit and CPUs requiring proper alignment

compiler/symdef.pas

@@ -5794,9 +5794,9 @@ implementation
           (tsym(sym).typ=fieldvarsym) then
           begin
 {$ifdef cpurequiresproperalignment}
-             rttilist.concat(Tai_align.Create(sizeof(TConstPtrUInt)));
+             rttilist.concat(Tai_align.Create(sizeof(AInt)));
 {$endif cpurequiresproperalignment}
-             rttiList.concat(Tai_const.Create_32bit(tfieldvarsym(sym).fieldoffset));
+             rttiList.concat(Tai_const.Create_aint(tfieldvarsym(sym).fieldoffset));
              hp:=searchclasstablelist(tobjectdef(tfieldvarsym(sym).vartype.def));
              if not(assigned(hp)) then
                internalerror(0206002);
@@ -6394,7 +6394,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.299  2005-03-07 17:58:27  peter
+  Revision 1.300  2005-03-13 08:35:09  florian
+    * fixed FieldAddress for 64 bit and CPUs requiring proper alignment
+
+  Revision 1.299  2005/03/07 17:58:27  peter
     * fix protected checking
 
   Revision 1.298  2005/02/26 15:43:09  florian

rtl/inc/objpas.inc

@@ -303,17 +303,27 @@
       function TObject.FieldAddress(const name : shortstring) : pointer;
         type
            PFieldInfo = ^TFieldInfo;
-           TFieldInfo = packed record
-             FieldOffset: LongWord;
+           TFieldInfo =
+{$ifndef FPC_REQUIRES_PROPER_ALIGNMENT}
+           packed
+{$endif FPC_REQUIRES_PROPER_ALIGNMENT}
+           record
+             FieldOffset: PtrUInt;
              ClassTypeIndex: Word;
              Name: ShortString;
            end;
 
            PFieldTable = ^TFieldTable;
-           TFieldTable = packed record
+           TFieldTable =
+{$ifndef FPC_REQUIRES_PROPER_ALIGNMENT}
+           packed
+{$endif FPC_REQUIRES_PROPER_ALIGNMENT}
+           record
              FieldCount: Word;
              ClassTable: Pointer;
-             { Fields: array[Word] of TFieldInfo;  Elements have variant size! }
+             { should be array[Word] of TFieldInfo;  but
+               Elements have variant size! force at least proper alignment }
+             Fields: array[0..0] of TFieldInfo
            end;
 
         var
@@ -333,7 +343,7 @@
                FieldTable := PFieldTable((Pointer(CurClassType) + vmtFieldTable)^);
                if FieldTable <> nil then
                begin
-                 FieldInfo := PFieldInfo(Pointer(FieldTable) + 6);
+                 FieldInfo := @FieldTable^.Fields;
                  for i := 0 to FieldTable^.FieldCount - 1 do
                  begin
                    if UpCase(FieldInfo^.Name) = UName then
@@ -341,7 +351,11 @@
                      fieldaddress := Pointer(Self) + FieldInfo^.FieldOffset;
                      exit;
                    end;
-                   Inc(Pointer(FieldInfo), 7 + Length(FieldInfo^.Name));
+                   FieldInfo := @FieldInfo^.Name + 1 + Length(FieldInfo^.Name);
+{$ifdef FPC_REQUIRES_PROPER_ALIGNMENT}
+                   { align to largest field of TFieldInfo }
+                   FieldInfo := Align(FieldInfo, SizeOf(PtrUInt));
+{$endif FPC_REQUIRES_PROPER_ALIGNMENT}
                  end;
                end;
                { Try again with the parent class type }
@@ -747,7 +761,13 @@
 
 {
   $Log$
-  Revision 1.46  2005-02-14 17:13:26  peter
+  Revision 1.47  2005-03-13 08:34:58  florian
+    * fixed FieldAddress for 64 bit and CPUs requiring proper alignment
+
+  Revision 1.46  2005/02/14 17:13:26  peter
     * truncate log
 
 }
+
+
+