Refactor rel32 searching process for x64 to make it more similar to x86.

courgette/assembly_program.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "courgette/assembly_program.h"
 
 #include <memory.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 388 matching lines @@
         if (!encoded->AddCopy(len, byte_values))
           return nullptr;
         break;
       }
       case REL32: {
         Label* label = static_cast<InstructionWithLabel*>(instruction)->label();
         if (!encoded->AddRel32(label->index_))
           return nullptr;
         break;
       }
-      case REL32ARM: {
+      /*case REL32ARM: {

[huangs, 2016/05/26 18:34:34]

Not sure what this is about?

[etiennep, 2016/05/26 20:50:09]

Whoops, no relation. Took it off.

         Label* label =
             static_cast<InstructionWithLabelARM*>(instruction)->label();
         uint16_t compressed_op =
             static_cast<InstructionWithLabelARM*>(instruction)->compressed_op();
         if (!encoded->AddRel32ARM(compressed_op, label->index_))
           return nullptr;
         break;
-      }
+      }*/
       case ABS32: {
         Label* label = static_cast<InstructionWithLabel*>(instruction)->label();
         if (!encoded->AddAbs32(label->index_))
           return nullptr;
         break;
       }
       case ABS64: {
         Label* label = static_cast<InstructionWithLabel*>(instruction)->label();
         if (!encoded->AddAbs64(label->index_))
           return nullptr;
@@ skipping 52 matching lines @@
 Status Encode(const AssemblyProgram& program,
               std::unique_ptr<EncodedProgram>* output) {
   // Explicitly release any memory associated with the output before encoding.
   output->reset();
 
   *output = program.Encode();
   return (*output) ? C_OK : C_GENERAL_ERROR;
 }
 
 }  // namespace courgette