paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-03 11:50:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixed arm compilation with cgutils

Browse Source 
* ...
This commit is contained in:
florian 2004-11-01 17:41:28 +00:00
parent 00a32c2b31
commit 73c30d6579
13 changed files with 103 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/arm/aasmcpu.pas
View File

@ -29,7 +29,7 @@ interface
uses uses
cclasses,aasmtai, cclasses,aasmtai,
aasmbase,globtype,globals,verbose, aasmbase,globtype,globals,verbose,
cpubase,cpuinfo,cgbase; cpubase,cpuinfo,cgbase,cgutils;
const const
{ "mov reg,reg" source operand number } { "mov reg,reg" source operand number }
@ -391,7 +391,7 @@ implementation
result := operand_read result := operand_read
else else
{ check for pre/post indexed } { check for pre/post indexed }
result := operand_read result := operand_read;
else else
internalerror(200403151); internalerror(200403151);
end; end;
@ -493,7 +493,11 @@ implementation
end. end.
{ {
$Log$ $Log$
Revision 1.35 2004-10-24 17:32:53 florian Revision 1.36 2004-11-01 17:41:28 florian
* fixed arm compilation with cgutils
* ...
Revision 1.35 2004/10/24 17:32:53 florian
* fixed several arm compiler bugs * fixed several arm compiler bugs
Revision 1.34 2004/07/04 15:22:34 florian Revision 1.34 2004/07/04 15:22:34 florian

8
compiler/arm/agarmgas.pas
View File

@ -52,7 +52,7 @@ unit agarmgas;
assemble, assemble,
aasmcpu, aasmcpu,
itcpugas, itcpugas,
cgbase; cgbase,cgutils;
const const
as_arm_gas_info : tasminfo = as_arm_gas_info : tasminfo =
@ -238,7 +238,11 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.21 2004-06-20 08:55:31 florian Revision 1.22 2004-11-01 17:41:28 florian
* fixed arm compilation with cgutils
* ...
Revision 1.21 2004/06/20 08:55:31 florian
* logs truncated * logs truncated
Revision 1.20 2004/06/16 20:07:10 florian Revision 1.20 2004/06/16 20:07:10 florian

9
compiler/arm/cgcpu.pas
View File

@ -30,7 +30,7 @@ unit cgcpu;
uses uses
globtype,symtype, globtype,symtype,
cgbase,cgobj, cgbase,cgutils,cgobj,
aasmbase,aasmcpu,aasmtai, aasmbase,aasmcpu,aasmtai,
parabase, parabase,
cpubase,cpuinfo,node,cg64f32,rgcpu; cpubase,cpuinfo,node,cg64f32,rgcpu;
@ -120,7 +120,6 @@ unit cgcpu;
symconst,symdef,symsym, symconst,symdef,symsym,
tgobj, tgobj,
procinfo,cpupi, procinfo,cpupi,
cgutils,
paramgr; paramgr;
@ -1287,7 +1286,11 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.61 2004-10-31 16:47:43 florian Revision 1.62 2004-11-01 17:41:28 florian
* fixed arm compilation with cgutils
* ...
Revision 1.61 2004/10/31 16:47:43 florian
* fixed ie with pi_do_call * fixed ie with pi_do_call
Revision 1.60 2004/10/31 16:04:30 florian Revision 1.60 2004/10/31 16:04:30 florian

76
compiler/arm/cpubase.pas
View File

@ -200,45 +200,12 @@ unit cpubase;
F_GE,F_LT,F_GT,F_LE); F_GE,F_LT,F_GT,F_LE);
{***************************************************************************** {*****************************************************************************
Reference Operands
*****************************************************************************} *****************************************************************************}
type
trefoptions=(ref_none,ref_parafixup,ref_localfixup,ref_selffixup);
taddressmode = (AM_OFFSET,AM_PREINDEXED,AM_POSTINDEXED); taddressmode = (AM_OFFSET,AM_PREINDEXED,AM_POSTINDEXED);
tshiftmode = (SM_None,SM_LSL,SM_LSR,SM_ASR,SM_ROR,SM_RRX); tshiftmode = (SM_None,SM_LSL,SM_LSR,SM_ASR,SM_ROR,SM_RRX);
{ reference record }
preference = ^treference;
treference = record
symbol : tasmsymbol;
{ symbol the symbol of this reference is relative to, nil if none }
relsymbol : tasmsymbol;
offset : longint;
base,
index : tregister;
symboldata : tlinkedlistitem;
{ reference type addr or symbol itself }
refaddr : trefaddr;
signindex : shortint;
shiftimm : byte;
options : trefoptions;
addressmode : taddressmode;
shiftmode : tshiftmode;
end;
{ reference record }
pparareference = ^tparareference;
tparareference = record
index : tregister;
offset : longint;
end;
{*****************************************************************************
Operands
*****************************************************************************}
tupdatereg = (UR_None,UR_Update); tupdatereg = (UR_None,UR_Update);
pshifterop = ^tshifterop; pshifterop = ^tshifterop;
@ -249,41 +216,6 @@ unit cpubase;
shiftimm : byte; shiftimm : byte;
end; end;
{*****************************************************************************
Generic Location
*****************************************************************************}
type
tlocation = record
loc : TCGLoc;
size : TCGSize;
case TCGLoc of
LOC_FLAGS : (resflags : tresflags);
LOC_CONSTANT : (
case longint of
1 : (value : aint);
{ can't do this, this layout depends on the host cpu. Use }
{ lo(valueqword)/hi(valueqword) instead (JM) }
{ 2 : (valuelow, valuehigh:AWord); }
{ overlay a complete 64 Bit value }
3 : (value64 : int64);
);
LOC_CREFERENCE,
LOC_REFERENCE : (reference : treference);
{ segment in reference at the same place as in loc_register }
LOC_REGISTER,LOC_CREGISTER : (
case longint of
1 : (register,register64.reghi,segment : tregister);
{ overlay a register64.reglo }
2 : (register64.reglo : tregister);
{ overlay a 64 Bit register type }
3 : (reg64 : tregister64);
4 : (register64 : tregister64);
);
{ it's only for better handling }
LOC_MMXREGISTER,LOC_CMMXREGISTER : (mmxreg : tregister);
end;
{***************************************************************************** {*****************************************************************************
Constants Constants
*****************************************************************************} *****************************************************************************}
@ -565,7 +497,11 @@ unit cpubase;
end. end.
{ {
$Log$ $Log$
Revision 1.36 2004-10-31 21:45:03 peter Revision 1.37 2004-11-01 17:41:28 florian
* fixed arm compilation with cgutils
* ...
Revision 1.36 2004/10/31 21:45:03 peter
* generic tlocation * generic tlocation
* move tlocation to cgutils * move tlocation to cgutils

9
compiler/arm/narmadd.pas
View File

@ -48,7 +48,8 @@ interface
cutils,verbose,globals, cutils,verbose,globals,
symconst,symdef,paramgr, symconst,symdef,paramgr,
aasmbase,aasmtai,aasmcpu,defutil,htypechk, aasmbase,aasmtai,aasmcpu,defutil,htypechk,
cgbase,cpuinfo,pass_1,pass_2,regvars,cgcpu, cgbase,cgutils,cgcpu,
cpuinfo,pass_1,pass_2,regvars,
cpupara, cpupara,
ncon,nset,nadd, ncon,nset,nadd,
ncgutil,tgobj,rgobj,rgcpu,cgobj,cg64f32; ncgutil,tgobj,rgobj,rgcpu,cgobj,cg64f32;
@ -331,7 +332,11 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.18 2004-10-31 16:04:30 florian Revision 1.19 2004-11-01 17:41:28 florian
* fixed arm compilation with cgutils
* ...
Revision 1.18 2004/10/31 16:04:30 florian
* fixed compilation of system unit on arm * fixed compilation of system unit on arm
Revision 1.17 2004/10/24 17:32:53 florian Revision 1.17 2004/10/24 17:32:53 florian

9
compiler/arm/narminl.pas
View File

@ -61,7 +61,8 @@ implementation
cutils,verbose,globals,fmodule, cutils,verbose,globals,fmodule,
symconst,symdef, symconst,symdef,
aasmbase,aasmtai,aasmcpu, aasmbase,aasmtai,aasmcpu,
cgbase,pass_1,pass_2, cgbase,cgutils,
pass_1,pass_2,
cpubase,paramgr, cpubase,paramgr,
nbas,ncon,ncal,ncnv,nld, nbas,ncon,ncal,ncnv,nld,
tgobj,ncgutil,cgobj,cg64f32,rgobj,rgcpu,cgcpu; tgobj,ncgutil,cgobj,cg64f32,rgobj,rgcpu,cgcpu;
@ -202,7 +203,11 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.7 2004-06-20 08:55:31 florian Revision 1.8 2004-11-01 17:41:28 florian
* fixed arm compilation with cgutils
* ...
Revision 1.7 2004/06/20 08:55:31 florian
* logs truncated * logs truncated
Revision 1.6 2004/03/16 22:12:10 florian Revision 1.6 2004/03/16 22:12:10 florian

9
compiler/arm/narmmat.pas
View File

@ -48,7 +48,8 @@ implementation
symconst,symdef, symconst,symdef,
aasmbase,aasmcpu,aasmtai, aasmbase,aasmcpu,aasmtai,
defutil, defutil,
cgbase,cgobj,pass_1,pass_2, cgbase,cgobj,cgutils,
pass_1,pass_2,
ncon, ncon,
cpubase,cpuinfo, cpubase,cpuinfo,
ncgutil,cgcpu,cg64f32,rgobj; ncgutil,cgcpu,cg64f32,rgobj;
@ -121,7 +122,11 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.8 2004-10-24 07:54:25 florian Revision 1.9 2004-11-01 17:41:28 florian
* fixed arm compilation with cgutils
* ...
Revision 1.8 2004/10/24 07:54:25 florian
* fixed compilation of arm compiler * fixed compilation of arm compiler
Revision 1.7 2004/06/20 08:55:31 florian Revision 1.7 2004/06/20 08:55:31 florian

10
compiler/arm/rgcpu.pas
View File

@ -30,7 +30,7 @@ unit rgcpu;
uses uses
aasmbase,aasmtai,aasmcpu, aasmbase,aasmtai,aasmcpu,
cgbase, cgbase,cgutils,
cpubase, cpubase,
rgobj; rgobj;
@ -48,7 +48,7 @@ unit rgcpu;
uses uses
verbose, cutils, verbose, cutils,
cgutils,cgobj, cgobj,
procinfo; procinfo;
@ -159,7 +159,11 @@ end.
{ {
$Log$ $Log$
Revision 1.14 2004-10-24 07:54:25 florian Revision 1.15 2004-11-01 17:41:28 florian
* fixed arm compilation with cgutils
* ...
Revision 1.14 2004/10/24 07:54:25 florian
* fixed compilation of arm compiler * fixed compilation of arm compiler
Revision 1.13 2004/07/03 19:29:14 florian Revision 1.13 2004/07/03 19:29:14 florian

14
compiler/cgutils.pas
View File

@ -29,6 +29,7 @@ unit cgutils;
uses uses
globtype, globtype,
cclasses,
aasmbase, aasmbase,
cpubase,cgbase; cpubase,cgbase;
@ -44,6 +45,13 @@ unit cgutils;
index : tregister; index : tregister;
refaddr : trefaddr; refaddr : trefaddr;
scalefactor : byte; scalefactor : byte;
{$ifdef arm}
symboldata : tlinkedlistitem;
signindex : shortint;
shiftimm : byte;
addressmode : taddressmode;
shiftmode : tshiftmode;
{$endif arm}
end; end;
tlocation = record tlocation = record
@ -170,7 +178,11 @@ implementation
end. end.
{ {
$Log$ $Log$
Revision 1.2 2004-10-31 21:45:02 peter Revision 1.3 2004-11-01 17:41:28 florian
* fixed arm compilation with cgutils
* ...
Revision 1.2 2004/10/31 21:45:02 peter
* generic tlocation * generic tlocation
* move tlocation to cgutils * move tlocation to cgutils

15
compiler/ncgadd.pas
View File

@ -488,10 +488,10 @@ interface
begin begin
if (right.location.loc = LOC_CONSTANT) then if (right.location.loc = LOC_CONSTANT) then
cg.a_op_const_reg_reg(exprasmlist,op,location.size,right.location.value, cg.a_op_const_reg_reg(exprasmlist,op,location.size,right.location.value,
left.location.register64,location.register) left.location.register,location.register)
else else
cg.a_op_reg_reg_reg(exprasmlist,op,location.size,right.location.register, cg.a_op_reg_reg_reg(exprasmlist,op,location.size,right.location.register,
left.location.register64,location.register); left.location.register,location.register);
end; end;
subn: subn:
begin begin
@ -500,11 +500,6 @@ interface
if left.location.loc <> LOC_CONSTANT then if left.location.loc <> LOC_CONSTANT then
begin begin
if (location.register64.reglo = NR_NO) then
begin
location.register64.reglo := cg.getintregister(exprasmlist,OS_INT);
location.register64.reghi := cg.getintregister(exprasmlist,OS_INT);
end;
if right.location.loc <> LOC_CONSTANT then if right.location.loc <> LOC_CONSTANT then
// reg64 - reg64 // reg64 - reg64
cg.a_op_reg_reg_reg(exprasmlist,OP_SUB,location.size, cg.a_op_reg_reg_reg(exprasmlist,OP_SUB,location.size,
@ -778,7 +773,11 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.35 2004-10-31 21:45:03 peter Revision 1.36 2004-11-01 17:41:28 florian
* fixed arm compilation with cgutils
* ...
Revision 1.35 2004/10/31 21:45:03 peter
* generic tlocation * generic tlocation
* move tlocation to cgutils * move tlocation to cgutils

16
compiler/ncgcal.pas
View File

@ -516,14 +516,20 @@ implementation
begin begin
if resultparaloc^.loc<>LOC_REGISTER then if resultparaloc^.loc<>LOC_REGISTER then
internalerror(200409261); internalerror(200409261);
{ the FUNCTION_RESULT_REG is already allocated } { the FUNCTION_RESULT_REG is already allocated }
if getsupreg(resultparaloc^.register)<first_mm_imreg then if getsupreg(resultparaloc^.register)<first_int_imreg then
cg.ungetcpuregister(exprasmlist,resultparaloc^.register); cg.ungetcpuregister(exprasmlist,resultparaloc^.register);
if not assigned(funcretnode) then if not assigned(funcretnode) then
begin begin
{ reg_ref could generate two instrcutions and allocate a register so we've to
save the result first before releasing it }
hregister:=cg.getaddressregister(exprasmlist);
cg.a_load_reg_reg(exprasmlist,OS_ADDR,OS_ADDR,resultparaloc^.register,hregister);
location_reset(location,LOC_REFERENCE,OS_ADDR); location_reset(location,LOC_REFERENCE,OS_ADDR);
location.reference:=refcountedtemp; location.reference:=refcountedtemp;
cg.a_load_reg_ref(exprasmlist,OS_ADDR,OS_ADDR,NR_FUNCTION_RESULT_REG,location.reference); cg.a_load_reg_ref(exprasmlist,OS_ADDR,OS_ADDR,hregister,location.reference);
end end
else else
begin begin
@ -1247,7 +1253,11 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.182 2004-10-31 21:45:03 peter Revision 1.183 2004-11-01 17:41:28 florian
* fixed arm compilation with cgutils
* ...
Revision 1.182 2004/10/31 21:45:03 peter
* generic tlocation * generic tlocation
* move tlocation to cgutils * move tlocation to cgutils

18
compiler/ncgcnv.pas
View File

@ -94,13 +94,13 @@ interface
than the original, else load it to a register } than the original, else load it to a register }
if (location.loc in [LOC_REFERENCE,LOC_CREFERENCE]) and if (location.loc in [LOC_REFERENCE,LOC_CREFERENCE]) and
(ressize<leftsize) then (ressize<leftsize) then
begin begin
location.size:=newsize; location.size:=newsize;
if (target_info.endian = ENDIAN_BIG) then if (target_info.endian = ENDIAN_BIG) then
inc(location.reference.offset,leftsize-ressize); inc(location.reference.offset,leftsize-ressize);
end end
else else
location_force_reg(exprasmlist,location,newsize,false); location_force_reg(exprasmlist,location,newsize,false);
end end
else else
begin begin
@ -531,7 +531,11 @@ end.
{ {
$Log$ $Log$
Revision 1.62 2004-11-01 15:31:58 peter Revision 1.63 2004-11-01 17:41:28 florian
* fixed arm compilation with cgutils
* ...
Revision 1.62 2004/11/01 15:31:58 peter
* -Or fix for absolute * -Or fix for absolute
Revision 1.61 2004/10/31 21:45:03 peter Revision 1.61 2004/10/31 21:45:03 peter

7
compiler/ninl.pas
View File

@ -2099,6 +2099,7 @@ implementation
result := ctypeconvnode.create_explicit(left,resulttype); result := ctypeconvnode.create_explicit(left,resulttype);
left := nil; left := nil;
firstpass(result); firstpass(result);
printnode(output,result);
end; end;
in_sizeof_x: in_sizeof_x:
@ -2442,7 +2443,11 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.146 2004-10-31 21:45:03 peter Revision 1.147 2004-11-01 17:41:28 florian
* fixed arm compilation with cgutils
* ...
Revision 1.146 2004/10/31 21:45:03 peter
* generic tlocation * generic tlocation
* move tlocation to cgutils * move tlocation to cgutils