[XCore] Fix instruction selection for zext, mkmsk instructions.

r182680 replaced CountLeadingZeros_32 with a template function
countLeadingZeros that relies on using the correct argument type to give
the right result. The type passed in the XCore backend after this
revision was incorrect in a couple of places.

Patch by Robert Lytton.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@185430 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Richard Osborne 2013-07-02 14:46:34 +00:00
parent 0a39e26433
commit 850ba41ed4
4 changed files with 20 additions and 2 deletions

View File

@ -115,7 +115,7 @@ SDNode *XCoreDAGToDAGISel::Select(SDNode *N) {
if (immMskBitp(N)) {
// Transformation function: get the size of a mask
// Look for the first non-zero bit
SDValue MskSize = getI32Imm(32 - countLeadingZeros(Val));
SDValue MskSize = getI32Imm(32 - countLeadingZeros((uint32_t)Val));
return CurDAG->getMachineNode(XCore::MKMSK_rus, dl,
MVT::i32, MskSize);
}

View File

@ -84,7 +84,7 @@ def msksize_xform : SDNodeXForm<imm, [{
// Transformation function: get the size of a mask
assert(isMask_32(N->getZExtValue()));
// look for the first non-zero bit
return getI32Imm(32 - countLeadingZeros(N->getZExtValue()));
return getI32Imm(32 - countLeadingZeros((uint32_t)N->getZExtValue()));
}]>;
def neg_xform : SDNodeXForm<imm, [{

View File

@ -9,3 +9,11 @@ define i32 @f() {
entry:
ret i32 12345678
}
define i32 @g() {
entry:
; CHECK: g:
; CHECK: mkmsk r0, 1
; CHECK: retsp 0
ret i32 1;
}

View File

@ -0,0 +1,10 @@
; RUN: llc -march=xcore < %s | FileCheck %s
define i32 @f(i1 %a) {
entry:
; CHECK: f
; CHECK: zext r0, 1
; CHECK: retsp 0
%b= zext i1 %a to i32
ret i32 %b
}