[llvm-commits] [llvm] r138825 - in /llvm/trunk: include/llvm/MC/EDInstInfo.h lib/MC/MCDisassembler/EDInst.h lib/MC/MCDisassembler/EDToken.cpp lib/MC/MCDisassembler/EDToken.h lib/Target/X86/X86AsmPrinter.cpp unittests/VMCore/MetadataTest.cpp

[Jeffrey Yasskin]

Author: jyasskin
Date: Tue Aug 30 15:53:29 2011
New Revision: 138825

URL: http://llvm.org/viewvc/llvm-project?rev=138825&view=rev
Log:
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.

Modified:
    llvm/trunk/include/llvm/MC/EDInstInfo.h
    llvm/trunk/lib/MC/MCDisassembler/EDInst.h
    llvm/trunk/lib/MC/MCDisassembler/EDToken.cpp
    llvm/trunk/lib/MC/MCDisassembler/EDToken.h
    llvm/trunk/lib/Target/X86/X86AsmPrinter.cpp
    llvm/trunk/unittests/VMCore/MetadataTest.cpp

Modified: llvm/trunk/include/llvm/MC/EDInstInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/EDInstInfo.h?rev=138825&r1=138824&r2=138825&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MC/EDInstInfo.h (original)
+++ llvm/trunk/include/llvm/MC/EDInstInfo.h Tue Aug 30 15:53:29 2011
@@ -21,7 +21,7 @@
   uint8_t       numOperands;
   uint8_t       operandTypes[EDIS_MAX_OPERANDS];
   uint8_t       operandFlags[EDIS_MAX_OPERANDS];
-  const char    operandOrders[EDIS_MAX_SYNTAXES][EDIS_MAX_OPERANDS];
+  const signed char operandOrders[EDIS_MAX_SYNTAXES][EDIS_MAX_OPERANDS];
 };
   
 } // namespace llvm

Modified: llvm/trunk/lib/MC/MCDisassembler/EDInst.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCDisassembler/EDInst.h?rev=138825&r1=138824&r2=138825&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCDisassembler/EDInst.h (original)
+++ llvm/trunk/lib/MC/MCDisassembler/EDInst.h Tue Aug 30 15:53:29 2011
@@ -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;

Modified: llvm/trunk/lib/MC/MCDisassembler/EDToken.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCDisassembler/EDToken.cpp?rev=138825&r1=138824&r2=138825&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCDisassembler/EDToken.cpp (original)
+++ llvm/trunk/lib/MC/MCDisassembler/EDToken.cpp Tue Aug 30 15:53:29 2011
@@ -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;

Modified: llvm/trunk/lib/MC/MCDisassembler/EDToken.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCDisassembler/EDToken.h?rev=138825&r1=138824&r2=138825&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCDisassembler/EDToken.h (original)
+++ llvm/trunk/lib/MC/MCDisassembler/EDToken.h Tue Aug 30 15:53:29 2011
@@ -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

Modified: llvm/trunk/lib/Target/X86/X86AsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86AsmPrinter.cpp?rev=138825&r1=138824&r2=138825&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86AsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86AsmPrinter.cpp Tue Aug 30 15:53:29 2011
@@ -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*/);
       }
 

Modified: llvm/trunk/unittests/VMCore/MetadataTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/VMCore/MetadataTest.cpp?rev=138825&r1=138824&r2=138825&view=diff
==============================================================================
--- llvm/trunk/unittests/VMCore/MetadataTest.cpp (original)
+++ llvm/trunk/unittests/VMCore/MetadataTest.cpp Tue Aug 30 15:53:29 2011
@@ -63,7 +63,7 @@
 
 // Test printing of MDString with non-printable characters.
 TEST_F(MDStringTest, PrintingComplex) {
-  char str[5] = {0, '\n', '"', '\\', -1};
+  char str[5] = {0, '\n', '"', '\\', (char)-1};
   MDString *s = MDString::get(Context, StringRef(str+0, 5));
   std::string Str;
   raw_string_ostream oss(Str);