diff options
| author | Sverker Eriksson <[email protected]> | 2016-08-26 12:28:16 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-08-26 12:28:16 +0200 |
| commit | d017ade88b8fa39f57aee722dd2e2c5d82e8b262 (patch) | |
| tree | 59a0b949d0452f38c52f5d9b1d0e3a57c0a4cbd8 /lib/hipe/arm/hipe_rtl_to_arm.erl | |
| parent | fbff3418f1c2ac658c6ff5ee808b4a2af0e70c9e (diff) | |
| parent | f3e018dc3bb3c74b88c7454f6a1888938215f912 (diff) | |
| download | otp-d017ade88b8fa39f57aee722dd2e2c5d82e8b262.tar.gz otp-d017ade88b8fa39f57aee722dd2e2c5d82e8b262.tar.bz2 otp-d017ade88b8fa39f57aee722dd2e2c5d82e8b262.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/hipe/arm/hipe_rtl_to_arm.erl')
| -rw-r--r-- | lib/hipe/arm/hipe_rtl_to_arm.erl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/hipe/arm/hipe_rtl_to_arm.erl b/lib/hipe/arm/hipe_rtl_to_arm.erl index ad5a559995..93342aba33 100644 --- a/lib/hipe/arm/hipe_rtl_to_arm.erl +++ b/lib/hipe/arm/hipe_rtl_to_arm.erl @@ -148,10 +148,11 @@ mk_shift_ir(S, Dst, Src1, ShiftOp, Src2) -> mk_li(Tmp, Src1, mk_shift_rr(S, Dst, Tmp, ShiftOp, Src2)). -mk_shift_ri(S, Dst, Src1, ShiftOp, Src2) when is_integer(Src2) -> - if Src2 >= 0, Src2 < 32 -> ok; - true -> io:format("~w: excessive immediate shift ~w\n", [?MODULE,Src2]) - end, +mk_shift_ri(S, Dst, Src1, ShiftOp, 0) + when ShiftOp =:= lsl; ShiftOp =:= lsr; ShiftOp =:= asr -> + [hipe_arm:mk_move(S, Dst, Src1)]; +mk_shift_ri(S, Dst, Src1, ShiftOp, Src2) + when is_integer(Src2), Src2 > 0, Src2 < 32 -> Am1 = {Src1,ShiftOp,Src2}, [hipe_arm:mk_move(S, Dst, Am1)]. |