Author: pingbak
Date: Fri Feb 15 17:05:48 2008
New Revision: 47188
URL: http://llvm.org/viewvc/llvm-project?rev=47188view=rev
Log:
Make tblgen a little smarter about constants smaller than i32. Currently,
tblgen will complain if a sign-extended constant does not fit into a
data type smaller than i32, e.g., i16. This causes a problem when certain
hex constants are used, such as 0xff for byte masks or immediate xor
values.
tblgen will try the sign-extended value first and, if the sign extended
value would overflow, it tries to see if the unsigned value will fit.
Consequently, a software developer can now safely incant:
(XORHIr16 R16C:$rA, 0x)
which is somewhat clearer and more informative than incanting:
(XORHIr16 R16C:$rA, (i16 -1))
even if the two are bitwise equivalent.
Tblgen also outputs the 64-bit unsigned constant in the generated ISel code
when getTargetConstant() is invoked.
Modified:
llvm/trunk/include/llvm/ADT/StringExtras.h
llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
llvm/trunk/utils/TableGen/CodeGenDAGPatterns.cpp
llvm/trunk/utils/TableGen/DAGISelEmitter.cpp
Modified: llvm/trunk/include/llvm/ADT/StringExtras.h
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/StringExtras.h?rev=47188r1=47187r2=47188view=diff
==
--- llvm/trunk/include/llvm/ADT/StringExtras.h (original)
+++ llvm/trunk/include/llvm/ADT/StringExtras.h Fri Feb 15 17:05:48 2008
@@ -85,6 +85,10 @@
return utostr(static_castuint64_t(X));
}
+static inline std::string itohexstr(int64_t X) {
+ return utohexstr(static_castuint64_t(X));
+}
+
static inline std::string ftostr(double V) {
char Buffer[200];
sprintf(Buffer, %20.6e, V);
Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp?rev=47188r1=47187r2=47188view=diff
==
--- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp Fri Feb 15 17:05:48 2008
@@ -3852,6 +3852,13 @@
case Expand: assert(0 Shouldn't need to expand other operators here!);
case Legal:
Tmp1 = LegalizeOp(Node-getOperand(0));
+ if (TLI.getOperationAction(Node-getOpcode(), Node-getValueType(0)) ==
+ TargetLowering::Custom) {
+Tmp2 = TLI.LowerOperation(Result, DAG);
+if (Tmp2.Val) {
+ Tmp1 = Tmp2;
+}
+ }
Result = DAG.UpdateNodeOperands(Result, Tmp1);
break;
case Promote:
Modified: llvm/trunk/utils/TableGen/CodeGenDAGPatterns.cpp
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/CodeGenDAGPatterns.cpp?rev=47188r1=47187r2=47188view=diff
==
--- llvm/trunk/utils/TableGen/CodeGenDAGPatterns.cpp (original)
+++ llvm/trunk/utils/TableGen/CodeGenDAGPatterns.cpp Fri Feb 15 17:05:48 2008
@@ -702,10 +702,17 @@
// Make sure that the value is representable for this type.
if (Size 32) {
int Val = (II-getValue() (32-Size)) (32-Size);
-if (Val != II-getValue())
- TP.error(Sign-extended integer value ' +
itostr(II-getValue())+
- ' is out of range for type ' +
- getEnumName(getTypeNum(0)) + '!);
+if (Val != II-getValue()) {
+ // If sign-extended doesn't fit, does it fit as unsigned?
+ unsigned ValueMask = unsigned(MVT::getIntVTBitMask(VT));
+ unsigned UnsignedVal = unsigned(II-getValue());
+
+ if ((ValueMask UnsignedVal) != UnsignedVal) {
+ TP.error(Integer value ' + itostr(II-getValue())+
+' is out of range for type ' +
+getEnumName(getTypeNum(0)) + '!);
+ }
+ }
}
}
}
Modified: llvm/trunk/utils/TableGen/DAGISelEmitter.cpp
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/DAGISelEmitter.cpp?rev=47188r1=47187r2=47188view=diff
==
--- llvm/trunk/utils/TableGen/DAGISelEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/DAGISelEmitter.cpp Fri Feb 15 17:05:48 2008
@@ -730,8 +730,11 @@
const std::string VarName = N-getName();
std::string Val = VariableMap[VarName];
bool ModifiedVal = false;
- assert(!Val.empty()
- Variable referenced but not defined and not caught earlier!);
+ if (Val.empty()) {
+ cerr Variable ' VarName referenced but not defined
+ and not caught earlier!\n;
+ abort();
+ }
if (Val[0] == 'T' Val[1] == 'm' Val[2] == 'p') {
// Already selected this operand, just return the tmpval.
