My question here is similar to the question on other commits here:<div><br></div><div>What is the warning or error that detects this? Is it correct?</div><div><br></div><div>If so, could you file bugs to add this to Clang? We shouldn't have this type of divergent syntaxes between GCC and Clang...</div>
<div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, Sep 5, 2012 at 5:17 PM, Roman Divacky <span dir="ltr"><<a href="mailto:rdivacky@freebsd.org" target="_blank">rdivacky@freebsd.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rdivacky<br>
Date: Wed Sep  5 16:17:34 2012<br>
New Revision: 163247<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=163247&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=163247&view=rev</a><br>
Log:<br>
Use const properly so that we dont remove const qualifier from region and MII<br>
by casting. Found with gcc48.<br>
<br>
Modified:<br>
    llvm/trunk/lib/Target/X86/Disassembler/X86Disassembler.cpp<br>
    llvm/trunk/lib/Target/X86/Disassembler/X86DisassemblerDecoder.c<br>
    llvm/trunk/lib/Target/X86/Disassembler/X86DisassemblerDecoder.h<br>
<br>
Modified: llvm/trunk/lib/Target/X86/Disassembler/X86Disassembler.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/Disassembler/X86Disassembler.cpp?rev=163247&r1=163246&r2=163247&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/Disassembler/X86Disassembler.cpp?rev=163247&r1=163246&r2=163247&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/lib/Target/X86/Disassembler/X86Disassembler.cpp (original)<br>
+++ llvm/trunk/lib/Target/X86/Disassembler/X86Disassembler.cpp Wed Sep  5 16:17:34 2012<br>
@@ -44,7 +44,7 @@<br>
   dbgs() << file << ":" << line << ": " << s;<br>
 }<br>
<br>
-const char *x86DisassemblerGetInstrName(unsigned Opcode, void *mii) {<br>
+const char *x86DisassemblerGetInstrName(unsigned Opcode, const void *mii) {<br>
   const MCInstrInfo *MII = static_cast<const MCInstrInfo *>(mii);<br>
   return MII->getName(Opcode);<br>
 }<br>
@@ -95,8 +95,8 @@<br>
 ///                   be a pointer to a MemoryObject.<br>
 /// @param byte     - A pointer to the byte to be read.<br>
 /// @param address  - The address to be read.<br>
-static int regionReader(void* arg, uint8_t* byte, uint64_t address) {<br>
-  MemoryObject* region = static_cast<MemoryObject*>(arg);<br>
+static int regionReader(const void* arg, uint8_t* byte, uint64_t address) {<br>
+  const MemoryObject* region = static_cast<const MemoryObject*>(arg);<br>
   return region->readByte(address, byte);<br>
 }<br>
<br>
@@ -135,10 +135,10 @@<br>
<br>
   int ret = decodeInstruction(&internalInstr,<br>
                               regionReader,<br>
-                              (void*)&region,<br>
+                              (const void*)&region,<br>
                               loggerFn,<br>
                               (void*)&vStream,<br>
-                              (void*)MII,<br>
+                              (const void*)MII,<br>
                               address,<br>
                               fMode);<br>
<br>
<br>
Modified: llvm/trunk/lib/Target/X86/Disassembler/X86DisassemblerDecoder.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/Disassembler/X86DisassemblerDecoder.c?rev=163247&r1=163246&r2=163247&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/Disassembler/X86DisassemblerDecoder.c?rev=163247&r1=163246&r2=163247&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/lib/Target/X86/Disassembler/X86DisassemblerDecoder.c (original)<br>
+++ llvm/trunk/lib/Target/X86/Disassembler/X86DisassemblerDecoder.c Wed Sep  5 16:17:34 2012<br>
@@ -719,7 +719,7 @@<br>
  * @return      - 0 if the ModR/M could be read when needed or was not needed;<br>
  *                nonzero otherwise.<br>
  */<br>
-static int getID(struct InternalInstruction* insn, void *miiArg) {<br>
+static int getID(struct InternalInstruction* insn, const void *miiArg) {<br>
   uint8_t attrMask;<br>
   uint16_t instructionID;<br>
<br>
@@ -1621,10 +1621,10 @@<br>
  */<br>
 int decodeInstruction(struct InternalInstruction* insn,<br>
                       byteReader_t reader,<br>
-                      void* readerArg,<br>
+                      const void* readerArg,<br>
                       dlog_t logger,<br>
                       void* loggerArg,<br>
-                      void* miiArg,<br>
+                      const void* miiArg,<br>
                       uint64_t startLoc,<br>
                       DisassemblerMode mode) {<br>
   memset(insn, 0, sizeof(struct InternalInstruction));<br>
<br>
Modified: llvm/trunk/lib/Target/X86/Disassembler/X86DisassemblerDecoder.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/Disassembler/X86DisassemblerDecoder.h?rev=163247&r1=163246&r2=163247&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/Disassembler/X86DisassemblerDecoder.h?rev=163247&r1=163246&r2=163247&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/lib/Target/X86/Disassembler/X86DisassemblerDecoder.h (original)<br>
+++ llvm/trunk/lib/Target/X86/Disassembler/X86DisassemblerDecoder.h Wed Sep  5 16:17:34 2012<br>
@@ -403,7 +403,7 @@<br>
  *                  be read from.<br>
  * @return        - -1 if the byte cannot be read for any reason; 0 otherwise.<br>
  */<br>
-typedef int (*byteReader_t)(void* arg, uint8_t* byte, uint64_t address);<br>
+typedef int (*byteReader_t)(const void* arg, uint8_t* byte, uint64_t address);<br>
<br>
 /*<br>
  * dlog_t - Type for the logging function that the consumer can provide to<br>
@@ -422,7 +422,7 @@<br>
   /* Reader interface (C) */<br>
   byteReader_t reader;<br>
   /* Opaque value passed to the reader */<br>
-  void* readerArg;<br>
+  const void* readerArg;<br>
   /* The address of the next byte to read via the reader */<br>
   uint64_t readerCursor;<br>
<br>
@@ -561,10 +561,10 @@<br>
  */<br>
 int decodeInstruction(struct InternalInstruction* insn,<br>
                       byteReader_t reader,<br>
-                      void* readerArg,<br>
+                      const void* readerArg,<br>
                       dlog_t logger,<br>
                       void* loggerArg,<br>
-                      void* miiArg,<br>
+                      const void* miiArg,<br>
                       uint64_t startLoc,<br>
                       DisassemblerMode mode);<br>
<br>
@@ -579,7 +579,7 @@<br>
                           unsigned line,<br>
                           const char *s);<br>
<br>
-const char *x86DisassemblerGetInstrName(unsigned Opcode, void *mii);<br>
+const char *x86DisassemblerGetInstrName(unsigned Opcode, const void *mii);<br>
<br>
 #ifdef __cplusplus<br>
 }<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>