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

Use thumb_func flag to detect selected arm/thumb mode.

Browse Source 
git-svn-id: trunk@32958 -
This commit is contained in:
Jeppe Johansen 2016-01-16 11:24:38 +00:00
parent 3300f51ed6
commit 017d58748f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/arm/aasmcpu.pas
View File

@ -275,7 +275,7 @@ uses
insoffset : longint; insoffset : longint;
LastInsOffset : longint; { need to be public to be reset } LastInsOffset : longint; { need to be public to be reset }
insentry : PInsEntry; insentry : PInsEntry;
procedure BuildArmMasks; procedure BuildArmMasks(objdata:TObjData);
function InsEnd:longint; function InsEnd:longint;
procedure create_ot(objdata:TObjData); procedure create_ot(objdata:TObjData);
function Matches(p:PInsEntry):longint; function Matches(p:PInsEntry):longint;
@ -2124,7 +2124,7 @@ implementation
end; end;
procedure taicpu.BuildArmMasks; procedure taicpu.BuildArmMasks(objdata:TObjData);
const const
Masks: array[tcputype] of longint = Masks: array[tcputype] of longint =
( (
@ -2165,7 +2165,8 @@ implementation
begin begin
fArmVMask:=Masks[current_settings.cputype] or FPUMasks[current_settings.fputype]; fArmVMask:=Masks[current_settings.cputype] or FPUMasks[current_settings.fputype];
if current_settings.instructionset=is_thumb then if objdata.ThumbFunc then
//if current_settings.instructionset=is_thumb then
begin begin
fArmMask:=IF_THUMB; fArmMask:=IF_THUMB;
if CPUARM_HAS_THUMB2 in cpu_capabilities[current_settings.cputype] then if CPUARM_HAS_THUMB2 in cpu_capabilities[current_settings.cputype] then
@ -2666,7 +2667,7 @@ implementation
{ create the .ot fields } { create the .ot fields }
create_ot(objdata); create_ot(objdata);
BuildArmMasks; BuildArmMasks(objdata);
{ set the file postion } { set the file postion }
current_filepos:=fileinfo; current_filepos:=fileinfo;
end end