T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a type error in the legalizer patterns.

Browse Source 
The carry and borrow values are boolean, so we have to convert them to
an integer type with bint(c) before we can add them to the result.

Also tweak the default legalizer action for unsupported types: Only
attempt a narrowing pattern for lane types > 32 bits.

This was found by @angusholder's new type checks in the verifier.
This commit is contained in:
Jakob Stoklund Olesen
2017-03-29 14:40:12 -07:00
parent a5d4839002
commit 62641d4553
4 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/cretonne/meta/base/legalize.py
View File

@@ -10,7 +10,7 @@ from __future__ import absolute_import
from .instructions import iadd, iadd_cout, iadd_cin, iadd_carry, iadd_imm
from .instructions import isub, isub_bin, isub_bout, isub_borrow
from .instructions import band, bor, bxor, isplit, iconcat
from .instructions import icmp, iconst
from .instructions import icmp, iconst, bint
from cdsl.ast import Var
from cdsl.xform import Rtl, XFormGroup
@@ -40,10 +40,12 @@ b = Var('b')
b1 = Var('b1')
b2 = Var('b2')
b_in = Var('b_in')
b_int = Var('b_int')
c = Var('c')
c1 = Var('c1')
c2 = Var('c2')
c_in = Var('c_in')
c_int = Var('c_int')
xl = Var('xl')
xh = Var('xh')
yl = Var('yl')
@@ -102,21 +104,24 @@ expand.legalize(
a << iadd_cin(x, y, c),
Rtl(
a1 << iadd(x, y),
a << iadd(a1, c)
c_int << bint(c),
a << iadd(a1, c_int)
))
expand.legalize(
a << isub_bin(x, y, b),
Rtl(
a1 << isub(x, y),
a << isub(a1, b)
b_int << bint(b),
a << isub(a1, b_int)
))
expand.legalize(
(a, c) << iadd_carry(x, y, c_in),
Rtl(
(a1, c1) << iadd_cout(x, y),
(a, c2) << iadd_cout(a1, c_in),
c_int << bint(c_in),
(a, c2) << iadd_cout(a1, c_int),
c << bor(c1, c2)
))
@@ -124,7 +129,8 @@ expand.legalize(
(a, b) << isub_borrow(x, y, b_in),
Rtl(
(a1, b1) << isub_bout(x, y),
(a, b2) << isub_bout(a1, b_in),
b_int << bint(b_in),
(a, b2) << isub_bout(a1, b_int),
b << bor(b1, b2)
))