* fixed regvars support. Needs -doldregvars to activate. Only tested with

    ppc, other processors should however only require maxregvars and
    maxfpuregvars constants in cpubase.pas. Remember to take scratch-
    registers into account when defining that value.

compiler/cgobj.pas

@@ -903,7 +903,10 @@ implementation
                 begin
                   getexplicitregister(list,locpara.register);
                   ungetregister(list,locpara.register);
+{
+                  This is now a normal imaginary register, allocated the usual way (JM)
                   getexplicitregister(list,reg);
+}
                   a_load_reg_reg(list,locpara.size,locpara.size,locpara.register,reg)
                 end
               else
@@ -912,9 +915,13 @@ implementation
           LOC_CFPUREGISTER,
           LOC_FPUREGISTER:
             begin
+
               getexplicitregister(list,locpara.register);
               ungetregister(list,locpara.register);
+{ 
+              This is now a normal imaginary register, allocated the usual way (JM)
               getexplicitregister(list,reg);
+}
               a_loadfpu_reg_reg(list,locpara.size,locpara.register,reg);
             end;
           LOC_MMREGISTER,
@@ -922,14 +929,20 @@ implementation
             begin
               getexplicitregister(list,locpara.register);
               ungetregister(list,locpara.register);
+{ 
+              This is now a normal imaginary register, allocated the usual way (JM)
               getexplicitregister(list,reg);
+}
               a_loadmm_reg_reg(list,locpara.size,locpara.size,locpara.register,reg,shuffle);
             end;
           LOC_REFERENCE,
           LOC_CREFERENCE:
             begin
               reference_reset_base(href,locpara.reference.index,locpara.reference.offset);
+{
+              This is now a normal imaginary register, allocated the usual way (JM)
               getexplicitregister(list,reg);
+}
               a_load_ref_reg(list,locpara.size,locpara.size,href,reg);
             end;
           else
@@ -2138,7 +2151,13 @@ finalization
 end.
 {
   $Log$
-  Revision 1.155  2004-02-04 22:01:13  peter
+  Revision 1.156  2004-02-08 18:08:59  jonas
+    * fixed regvars support. Needs -doldregvars to activate. Only tested with
+      ppc, other processors should however only require maxregvars and
+      maxfpuregvars constants in cpubase.pas. Remember to take scratch-
+      registers into account when defining that value.
+
+  Revision 1.155  2004/02/04 22:01:13  peter
     * first try to get cpupara working for x86_64
 
   Revision 1.154  2004/02/03 22:32:53  peter

compiler/powerpc/cpubase.pas

@@ -106,6 +106,8 @@ uses
       totherregisterset = set of tregisterindex;
 
     const
+      maxvarregs = 32-6; { 32 int registers - r0 - stackpointer - r2 - 3 scratch registers }
+      maxfpuvarregs = 28; { 32 fpuregisters - some scratch registers (minimally 2) }
       { Available Superregisters }
       {$i rppcsup.inc}
 
@@ -629,7 +631,13 @@ implementation
 end.
 {
   $Log$
-  Revision 1.83  2004-01-30 13:42:03  florian
+  Revision 1.84  2004-02-08 18:08:59  jonas
+    * fixed regvars support. Needs -doldregvars to activate. Only tested with
+      ppc, other processors should however only require maxregvars and
+      maxfpuregvars constants in cpubase.pas. Remember to take scratch-
+      registers into account when defining that value.
+
+  Revision 1.83  2004/01/30 13:42:03  florian
     * fixed more alignment issues
 
   Revision 1.82  2004/01/10 00:16:21  jonas

compiler/psub.pas

@@ -664,6 +664,9 @@ implementation
               body is generated because the localloc is updated.
               Note: The generated code will be inserted after the code generation of
               the body is finished, because only then the position is known }
+{$ifdef oldregvars}
+            assign_regvars(code);
+{$endif oldreg}
             aktfilepos:=entrypos;
             gen_load_para_value(templist);
 
@@ -1342,7 +1345,13 @@ implementation
 end.
 {
   $Log$
-  Revision 1.184  2004-02-04 22:01:13  peter
+  Revision 1.185  2004-02-08 18:08:59  jonas
+    * fixed regvars support. Needs -doldregvars to activate. Only tested with
+      ppc, other processors should however only require maxregvars and
+      maxfpuregvars constants in cpubase.pas. Remember to take scratch-
+      registers into account when defining that value.
+
+  Revision 1.184  2004/02/04 22:01:13  peter
     * first try to get cpupara working for x86_64
 
   Revision 1.183  2004/02/03 22:32:54  peter

compiler/regvars.pas

@@ -40,8 +40,8 @@ interface
     procedure load_regvar(asml: TAAsmoutput; vsym: tvarsym);
     procedure load_regvar_reg(asml: TAAsmoutput; reg: tregister);
     procedure load_all_regvars(asml: TAAsmoutput);
-   procedure free_regvars(list: taasmoutput);
-   procedure translate_regvars(list: taasmoutput; const table:Ttranstable);
+    procedure free_regvars(list: taasmoutput);
+{    procedure translate_regvars(list: taasmoutput); }
 {$endif OLDREGVARS}
 
 {$ifdef i386}
@@ -69,17 +69,13 @@ implementation
          parasym : boolean;
       begin
          parasym:=pboolean(arg)^;
-         if (tsym(p).typ=varsym) and (vo_regable in tvarsym(p).varoptions) then
+         if (tsym(p).typ=varsym) and
+            ((vo_regable in tvarsym(p).varoptions) or
+             ((tvarsym(p).varspez in [vs_var,vs_const,vs_out]) and
+              paramanager.push_addr_param(tvarsym(p).varspez,tvarsym(p).vartype.def,current_procinfo.procdef.proccalloption))) and
+            not tvarsym(p).vartype.def.needs_inittable then
            begin
               j:=tvarsym(p).refs;
-              { parameter get a less value }
-              if parasym then
-                begin
-                   if cs_littlesize in aktglobalswitches  then
-                     dec(j,1)
-                   else
-                     dec(j,100);
-                end;
               { walk through all momentary register variables }
               for i:=1 to maxvarregs do
                 begin
@@ -94,7 +90,7 @@ implementation
                           end;
                         { calc the new refs
                         tvarsym(p).refs:=j; }
-                        regvars[i]:=tvarsym(p);
+                        regvars[i]:=tsym(p);
                         regvars_para[i]:=parasym;
                         regvars_refs[i]:=j;
                         break;
@@ -114,13 +110,6 @@ implementation
            begin
               j:=tvarsym(p).refs;
               { parameter get a less value }
-              if parasym then
-                begin
-                   if cs_littlesize in aktglobalswitches  then
-                     dec(j,1)
-                   else
-                     dec(j,100);
-                end;
               { walk through all momentary register variables }
               for i:=1 to maxfpuvarregs do
                 begin
@@ -135,7 +124,7 @@ implementation
                           end;
                         { calc the new refs
                         tvarsym(p).refs:=j; }
-                        fpuregvars[i]:=tvarsym(p);
+                        fpuregvars[i]:=tsym(p);
                         fpuregvars_para[i]:=parasym;
                         fpuregvars_refs[i]:=j;
                         break;
@@ -177,20 +166,20 @@ implementation
               parasym:=true;
               symtablestack.next.foreach_static({$ifdef FPCPROCVAR}@{$endif}searchregvars,@parasym);
               { hold needed registers free }
-              for i:=maxvarregs downto maxvarregs-p.registersint+1-maxintscratchregs do
+              for i:=maxvarregs downto maxvarregs-p.registersint+1 do
                 begin
                   regvarinfo^.regvars[i]:=nil;
                   regvarinfo^.regvars_para[i] := false;
                 end;
               { now assign register }
-              for i:=1 to maxvarregs-p.registersint-maxintscratchregs do
+              for i:=1 to maxvarregs-p.registersint do
                 begin
                   if assigned(regvarinfo^.regvars[i]) and
-                    { currently we assume we can use volatile registers for all }
-                    { regvars if procedure does no call                         }
+                    { currently we assume we can use registers for all }
+                    { regvars if procedure does no call                }
                      (not(pi_do_call in current_procinfo.flags) or
                     { otherwise, demand some (arbitrary) minimum usage }
-                      (regvarinfo^.regvars[i].refs > 100)) then
+                      (tvarsym(regvarinfo^.regvars[i]).refs > 100)) then
                     begin
                       { register is no longer available for }
                       { expressions                          }
@@ -198,22 +187,22 @@ implementation
                       { unused                                }
 
                       { call by reference/const ? }
-                      if paramanager.push_addr_param(regvarinfo^.regvars[i].varspez,regvarinfo^.regvars[i].vartype.def,current_procinfo.procdef.proccalloption) then
+                      if paramanager.push_addr_param(tvarsym(regvarinfo^.regvars[i]).varspez,tvarsym(regvarinfo^.regvars[i]).vartype.def,current_procinfo.procdef.proccalloption) then
                         siz:=OS_32
                       else
-                       if (regvarinfo^.regvars[i].vartype.def.deftype in [orddef,enumdef]) and
-                          (regvarinfo^.regvars[i].vartype.def.size=1) then
+                       if (tvarsym(regvarinfo^.regvars[i]).vartype.def.deftype in [orddef,enumdef]) and
+                          (tvarsym(regvarinfo^.regvars[i]).vartype.def.size=1) then
                         siz:=OS_8
                       else
-                       if (regvarinfo^.regvars[i].vartype.def.deftype in [orddef,enumdef]) and
-                          (regvarinfo^.regvars[i].vartype.def.size=2) then
+                       if (tvarsym(regvarinfo^.regvars[i]).vartype.def.deftype in [orddef,enumdef]) and
+                          (tvarsym(regvarinfo^.regvars[i]).vartype.def.size=2) then
                         siz:=OS_16
                       else
                         siz:=OS_32;
 
-                      {$warning fixme regvars}
                       { allocate a register for this regvar }
-{                      regvarinfo^.regvars[i].localloc.register:=rg.getregisterint(exprasmlist,siz);}
+                      tvarsym(regvarinfo^.regvars[i]).localloc.register:=cg.getintregister(exprasmlist,siz);
+                      tvarsym(regvarinfo^.regvars[i]).localloc.loc:=LOC_REGISTER;
                       { and make sure it can't be freed }
 {                      rg.makeregvarint(getsupreg(regvarinfo^.regvars[i].localloc.register));}
                     end
@@ -228,7 +217,7 @@ implementation
               begin
                 parasym:=false;
                 symtablestack.foreach_static({$ifdef FPCPROCVAR}@{$endif}searchfpuregvars,@parasym);
-{$ifdef dummy}
+{$ifndef i386}
                 { this code should be never enabled because     }
                 { 1. the caller loads parameters into registers }
                 { 2. (later) the CSE loads a parameter into a   }
@@ -236,12 +225,13 @@ implementation
                 {                                        (FK)   }
                 { copy parameter into a register ? }
                 parasym:=true;
-                symtablestack.next.foreach_static({$ifdef FPCPROCVAR}@{$endif}searchregvars);
-{$endif dummy}
+                symtablestack.next.foreach_static({$ifdef FPCPROCVAR}@{$endif}searchregvars,@parasym);
+{$endif i386}
                 { hold needed registers free }
 
                 { in non leaf procedures we must be very careful }
                 { with assigning registers                       }
+{$ifdef i386}
                 if aktmaxfpuregisters=-1 then
                   begin
                    if (pi_do_call in current_procinfo.flags) then
@@ -250,16 +240,19 @@ implementation
                         regvarinfo^.fpuregvars[i]:=nil;
                      end
                    else
+{$endif i386}
                      begin
                       for i:=maxfpuvarregs downto maxfpuvarregs-p.registersfpu do
                         regvarinfo^.fpuregvars[i]:=nil;
                      end;
+{$ifdef i386}
                   end
                 else
                   begin
                     for i:=aktmaxfpuregisters+1 to maxfpuvarregs do
                       regvarinfo^.fpuregvars[i]:=nil;
                   end;
+{$endif i386}
                 { now assign register }
                 for i:=1 to maxfpuvarregs do
                   begin
@@ -267,13 +260,14 @@ implementation
                      begin
 {$ifdef i386}
                        { reserve place on the FPU stack }
-                       {$warning fixme regvars}
+                       {$error fixme x86 fpuregvars}
 {                       regvarinfo^.fpuregvars[i].localloc.register:=trgcpu(rg).correct_fpuregister(NR_ST0,i);}
 {$else i386}
 {$ifdef x86_64}
 {$endif x86_64}
                        begin
-                         regvarinfo^.fpuregvars[i].localloc.register:=fpuvarregs[i];
+                         tvarsym(regvarinfo^.fpuregvars[i]).localloc.register:=cg.getfpuregister(exprasmlist,OS_F64);
+                         tvarsym(regvarinfo^.fpuregvars[i]).localloc.loc:=LOC_FPUREGISTER;
 {                         rg.makeregvarother(regvarinfo^.fpuregvars[i].localloc.register);}
                        end;
 {$endif i386}
@@ -305,7 +299,7 @@ implementation
           supreg:=getsupreg(reg);
           for i := 1 to maxvarregs do
             if assigned(regvarinfo^.regvars[i]) and
-               (getsupreg(regvarinfo^.regvars[i].localloc.register)=supreg) then
+               (getsupreg(tvarsym(regvarinfo^.regvars[i]).localloc.register)=supreg) then
               begin
                 {$warning fixme regvar_loaded_int}
 (*                if supreg in rg.regvar_loaded_int then
@@ -418,6 +412,7 @@ implementation
       reg_spare : tregister;
       supreg : tsuperregister;
     begin
+{
       regvarinfo := pregvarinfo(current_procinfo.procdef.regvarinfo);
       if not assigned(regvarinfo) then
         exit;
@@ -437,19 +432,24 @@ implementation
                (cg.makeregsize(regvarinfo^.regvars[i].localloc.register,OS_INT) = reg_spare) then
               load_regvar(asml,tvarsym(regvarinfo^.regvars[i]))
         end;
+}
     end;
 
     procedure load_all_regvars(asml: TAAsmoutput);
+{
     var
       i: longint;
       regvarinfo: pregvarinfo;
+}
     begin
+{
       regvarinfo := pregvarinfo(current_procinfo.procdef.regvarinfo);
       if not assigned(regvarinfo) then
         exit;
       for i := 1 to maxvarregs do
         if assigned(regvarinfo^.regvars[i]) then
           load_regvar(asml,tvarsym(regvarinfo^.regvars[i]))
+}
     end;
 
 
@@ -486,6 +486,7 @@ implementation
               asml.insert(tai_comment.Create(strpnew(tostr(p.registersfpu)+
               ' registers on FPU stack used by temp. expressions')));
 {$endif i386}
+{
           for i:=1 to maxfpuvarregs do
             begin
                if assigned(regvarinfo^.fpuregvars[i]) then
@@ -501,6 +502,7 @@ implementation
             end;
           if cs_asm_source in aktglobalswitches then
             asml.insert(tai_comment.Create(strpnew('Register variable assignment:')));
+}
         end;
     end;
 
@@ -566,6 +568,7 @@ implementation
                 { ... and clean it up }
                 asml.concat(Taicpu.op_reg(A_FSTP,S_NO,NR_ST0));
 {$endif i386}
+(*
             for i := 1 to maxvarregs do
              begin
                if assigned(regvars[i]) then
@@ -579,60 +582,89 @@ implementation
                       reg:=cg.makeregsize(reg,OS_INT);
                       regidx:=findreg_by_number(reg);
                       {$warning fixme regvar dealloc}
-(*
+{
                       if (rg.regvar_loaded_other[regidx]) then
                        asml.concat(tai_regalloc.dealloc(reg));
-*)
+}
                     end;
                 end;
              end;
+*)
           end;
     end;
 
+{
 
-    procedure free_regvars(list: taasmoutput);
+    Note: this one can't really be "fixed": register colouring happens after
+      stabs generation. It could still be useful to generate the "var X is
+      assigned to register Y with weight ZZZ" messages though
+
+    procedure translate_regvars(list: taasmoutput);
       var
         i: longint;
+        r: tregister;
       begin
         if not assigned(current_procinfo.procdef.regvarinfo) then
           exit;
         with pregvarinfo(current_procinfo.procdef.regvarinfo)^ do
-          for i := 1 to maxvarregs do
-            if assigned(regvars[i]) { and
-              (regvars[i] <> tvarsym(current_procinfo.procdef.funcretsym))} then
-              begin
-                {$warning fixme regvarexclude}
-                { make sure the unget isn't just a nop }
-(*
-                exclude(rg.is_reg_var_int,getsupreg(regvars[i].localloc.register));
-*)
-                cg.ungetregister(list,regvars[i].localloc.register);
-              end;
+          begin
+            for i := 1 to maxvarregs do
+              if assigned(regvars[i]) then
+                begin
+                  cg.rg[R_INTREGISTER].translate_register(tvarsym(regvars[i]).localloc.register);
+                  r:=tvarsym(regvars[i]).localloc.register;
+                  if cs_asm_source in aktglobalswitches then
+                   list.insert(tai_comment.Create(strpnew(tvarsym(regvars[i]).name+
+                    ' with weight '+tostr(tvarsym(regvars[i]).refs)+' assigned to register '+
+                    std_regname(r))));
+                  Message3(cg_d_register_weight,std_regname(r),
+                    tostr(tvarsym(regvars[i]).refs),tvarsym(regvars[i]).name);
+                end;
+            for i := 1 to maxfpuvarregs do
+              if assigned(fpuregvars[i]) then
+                begin
+                  cg.rg[R_FPUREGISTER].translate_register(tvarsym(regvars[i]).localloc.register);
+                  r:=tvarsym(fpuregvars[i]).localloc.register;
+                  if cs_asm_source in aktglobalswitches then
+                   list.insert(tai_comment.Create(strpnew(tvarsym(fpuregvars[i]).name+
+                    ' with weight '+tostr(tvarsym(fpuregvars[i]).refs)+' assigned to register '+
+                    std_regname(r))));
+                  Message3(cg_d_register_weight,std_regname(r),
+                    tostr(tvarsym(fpuregvars[i]).refs),tvarsym(fpuregvars[i]).name);
+                end;
+          end;
       end;
+}
 
-
-    procedure translate_regvars(list: taasmoutput; const table:Ttranstable);
+    procedure free_regvars(list: taasmoutput);
       var
         i: longint;
-        r: tregister;
+        reg: tregister;
+        size: tcgsize;
       begin
         if not assigned(current_procinfo.procdef.regvarinfo) then
           exit;
         with pregvarinfo(current_procinfo.procdef.regvarinfo)^ do
-          for i := 1 to maxvarregs do
-            if assigned(regvars[i]) { and
-              (regvars[i] <> tvarsym(current_procinfo.procdef.funcretsym))} then
-              begin
-                setsupreg(regvars[i].localloc.register,getsupreg(table[getsupreg(regvars[i].localloc.register)]));
-                r:=regvars[i].localloc.register;
-                if cs_asm_source in aktglobalswitches then
-                 list.insert(tai_comment.Create(strpnew(regvars[i].name+
-                  ' with weight '+tostr(regvars[i].refs)+' assigned to register '+
-                  std_regname(r))));
-                Message3(cg_d_register_weight,std_regname(r),
-                  tostr(regvars[i].refs),regvars[i].name);
-              end;
+          begin
+            for i := 1 to maxvarregs do
+              if assigned(regvars[i]) then
+                begin
+                  reg:=cg.makeregsize(tvarsym(regvars[i]).localloc.register,OS_INT);
+                  cg.a_load_reg_reg(list,OS_INT,OS_INT,reg,reg);
+                  cg.ungetregister(list,tvarsym(regvars[i]).localloc.register);
+                end;
+            for i := 1 to maxfpuvarregs do
+              if assigned(fpuregvars[i]) then
+                begin
+                  reg:=tvarsym(fpuregvars[i]).localloc.register;
+                  size:=cg.reg_cgsize(reg);
+                  cg.a_loadfpu_reg_reg(list,size,reg,reg);
+                  cg.ungetregister(list,reg);
+                end;
+          end;
       end;
+
+
 {$endif OLDREGVARS}
 
 
@@ -640,7 +672,13 @@ end.
 
 {
   $Log$
-  Revision 1.72  2004-02-03 22:32:54  peter
+  Revision 1.73  2004-02-08 18:08:59  jonas
+    * fixed regvars support. Needs -doldregvars to activate. Only tested with
+      ppc, other processors should however only require maxregvars and
+      maxfpuregvars constants in cpubase.pas. Remember to take scratch-
+      registers into account when defining that value.
+
+  Revision 1.72  2004/02/03 22:32:54  peter
     * renamed xNNbittype to xNNinttype
     * renamed registers32 to registersint
     * replace some s32bit,u32bit with torddef([su]inttype).def.typ

compiler/symdef.pas

@@ -505,6 +505,21 @@ interface
        end;
        pinlininginfo = ^tinlininginfo;
 
+
+{$ifdef oldregvars}
+       { register variables }
+       pregvarinfo = ^tregvarinfo;
+       tregvarinfo = record
+          regvars : array[1..maxvarregs] of tsym;
+          regvars_para : array[1..maxvarregs] of boolean;
+          regvars_refs : array[1..maxvarregs] of longint;
+
+          fpuregvars : array[1..maxfpuvarregs] of tsym;
+          fpuregvars_para : array[1..maxfpuvarregs] of boolean;
+          fpuregvars_refs : array[1..maxfpuvarregs] of longint;
+       end;
+{$endif oldregvars}
+
        tprocdef = class(tabstractprocdef)
        private
           _mangledname : pstring;
@@ -554,6 +569,9 @@ interface
           { info for inlining the subroutine, if this pointer is nil,
             the procedure can't be inlined }
           inlininginfo : pinlininginfo;
+{$ifdef oldregvars}
+          regvarinfo: pregvarinfo;
+{$endif oldregvars}
           constructor create(level:byte);
           constructor ppuload(ppufile:tcompilerppufile);
           destructor  destroy;override;
@@ -1253,7 +1271,8 @@ implementation
             case torddef(self).typ of
               bool8bit,bool16bit,bool32bit,
               u8bit,u16bit,u32bit,
-              s8bit,s16bit,s32bit:
+              s8bit,s16bit,s32bit,
+              uchar, uwidechar:
                 is_intregable:=true;
             end;
           objectdef:
@@ -6077,7 +6096,13 @@ implementation
 end.
 {
   $Log$
-  Revision 1.216  2004-02-06 22:37:00  daniel
+  Revision 1.217  2004-02-08 18:08:59  jonas
+    * fixed regvars support. Needs -doldregvars to activate. Only tested with
+      ppc, other processors should however only require maxregvars and
+      maxfpuregvars constants in cpubase.pas. Remember to take scratch-
+      registers into account when defining that value.
+
+  Revision 1.216  2004/02/06 22:37:00  daniel
     * Removed not very usefull nextglobal & previousglobal fields from
       Tstoreddef, saving 78 kb of memory
 

compiler/symsym.pas

@@ -307,20 +307,6 @@ interface
           function  get_label:tasmsymbol;
        end;
 
-(*
-       { register variables }
-       pregvarinfo = ^tregvarinfo;
-       tregvarinfo = record
-          regvars : array[1..maxvarregs] of tvarsym;
-          regvars_para : array[1..maxvarregs] of boolean;
-          regvars_refs : array[1..maxvarregs] of longint;
-
-          fpuregvars : array[1..maxfpuvarregs] of tvarsym;
-          fpuregvars_para : array[1..maxfpuvarregs] of boolean;
-          fpuregvars_refs : array[1..maxfpuvarregs] of longint;
-       end;
-*)
-
     var
        generrorsym : tsym;
 
@@ -1615,110 +1601,116 @@ implementation
         threadvaroffset:string;
         regidx:Tregisterindex;
         c:char;
+        loc: tcgloc;
 
     begin
+      { set loc to LOC_REFERENCE to get somewhat usable debugging info for -Or }
+      { while stabs aren't adapted for regvars yet                             }
+      loc := localloc.loc;
       if (vo_is_self in varoptions) then
         begin
-          if localloc.loc<>LOC_REFERENCE then
-            internalerror(2003091815);
+          case loc of
+            LOC_REGISTER:
+              regidx:=findreg_by_number(localloc.register);
+            LOC_REFERENCE: ;
+            else
+              internalerror(2003091815);
+          end;
           if (po_classmethod in current_procinfo.procdef.procoptions) or
              (po_staticmethod in current_procinfo.procdef.procoptions) then
-            stabstring:=stabstr_evaluate('"pvmt:p$1",${N_TSYM},0,0,$2',
-                  [Tstoreddef(pvmttype.def).numberstring,tostr(localloc.reference.offset)])
+            if (loc=LOC_REFERENCE) then
+              stabstring:=stabstr_evaluate('"pvmt:p$1",${N_TSYM},0,0,$2',
+                [Tstoreddef(pvmttype.def).numberstring,tostr(localloc.reference.offset)])
+            else
+              stabstring:=stabstr_evaluate('"pvmt:r$1",${N_RSYM},0,0,$2',
+                [Tstoreddef(pvmttype.def).numberstring,tostr(regstabs_table[regidx])])
           else
             begin
               if not(is_class(current_procinfo.procdef._class)) then
                 c:='v'
               else
                 c:='p';
-              stabstring:=stabstr_evaluate('"$$t:$1",${N_TSYM},0,0,$2',
-                    [c+current_procinfo.procdef._class.numberstring,tostr(localloc.reference.offset)]);
+              if (loc=LOC_REFERENCE) then
+                stabstring:=stabstr_evaluate('"$$t:$1",${N_TSYM},0,0,$2',
+                      [c+current_procinfo.procdef._class.numberstring,tostr(localloc.reference.offset)])
+              else
+                stabstring:=stabstr_evaluate('"$$t:r$1",${N_RSYM},0,0,$2',
+                      [c+current_procinfo.procdef._class.numberstring,tostr(regstabs_table[regidx])]);
             end;
         end
       else
-      (*
-        if (localloc.loc=LOC_REGISTER) then
-          begin
-            regidx:=findreg_by_number(localloc.register);
-            { "eax", "ecx", "edx", "ebx", "esp", "ebp", "esi", "edi", "eip", "ps", "cs", "ss", "ds", "es", "fs", "gs", }
-            { this is the register order for GDB}
-            stabstring:=stabstr_evaluate('"${name}:r$1",${N_RSYM},0,${line},$2',
-                  [Tstoreddef(vartype.def).numberstring,tostr(regstabs_table[regidx])]);
-          end
-        else
-       *)
-          begin
-            stabstring:=nil;
-            st:=tstoreddef(vartype.def).numberstring;
-            if (vo_is_thread_var in varoptions) then
-              threadvaroffset:='+'+tostr(pointer_size)
-            else
-              threadvaroffset:='';
+        begin
+          stabstring:=nil;
+          st:=tstoreddef(vartype.def).numberstring;
+          if (vo_is_thread_var in varoptions) then
+            threadvaroffset:='+'+tostr(pointer_size)
+          else
+            threadvaroffset:='';
 
-            case owner.symtabletype of
-              objectsymtable:
-                if (sp_static in symoptions) then
-                  begin
-                    if (cs_gdb_gsym in aktglobalswitches) then
-                      st:='G'+st
-                    else
-                      st:='S'+st;
-                    stabstring:=stabstr_evaluate('"${ownername}__${name}:$1",${N_LCSYM},0,${line},${mangledname}$2',
-                                                 [st,threadvaroffset]);
-                  end;
-              globalsymtable:
+          case owner.symtabletype of
+            objectsymtable:
+              if (sp_static in symoptions) then
                 begin
-                  { Here we used S instead of
-                    because with G GDB doesn't look at the address field
-                    but searches the same name or with a leading underscore
-                    but these names don't exist in pascal !}
                   if (cs_gdb_gsym in aktglobalswitches) then
                     st:='G'+st
                   else
                     st:='S'+st;
-                  stabstring:=stabstr_evaluate('"${name}:$1",${N_LCSYM},0,${line},${mangledname}$2',[st,threadvaroffset]);
+                  stabstring:=stabstr_evaluate('"${ownername}__${name}:$1",${N_LCSYM},0,${line},${mangledname}$2',
+                                               [st,threadvaroffset]);
                 end;
-              staticsymtable :
-                stabstring:=stabstr_evaluate('"${name}:S$1",${N_LCSYM},0,${line},${mangledname}$2',[st,threadvaroffset]);
-              parasymtable,localsymtable:
-                begin
-                  { There is no space allocated for not referenced locals }
-                  if (owner.symtabletype=localsymtable) and (refs=0) then
-                    exit;
+            globalsymtable:
+              begin
+                { Here we used S instead of
+                  because with G GDB doesn't look at the address field
+                  but searches the same name or with a leading underscore
+                  but these names don't exist in pascal !}
+                if (cs_gdb_gsym in aktglobalswitches) then
+                  st:='G'+st
+                else
+                  st:='S'+st;
+                stabstring:=stabstr_evaluate('"${name}:$1",${N_LCSYM},0,${line},${mangledname}$2',[st,threadvaroffset]);
+              end;
+            staticsymtable :
+              stabstring:=stabstr_evaluate('"${name}:S$1",${N_LCSYM},0,${line},${mangledname}$2',[st,threadvaroffset]);
+            parasymtable,localsymtable:
+              begin
+                { There is no space allocated for not referenced locals }
+                if (owner.symtabletype=localsymtable) and (refs=0) then
+                  exit;
 
-                  if (vo_is_C_var in varoptions) then
-                    begin
-                      stabstring:=stabstr_evaluate('"${name}:S$1",${N_LCSYM},0,${line},${mangledname}',[st]);
-                      exit;
-                    end;
-                  if (owner.symtabletype=parasymtable) then
-                    begin
-                      if paramanager.push_addr_param(varspez,vartype.def,tprocdef(owner.defowner).proccalloption) and
-                         not(vo_has_local_copy in varoptions) then
-                        st := 'v'+st { should be 'i' but 'i' doesn't work }
-                      else
-                        st := 'p'+st;
-                    end;
-                  case localloc.loc of
-                    LOC_REGISTER, LOC_FPUREGISTER :
-                      begin
-                        regidx:=findreg_by_number(localloc.register);
-                        { "eax", "ecx", "edx", "ebx", "esp", "ebp", "esi", "edi", "eip", "ps", "cs", "ss", "ds", "es", "fs", "gs", }
-                        { this is the register order for GDB}
-                        stabstring:=stabstr_evaluate('"${name}:r$1",${N_RSYM},0,${line},$2',[st,tostr(regstabs_table[regidx])]);
-                      end;
-                    LOC_REFERENCE :
-                      { offset to ebp => will not work if the framepointer is esp
-                        so some optimizing will make things harder to debug }
-                      stabstring:=stabstr_evaluate('"${name}:$1",${N_TSYM},0,${line},$2',[st,tostr(localloc.reference.offset)])
+                if (vo_is_C_var in varoptions) then
+                  begin
+                    stabstring:=stabstr_evaluate('"${name}:S$1",${N_LCSYM},0,${line},${mangledname}',[st]);
+                    exit;
+                  end;
+                if (owner.symtabletype=parasymtable) then
+                  begin
+                    if paramanager.push_addr_param(varspez,vartype.def,tprocdef(owner.defowner).proccalloption) and
+                       not(vo_has_local_copy in varoptions) then
+                      st := 'v'+st { should be 'i' but 'i' doesn't work }
                     else
-                      internalerror(2003091814);
+                      st := 'p'+st;
                   end;
+                case loc of
+                  LOC_REGISTER, LOC_FPUREGISTER :
+                    begin
+                      regidx:=findreg_by_number(localloc.register);
+                      { "eax", "ecx", "edx", "ebx", "esp", "ebp", "esi", "edi", "eip", "ps", "cs", "ss", "ds", "es", "fs", "gs", }
+                      { this is the register order for GDB}
+                      stabstring:=stabstr_evaluate('"${name}:r$1",${N_RSYM},0,${line},$2',[st,tostr(regstabs_table[regidx])]);
+                    end;
+                  LOC_REFERENCE :
+                    { offset to ebp => will not work if the framepointer is esp
+                      so some optimizing will make things harder to debug }
+                    stabstring:=stabstr_evaluate('"${name}:$1",${N_TSYM},0,${line},$2',[st,tostr(localloc.reference.offset)])
+                  else
+                    internalerror(2003091814);
                 end;
-              else
-                stabstring := inherited stabstring;
-            end;
+              end;
+            else
+              stabstring := inherited stabstring;
           end;
+        end;
     end;
 {$endif GDB}
 
@@ -2363,7 +2355,13 @@ implementation
 end.
 {
   $Log$
-  Revision 1.155  2004-02-05 14:13:53  daniel
+  Revision 1.156  2004-02-08 18:08:59  jonas
+    * fixed regvars support. Needs -doldregvars to activate. Only tested with
+      ppc, other processors should however only require maxregvars and
+      maxfpuregvars constants in cpubase.pas. Remember to take scratch-
+      registers into account when defining that value.
+
+  Revision 1.155  2004/02/05 14:13:53  daniel
     *  Tvarsym.highvarsym removed
 
   Revision 1.154  2004/02/04 23:01:36  daniel