[llvm] r228309 - revert 228308. The code has changed since the review

[Sylvestre Ledru]

Author: sylvestre
Date: Thu Feb  5 10:35:44 2015
New Revision: 228309

URL: http://llvm.org/viewvc/llvm-project?rev=228309&view=rev
Log:
revert 228308. The code has changed since the review

Modified:
    llvm/trunk/tools/llvm-objdump/MachODump.cpp

Modified: llvm/trunk/tools/llvm-objdump/MachODump.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objdump/MachODump.cpp?rev=228309&r1=228308&r2=228309&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objdump/MachODump.cpp (original)
+++ llvm/trunk/tools/llvm-objdump/MachODump.cpp Thu Feb  5 10:35:44 2015
@@ -1519,20 +1519,35 @@ int SymbolizerGetOpInfo(void *DisInfo, u
       const char *name = SymName.data();
       op_info->AddSymbol.Present = 1;
       op_info->AddSymbol.Name = name;
-      switch (r_type) {
-      case MachO::ARM_RELOC_HALF:
-        if ((r_length & 0x1) == 1) {
-          op_info->Value = value << 16 | other_half;
-          op_info->VariantKind = LLVMDisassembler_VariantKind_ARM_HI16;
-        } else {
-          op_info->Value = other_half << 16 | value;
-          op_info->VariantKind = LLVMDisassembler_VariantKind_ARM_LO16;
+      if (value != 0) {
+        switch (r_type) {
+        case MachO::ARM_RELOC_HALF:
+          if ((r_length & 0x1) == 1) {
+            op_info->Value = value << 16 | other_half;
+            op_info->VariantKind = LLVMDisassembler_VariantKind_ARM_HI16;
+          } else {
+            op_info->Value = other_half << 16 | value;
+            op_info->VariantKind = LLVMDisassembler_VariantKind_ARM_LO16;
+          }
+          break;
+        default:
+          break;
         }
-        break;
-      default:
+      } else {
+        switch (r_type) {
+        case MachO::ARM_RELOC_HALF:
+          if ((r_length & 0x1) == 1) {
+            op_info->Value = value << 16 | other_half;
+            op_info->VariantKind = LLVMDisassembler_VariantKind_ARM_HI16;
+          } else {
+            op_info->Value = other_half << 16 | value;
+            op_info->VariantKind = LLVMDisassembler_VariantKind_ARM_LO16;
+          }
+          break;
+        default:
           break;
+        }
       }
-    }
       return 1;
     }
     // If we have a branch that is not an external relocation entry then