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

* don't overwrite cai_align with tai_align_abstract

Browse Source 
* check that tai_align is used and not tai_align_abstract

git-svn-id: trunk@8563 -
This commit is contained in:
peter 2007-09-19 15:41:47 +00:00
parent 3c096a9549
commit 582fa79494
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/aasmtai.pas
View File

@ -2303,6 +2303,10 @@ implementation
begin begin
inherited Create; inherited Create;
typ:=ait_align; typ:=ait_align;
{$ifdef EXTDEBUG}
if upper(classname)='TAI_ALIGN_ABSTRACT' then
internalerror(200709191);
{$endif EXTDEBUG}
if b in [1,2,4,8,16,32] then if b in [1,2,4,8,16,32] then
aligntype := b aligntype := b
else else
@ -2371,5 +2375,8 @@ implementation
begin begin
cai_cpu:=tai_cpu_abstract; cai_cpu:=tai_cpu_abstract;
cai_align:=tai_align_abstract; { aasmcpu is earlier in the unit order and can
already set the cai_align }
if not assigned(cai_align) then
cai_align:=tai_align_abstract;
end. end.

6
compiler/ncgset.pas
View File

@ -822,7 +822,7 @@ implementation
{ generate the instruction blocks } { generate the instruction blocks }
for i:=0 to blocks.count-1 do for i:=0 to blocks.count-1 do
begin begin
current_asmdata.CurrAsmList.concat(Tai_align_abstract.create(current_settings.alignment.jumpalign)); current_asmdata.CurrAsmList.concat(cai_align.create(current_settings.alignment.jumpalign));
cg.a_label(current_asmdata.CurrAsmList,pcaseblock(blocks[i])^.blocklabel); cg.a_label(current_asmdata.CurrAsmList,pcaseblock(blocks[i])^.blocklabel);
secondpass(pcaseblock(blocks[i])^.statement); secondpass(pcaseblock(blocks[i])^.statement);
{ don't come back to case line } { don't come back to case line }
@ -832,7 +832,7 @@ implementation
{$endif OLDREGVARS} {$endif OLDREGVARS}
cg.a_jmp_always(current_asmdata.CurrAsmList,endlabel); cg.a_jmp_always(current_asmdata.CurrAsmList,endlabel);
end; end;
current_asmdata.CurrAsmList.concat(Tai_align_abstract.create(current_settings.alignment.jumpalign)); current_asmdata.CurrAsmList.concat(cai_align.create(current_settings.alignment.jumpalign));
{ ...and the else block } { ...and the else block }
cg.a_label(current_asmdata.CurrAsmList,elselabel); cg.a_label(current_asmdata.CurrAsmList,elselabel);
if assigned(elseblock) then if assigned(elseblock) then
@ -842,7 +842,7 @@ implementation
load_all_regvars(current_asmdata.CurrAsmList); load_all_regvars(current_asmdata.CurrAsmList);
{$endif OLDREGVARS} {$endif OLDREGVARS}
end; end;
current_asmdata.CurrAsmList.concat(Tai_align_abstract.create(current_settings.alignment.jumpalign)); current_asmdata.CurrAsmList.concat(cai_align.create(current_settings.alignment.jumpalign));
cg.a_label(current_asmdata.CurrAsmList,endlabel); cg.a_label(current_asmdata.CurrAsmList,endlabel);
{ Reset labels } { Reset labels }