Przeglądaj źródła

* fixed some ancient code behind cpu_uses_separate_address_registers define to at least compile again, for some m68k experiment

git-svn-id: trunk@30130 -
Károly Balogh 10 lat temu
rodzic
commit
0021ad714f
3 zmienionych plików z 3 dodań i 3 usunięć
  1. 1 1
      compiler/ncgcnv.pas
  2. 1 1
      compiler/ncgmem.pas
  3. 1 1
      compiler/ncgutil.pas

+ 1 - 1
compiler/ncgcnv.pas

@@ -364,7 +364,7 @@ interface
             {$ifdef cpu_uses_separate_address_registers}
             {$ifdef cpu_uses_separate_address_registers}
               if getregtype(left.location.register)<>R_ADDRESSREGISTER then
               if getregtype(left.location.register)<>R_ADDRESSREGISTER then
                 begin
                 begin
-                  location.reference.base:=rg.getaddressregister(current_asmdata.CurrAsmList);
+                  location.reference.base:=cg.getaddressregister(current_asmdata.CurrAsmList);
                   cg.a_load_reg_reg(current_asmdata.CurrAsmList,OS_ADDR,OS_ADDR,
                   cg.a_load_reg_reg(current_asmdata.CurrAsmList,OS_ADDR,OS_ADDR,
                           left.location.register,location.reference.base);
                           left.location.register,location.reference.base);
                 end
                 end

+ 1 - 1
compiler/ncgmem.pas

@@ -348,7 +348,7 @@ implementation
                       {$ifdef cpu_uses_separate_address_registers}
                       {$ifdef cpu_uses_separate_address_registers}
                         if getregtype(left.location.register)<>R_ADDRESSREGISTER then
                         if getregtype(left.location.register)<>R_ADDRESSREGISTER then
                           begin
                           begin
-                            location.reference.base:=rg.getaddressregister(current_asmdata.CurrAsmList);
+                            location.reference.base:=cg.getaddressregister(current_asmdata.CurrAsmList);
                             hlcg.a_load_reg_reg(current_asmdata.CurrAsmList,left.resultdef,left.resultdef,
                             hlcg.a_load_reg_reg(current_asmdata.CurrAsmList,left.resultdef,left.resultdef,
                               left.location.register,location.reference.base);
                               left.location.register,location.reference.base);
                           end
                           end

+ 1 - 1
compiler/ncgutil.pas

@@ -1906,7 +1906,7 @@ implementation
               LOC_REGISTER:
               LOC_REGISTER:
                 begin
                 begin
 {$ifdef cpu_uses_separate_address_registers}
 {$ifdef cpu_uses_separate_address_registers}
-                  if getregtype(left.location.register)<>R_ADDRESSREGISTER then
+                  if getregtype(selfloc.register)<>R_ADDRESSREGISTER then
                     begin
                     begin
                       reference_reset_base(href,cg.getaddressregister(list),objdef.vmt_offset,sizeof(pint));
                       reference_reset_base(href,cg.getaddressregister(list),objdef.vmt_offset,sizeof(pint));
                       cg.a_load_reg_reg(list,OS_ADDR,OS_ADDR,selfloc.register,href.base);
                       cg.a_load_reg_reg(list,OS_ADDR,OS_ADDR,selfloc.register,href.base);