diff --git a/compiler/sparc/cgcpu.pas b/compiler/sparc/cgcpu.pas index e2f6911275..31c5e7ace1 100644 --- a/compiler/sparc/cgcpu.pas +++ b/compiler/sparc/cgcpu.pas @@ -108,7 +108,7 @@ implementation uses globtype,globals,verbose,systems,cutils, symdef,symsym,defutil,paramgr, - tgobj,cpupi; + tgobj,cpupi,cgutils; {**************************************************************************** @@ -149,11 +149,11 @@ implementation reference_reset(tmpref); tmpref.symbol:=ref.symbol; tmpref.offset:=ref.offset; - tmpref.symaddr:=refs_hi; + tmpref.refaddr:=addr_hi; list.concat(taicpu.op_ref_reg(A_SETHI,tmpref,tmpreg)); { Load the low part is left } {$warning TODO Maybe not needed to load symbol} - tmpref.symaddr:=refs_lo; + tmpref.refaddr:=addr_lo; list.concat(taicpu.op_reg_ref_reg(A_OR,tmpreg,tmpref,tmpreg)); { The offset and symbol are loaded, reset in reference } ref.offset:=0; @@ -542,10 +542,10 @@ implementation reference_reset(tmpref); tmpref.symbol := ref.symbol; tmpref.offset := ref.offset; - tmpref.symaddr := refs_hi; + tmpref.refaddr := addr_hi; list.concat(taicpu.op_ref_reg(A_SETHI,tmpref,hreg)); { Only the low part is left } - tmpref.symaddr:=refs_lo; + tmpref.refaddr:=addr_lo; list.concat(taicpu.op_reg_ref_reg(A_OR,hreg,tmpref,hreg)); if ref.base<>NR_NO then begin @@ -1107,7 +1107,10 @@ begin end. { $Log$ - Revision 1.78 2004-02-04 22:01:13 peter + Revision 1.79 2004-02-27 13:28:28 mazen + * symaddr ==> refaddr to follow the rest of compiler changes + + Revision 1.78 2004/02/04 22:01:13 peter * first try to get cpupara working for x86_64 Revision 1.77 2004/01/12 22:11:38 peter diff --git a/compiler/sparc/racpugas.pas b/compiler/sparc/racpugas.pas index 52796dc09d..2277ebef8e 100644 --- a/compiler/sparc/racpugas.pas +++ b/compiler/sparc/racpugas.pas @@ -60,7 +60,7 @@ Interface procinfo, itcpugas, rabase,rautils, - cgbase,cgobj + cgbase,cgobj,cgutils ; procedure tSparcReader.ReadSym(oper : tSparcoperand); @@ -105,9 +105,9 @@ Interface if actasmtoken=AS_ID then begin if upper(actasmpattern)='LO' then - oper.opr.ref.symaddr:=refs_lo + oper.opr.ref.refaddr:=addr_lo else if upper(actasmpattern)='HI' then - oper.opr.ref.symaddr:=refs_hi + oper.opr.ref.refaddr:=addr_hi else Message(asmr_e_invalid_reference_syntax); Consume(AS_ID); @@ -310,9 +310,9 @@ Interface memory location) } oper.InitRef; if actasmtoken=AS_LO then - oper.opr.ref.symaddr:=refs_lo + oper.opr.ref.refaddr:=addr_lo else - oper.opr.ref.symaddr:=refs_hi; + oper.opr.ref.refaddr:=addr_hi; Consume(actasmtoken); Consume(AS_LPAREN); BuildConstSymbolExpression(false, true,false,l,tempstr); @@ -577,7 +577,7 @@ Interface symofs:=instr.Operands[1].opr.ref.offset; if (instr.Operands[1].opr.ref.base<>NR_NO) or (instr.Operands[1].opr.ref.index<>NR_NO) or - (instr.Operands[1].opr.ref.symaddr<>refs_full) then + (instr.Operands[1].opr.ref.refaddr<>addr_full) then Message(asmr_e_syn_operand); instr.Operands[1].opr:=newopr; end; @@ -626,7 +626,10 @@ initialization end. { $Log$ - Revision 1.6 2004-01-12 22:11:39 peter + Revision 1.7 2004-02-27 13:27:28 mazen + * symaddr ==> refaddr to follow the rest of compiler changes + + Revision 1.6 2004/01/12 22:11:39 peter * use localalign info for alignment for locals and temps * sparc fpu flags branching added * moved powerpc copy_valye_openarray to generic