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

Merged revisions 3337,3339 via svnmerge from

Browse Source 
http://peter@svn.freepascal.org/svn/fpc/trunk

........
r3337 | florian | 2006-04-26 20:12:22 +0200 (Wed, 26 Apr 2006) | 2 lines

* fixed internal error with int64 comparisations

........
r3339 | florian | 2006-04-26 20:46:38 +0200 (Wed, 26 Apr 2006) | 2 lines

* avoid crash when multiple references to one text symbol entry are used

........

git-svn-id: branches/fixes_2_0@3821 -
This commit is contained in:
peter 2006-06-08 06:05:16 +00:00
parent 8e7c06d354
commit dc06295b9a
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/arm/aasmcpu.pas
View File

@ -469,7 +469,9 @@ implementation
begin
{ pc relative symbol? }
curdatatai:=tai(taicpu(curtai).oper[curop]^.ref^.symboldata);
if assigned(curdatatai) then
if assigned(curdatatai) and
{ move only if we're at the first reference of a label }
(taicpu(curtai).oper[curop]^.ref^.offset=0) then
begin
{ if yes, insert till next symbol }
repeat

16
compiler/arm/narmadd.pas
View File

@ -33,6 +33,7 @@ interface
private
function GetResFlags(unsigned:Boolean):TResFlags;
protected
function pass_1 : tnode;override;
procedure second_addfloat;override;
procedure second_cmpfloat;override;
procedure second_cmpordinal;override;
@ -300,6 +301,21 @@ interface
end;
function tarmaddnode.pass_1 : tnode;
begin
result:=inherited pass_1;
{ handling boolean expressions }
if not(assigned(result)) and
(
not(is_boolean(left.resulttype.def)) or
not(is_boolean(right.resulttype.def)) or
is_dynamic_array(left.resulttype.def)
) then
expectloc:=LOC_FLAGS;
end;
procedure tarmaddnode.second_cmpordinal;
var
unsigned : boolean;