paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-18 16:49:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

m68k: cleaned up and fixed cgcpu/fixref for coldfire at least; also enabled n68kmem node, so addressing with scaling is generated now

Browse Source 
git-svn-id: trunk@28025 -
This commit is contained in:
Károly Balogh 2014-06-21 21:36:48 +00:00
parent a1197460e1
commit 519094055c
2 changed files with 54 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
compiler/m68k/cgcpu.pas
View File

@ -448,6 +448,7 @@ unit cgcpu;
hreg,idxreg : tregister; hreg,idxreg : tregister;
href : treference; href : treference;
instr : taicpu; instr : taicpu;
scale : aint;
begin begin
result:=false; result:=false;
{ The MC68020+ has extended { The MC68020+ has extended
@ -565,45 +566,30 @@ unit cgcpu;
begin begin
if assigned(ref.symbol) then if assigned(ref.symbol) then
begin begin
//list.concat(tai_comment.create(strpnew('fixref: symbol')));
hreg:=cg.getaddressregister(list); hreg:=cg.getaddressregister(list);
reference_reset_symbol(href,ref.symbol,ref.offset,ref.alignment); reference_reset_symbol(href,ref.symbol,ref.offset,ref.alignment);
list.concat(taicpu.op_ref_reg(A_LEA,S_L,href,hreg)); list.concat(taicpu.op_ref_reg(A_LEA,S_L,href,hreg));
if ref.index<>NR_NO then if ref.index<>NR_NO then
begin begin
{ fold the symbol + offset into the base, not the base into the index,
because that might screw up the scalefactor of the reference }
//list.concat(tai_comment.create(strpnew('fixref: symbol + offset (index + base)')));
idxreg:=getaddressregister(list); idxreg:=getaddressregister(list);
instr:=taicpu.op_reg_reg(A_MOVE,S_L,ref.base,idxreg); reference_reset_base(href,ref.base,0,ref.alignment);
//add_move_instruction(instr); href.index:=hreg;
list.concat(instr); hreg:=getaddressregister(list);
list.concat(taicpu.op_reg_reg(A_ADD,S_L,ref.index,idxreg)); list.concat(taicpu.op_ref_reg(A_LEA,S_L,href,hreg));
ref.index:=idxreg; ref.base:=hreg;
end end
else else
ref.index:=ref.base; ref.index:=hreg;
ref.base:=hreg;
ref.offset:=0; ref.offset:=0;
ref.symbol:=nil; ref.symbol:=nil;
end; fixref:=true;
{ once the above is verified to work the below code can be end
removed } else
{if assigned(ref.symbol) and (ref.index=NR_NO) then
begin
hreg:=cg.getaddressregister(list);
reference_reset_symbol(href,ref.symbol,0,ref.alignment);
list.concat(taicpu.op_ref_reg(A_LEA,S_L,href,hreg));
ref.index:=ref.base;
ref.base:=hreg;
ref.symbol:=nil;
end;
if (ref.index<>NR_NO) and assigned(ref.symbol) then
begin
hreg:=getaddressregister(list);
list.concat(taicpu.op_reg_reg(A_MOVE,S_L,ref.base,hreg));
list.concat(taicpu.op_reg_reg(A_ADD,S_L,ref.index,hreg));
ref.base:=hreg;
ref.index:=NR_NO;
end;}
{if (ref.index <> NR_NO) and assigned(ref.symbol) then
internalerror(2002081403);}
{ base + reg } { base + reg }
if ref.index <> NR_NO then if ref.index <> NR_NO then
begin begin
@ -611,10 +597,19 @@ unit cgcpu;
if (ref.offset < low(shortint)) or (ref.offset > high(shortint)) then if (ref.offset < low(shortint)) or (ref.offset > high(shortint)) then
begin begin
hreg:=getaddressregister(list); hreg:=getaddressregister(list);
if (ref.offset < low(smallint)) or (ref.offset > high(smallint)) then
begin
instr:=taicpu.op_reg_reg(A_MOVE,S_L,ref.base,hreg); instr:=taicpu.op_reg_reg(A_MOVE,S_L,ref.base,hreg);
//add_move_instruction(instr); //add_move_instruction(instr);
list.concat(instr); list.concat(instr);
list.concat(taicpu.op_const_reg(A_ADD,S_L,ref.offset,hreg)); list.concat(taicpu.op_const_reg(A_ADD,S_L,ref.offset,hreg));
end
else
begin
//list.concat(tai_comment.create(strpnew('fixref: base + reg + offset lea')));
reference_reset_base(href,ref.base,ref.offset,ref.alignment);
list.concat(taicpu.op_ref_reg(A_LEA,S_NO,href,hreg));
end;
fixref:=true; fixref:=true;
ref.base:=hreg; ref.base:=hreg;
ref.offset:=0; ref.offset:=0;
@ -644,10 +639,12 @@ unit cgcpu;
begin begin
hreg:=cg.getaddressregister(list); hreg:=cg.getaddressregister(list);
idxreg:=ref.index; idxreg:=ref.index;
scale:=ref.scalefactor;
ref.index:=NR_NO; ref.index:=NR_NO;
list.concat(taicpu.op_ref_reg(A_LEA,S_L,ref,hreg)); list.concat(taicpu.op_ref_reg(A_LEA,S_L,ref,hreg));
reference_reset_base(ref,hreg,0,ref.alignment); reference_reset_base(ref,hreg,0,ref.alignment);
ref.index:=idxreg; ref.index:=idxreg;
ref.scalefactor:=scale;
fixref:=true; fixref:=true;
end; end;
end; end;

2
compiler/m68k/cpunode.pas
View File

@ -38,7 +38,7 @@ unit cpunode;
n68kcal, n68kcal,
// nppccon, // nppccon,
// nppcflw, // nppcflw,
// n68kmem, n68kmem,
// nppcset, // nppcset,
// nppcinl, // nppcinl,
// nppcopt, // nppcopt,