Fix C++0x narrowing errors when char is unsigned.
In the case of EDInstInfo, this would actually cause a bug when -1 became 255
and was then compared >=0 in llvm-mc/Disassembler.cpp.
llvm-svn: 138825
diff --git a/llvm/lib/MC/MCDisassembler/EDInst.h b/llvm/lib/MC/MCDisassembler/EDInst.h
index ceb9505..6b78dc8 100644
--- a/llvm/lib/MC/MCDisassembler/EDInst.h
+++ b/llvm/lib/MC/MCDisassembler/EDInst.h
@@ -73,7 +73,7 @@
std::string String;
/// The order in which operands from the InstInfo's operand information appear
/// in String
- const char* OperandOrder;
+ const signed char* OperandOrder;
/// The result of the parseOperands() function
CachedResult ParseResult;
diff --git a/llvm/lib/MC/MCDisassembler/EDToken.cpp b/llvm/lib/MC/MCDisassembler/EDToken.cpp
index edbe0e0..5f6c9df 100644
--- a/llvm/lib/MC/MCDisassembler/EDToken.cpp
+++ b/llvm/lib/MC/MCDisassembler/EDToken.cpp
@@ -87,7 +87,7 @@
int EDToken::tokenize(std::vector<EDToken*> &tokens,
std::string &str,
- const char *operandOrder,
+ const signed char *operandOrder,
EDDisassembler &disassembler) {
SmallVector<MCParsedAsmOperand*, 5> parsedOperands;
SmallVector<AsmToken, 10> asmTokens;
diff --git a/llvm/lib/MC/MCDisassembler/EDToken.h b/llvm/lib/MC/MCDisassembler/EDToken.h
index ba46707..384079b 100644
--- a/llvm/lib/MC/MCDisassembler/EDToken.h
+++ b/llvm/lib/MC/MCDisassembler/EDToken.h
@@ -125,7 +125,7 @@
// assembly syntax
static int tokenize(std::vector<EDToken*> &tokens,
std::string &str,
- const char *operandOrder,
+ const signed char *operandOrder,
EDDisassembler &disassembler);
/// getString - Directs a character pointer to the string, returning 0 on
diff --git a/llvm/lib/Target/X86/X86AsmPrinter.cpp b/llvm/lib/Target/X86/X86AsmPrinter.cpp
index 072840c..4c3ff02 100644
--- a/llvm/lib/Target/X86/X86AsmPrinter.cpp
+++ b/llvm/lib/Target/X86/X86AsmPrinter.cpp
@@ -504,8 +504,8 @@
// .indirect_symbol _foo
OutStreamer.EmitSymbolAttribute(Stubs[i].second.getPointer(),
MCSA_IndirectSymbol);
- // hlt; hlt; hlt; hlt; hlt hlt = 0xf4 = -12.
- const char HltInsts[] = { -12, -12, -12, -12, -12 };
+ // hlt; hlt; hlt; hlt; hlt hlt = 0xf4.
+ const char HltInsts[] = "\xf4\xf4\xf4\xf4\xf4";
OutStreamer.EmitBytes(StringRef(HltInsts, 5), 0/*addrspace*/);
}