From 70028e433d7d7adb0863b9421de56f6f4c01ce0a Mon Sep 17 00:00:00 2001
From: peter <peter@freepascal.org>
Date: Tue, 20 Aug 2002 16:54:40 +0000
Subject: [PATCH]   * write address of varsym always

---
 compiler/symsym.pas       | 32 +++++++++++++++-----------------
 compiler/utils/ppudump.pp |  8 +++++---
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/compiler/symsym.pas b/compiler/symsym.pas
index 88b1a21a16..20c6b391f5 100644
--- a/compiler/symsym.pas
+++ b/compiler/symsym.pas
@@ -137,7 +137,7 @@ interface
           function search_procdef_bypara(params:Tparalinkedlist):Tprocdef;
           function search_procdef_byprocvardef(d:Tprocvardef):Tprocdef;
           function search_procdef_byretdef_by1paradef(retdef,firstpara:Tdef;
-		                                              matchtype:Tdefmatch):Tprocdef;
+                                                              matchtype:Tdefmatch):Tprocdef;
           function  write_references(ppufile:tcompilerppufile;locals:boolean):boolean;override;
 {$ifdef GDB}
           function stabstring : pchar;override;
@@ -897,7 +897,7 @@ implementation
     function Tprocsym.procdef(nr:byte):Tprocdef;
 
     var i:byte;
-	    pd:Pprocdeflist;
+            pd:Pprocdeflist;
 
     begin
         pd:=defs;
@@ -919,11 +919,11 @@ implementation
                 pd:=pd^.next;
             end;
     end;
-    
+
     procedure Tprocsym.concat_procdefs_to(s:Tprocsym);
-    
+
     var pd:Pprocdeflist;
-    
+
     begin
         pd:=defs;
         while assigned(defs) do
@@ -966,9 +966,9 @@ implementation
     end;
 
     function Tprocsym.search_procdef_bytype(pt:Tproctypeoption):Tprocdef;
-    
+
     var p:Pprocdeflist;
-    
+
     begin
         search_procdef_bytype:=nil;
         p:=defs;
@@ -1000,7 +1000,7 @@ implementation
                 pd:=pd^.next;
             end;
     end;
-    
+
     function Tprocsym.search_procdef_byprocvardef(d:Tprocvardef):Tprocdef;
 
     var pd:Pprocdeflist;
@@ -1433,8 +1433,7 @@ implementation
          { Note: This needs to write everything of tvarsym.write }
          inherited writesym(ppufile);
          ppufile.putbyte(byte(varspez));
-         if read_member then
-           ppufile.putlongint(address);
+         ppufile.putlongint(address);
          { write only definition or definitionsym }
          ppufile.puttype(vartype);
          hvo:=varoptions-[vo_regable];
@@ -1566,10 +1565,7 @@ implementation
          refs := 0;
          varstate:=vs_used;
          varspez:=tvarspez(ppufile.getbyte);
-         if read_member then
-           address:=ppufile.getlongint
-         else
-           address:=0;
+         address:=ppufile.getlongint;
          localvarsym:=nil;
          ppufile.gettype(vartype);
          ppufile.getsmallset(varoptions);
@@ -1596,8 +1592,7 @@ implementation
       begin
          inherited writesym(ppufile);
          ppufile.putbyte(byte(varspez));
-         if read_member then
-          ppufile.putlongint(address);
+         ppufile.putlongint(address);
          ppufile.puttype(vartype);
          { symbols which are load are never candidates for a register,
            turn off the regable }
@@ -2686,7 +2681,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.54  2002-08-20 10:31:26  daniel
+  Revision 1.55  2002-08-20 16:54:40  peter
+    * write address of varsym always
+
+  Revision 1.54  2002/08/20 10:31:26  daniel
    * Tcallnode.det_resulttype rewritten
 
   Revision 1.53  2002/08/18 20:06:27  peter
diff --git a/compiler/utils/ppudump.pp b/compiler/utils/ppudump.pp
index 8af9f1bd48..e37144b382 100644
--- a/compiler/utils/ppudump.pp
+++ b/compiler/utils/ppudump.pp
@@ -899,8 +899,7 @@ begin
            begin
              readcommonsym('Variable symbol ');
              writeln(space,'        Type: ',getbyte);
-             if read_member then
-               writeln(space,'     Address: ',getlongint);
+             writeln(space,'     Address: ',getlongint);
              write  (space,'    Var Type: ');
              readtype;
              i:=getlongint;
@@ -1828,7 +1827,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.28  2002-08-19 19:36:44  peter
+  Revision 1.29  2002-08-20 16:54:40  peter
+    * write address of varsym always
+
+  Revision 1.28  2002/08/19 19:36:44  peter
     * More fixes for cross unit inlining, all tnodes are now implemented
     * Moved pocall_internconst to po_internconst because it is not a
       calling type at all and it conflicted when inlining of these small