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

--- Merging r29580 into '.':

Browse Source 
U    compiler/arm/cgcpu.pas

# revisions: 29580

git-svn-id: branches/fixes_3_0@29581 -
This commit is contained in:
marco 2015-01-30 15:40:03 +00:00
parent aab45fdee7
commit bf34c6bcd1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compiler/arm/cgcpu.pas
View File

@ -3247,7 +3247,10 @@ unit cgcpu;
reference_reset_base(href,NR_R12,tobjectdef(procdef.struct).vmtmethodoffset(procdef.extnumber),sizeof(pint));
cg.a_load_ref_reg(list,OS_ADDR,OS_ADDR,href,NR_R12);
end;
list.concat(taicpu.op_reg(A_BX,NR_R12));
if not(CPUARM_HAS_BX in cpu_capabilities[current_settings.cputype]) then
list.concat(taicpu.op_reg_reg(A_MOV,NR_PC,NR_R12))
else
list.concat(taicpu.op_reg(A_BX,NR_R12));
end;
var