diff --git a/compiler/ncgcnv.pas b/compiler/ncgcnv.pas index 1a40eb576f..d131a7a679 100644 --- a/compiler/ncgcnv.pas +++ b/compiler/ncgcnv.pas @@ -364,7 +364,7 @@ interface {$ifdef cpu_uses_separate_address_registers} if getregtype(left.location.register)<>R_ADDRESSREGISTER then 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, left.location.register,location.reference.base); end diff --git a/compiler/ncgmem.pas b/compiler/ncgmem.pas index 571c07d35a..491e06cf21 100644 --- a/compiler/ncgmem.pas +++ b/compiler/ncgmem.pas @@ -348,7 +348,7 @@ implementation {$ifdef cpu_uses_separate_address_registers} if getregtype(left.location.register)<>R_ADDRESSREGISTER then 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, left.location.register,location.reference.base); end diff --git a/compiler/ncgutil.pas b/compiler/ncgutil.pas index c465c4b37f..67c5df1dd0 100644 --- a/compiler/ncgutil.pas +++ b/compiler/ncgutil.pas @@ -1906,7 +1906,7 @@ implementation LOC_REGISTER: begin {$ifdef cpu_uses_separate_address_registers} - if getregtype(left.location.register)<>R_ADDRESSREGISTER then + if getregtype(selfloc.register)<>R_ADDRESSREGISTER then begin 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);