[llvm-commits] [llvm] r105790 - /llvm/trunk/lib/System/Disassembler.cpp

[Duncan Sands]

Author: baldrick
Date: Thu Jun 10 11:23:15 2010
New Revision: 105790

URL: http://llvm.org/viewvc/llvm-project?rev=105790&view=rev
Log:
Avoid "variable 'bits' set but not used [-Wunused-but-set-variable]"
warnings with gcc-4.6, by not setting bits when the result is not
used.

Modified:
    llvm/trunk/lib/System/Disassembler.cpp

Modified: llvm/trunk/lib/System/Disassembler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/System/Disassembler.cpp?rev=105790&r1=105789&r2=105790&view=diff
==============================================================================
--- llvm/trunk/lib/System/Disassembler.cpp (original)
+++ llvm/trunk/lib/System/Disassembler.cpp Thu Jun 10 11:23:15 2010
@@ -44,33 +44,29 @@
                                          uint64_t pc) {
   std::stringstream res;
 
-#if defined (__i386__) || defined (__amd64__) || defined (__x86_64__)
+#if (defined (__i386__) || defined (__amd64__) || defined (__x86_64__)) \
+  && USE_UDIS86
   unsigned bits;
 # if defined(__i386__)
   bits = 32;
 # else
   bits = 64;
 # endif
-  
-# if USE_UDIS86
+
   ud_t ud_obj;
-   
+
   ud_init(&ud_obj);
   ud_set_input_buffer(&ud_obj, start, length);
   ud_set_mode(&ud_obj, bits);
   ud_set_pc(&ud_obj, pc);
   ud_set_syntax(&ud_obj, UD_SYN_ATT);
-  
+
   res << std::setbase(16)
       << std::setw(bits/4);
-  
+
   while (ud_disassemble(&ud_obj)) {
     res << ud_insn_off(&ud_obj) << ":\t" << ud_insn_asm(&ud_obj) << "\n";
   }
-# else
-  res << "No disassembler available. See configure help for options.\n";
-# endif
-  
 #else
   res << "No disassembler available. See configure help for options.\n";
 #endif