summaryrefslogtreecommitdiff
path: root/compiler/mips/hlcgcpu.pas
diff options
context:
space:
mode:
authorjonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2>2014-05-12 16:12:34 +0000
committerjonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2>2014-05-12 16:12:34 +0000
commite25a0cbf72c8f9d9a3a90ab6b84a805ae6f970f1 (patch)
tree50ac03c7f2cde30bb97fa0d2eba2b19c50cc484c /compiler/mips/hlcgcpu.pas
parent27b8fcb3503c126c9f3c5940fa4286fce6399b2a (diff)
parentc6975a19a1e6c9853e17f9a779b801064f15dae0 (diff)
downloadfpc-e25a0cbf72c8f9d9a3a90ab6b84a805ae6f970f1.tar.gz
* synchronized with trunk up to r27758
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/hlcgllvm@27779 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'compiler/mips/hlcgcpu.pas')
-rw-r--r--compiler/mips/hlcgcpu.pas4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/mips/hlcgcpu.pas b/compiler/mips/hlcgcpu.pas
index 93edbf4cac..eeddde8e9c 100644
--- a/compiler/mips/hlcgcpu.pas
+++ b/compiler/mips/hlcgcpu.pas
@@ -93,7 +93,7 @@ implementation
begin
cgsubsetsize:=def_cgsize(subsetsize);
cgtosize:=def_cgsize(tosize);
- if (current_settings.cputype<>cpu_mips32r2) then
+ if (current_settings.cputype<>cpu_mips32r2) and (current_settings.cputype<>cpu_pic32mx) then
inherited a_load_subsetreg_reg(list,subsetsize,tosize,sreg,destreg)
else if (sreg.bitlen>32) then
InternalError(2013070201)
@@ -121,7 +121,7 @@ implementation
procedure thlcgmips.a_load_regconst_subsetreg_intern(list: TAsmList; fromsize, subsetsize: tdef; fromreg: tregister; const sreg: tsubsetregister; slopt: tsubsetloadopt);
begin
- if (current_settings.cputype<>cpu_mips32r2) then
+ if (current_settings.cputype<>cpu_mips32r2) and (current_settings.cputype<>cpu_pic32mx) then
inherited a_load_regconst_subsetreg_intern(list,fromsize,subsetsize,fromreg,sreg,slopt)
else if (sreg.bitlen>32) then
InternalError(2013070202)