old_contents: # Copyright (c) 2014, Fundacion Dr. Manuel Sadosky
  # All rights reserved.
  
  # Redistribution and use in source and binary forms, with or without
  # modification, are permitted provided that the following conditions are met:
  
  # 1. Redistributions of source code must retain the above copyright notice, this
  # list of conditions and the following disclaimer.
  
  # 2. Redistributions in binary form must reproduce the above copyright notice,
  # this list of conditions and the following disclaimer in the documentation
  # and/or other materials provided with the distribution.
  
  # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
  # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  # SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
  from barf.arch.arm.armbase import ArmImmediateOperand
  from barf.arch.x86.x86base import X86ImmediateOperand
  
  
  def extract_branch_target(asm_instruction):
      address = None
  
      # TODO Remove arch dependent code
      target_oprnd = asm_instruction.operands[0]
      if isinstance(target_oprnd, X86ImmediateOperand) or \
         isinstance(target_oprnd, ArmImmediateOperand):
          address = target_oprnd.immediate
  
      return address
  
  def extract_call_target(asm_instruction):
      address = None
  
      # TODO Remove arch dependent code
      target_oprnd = asm_instruction.operands[0]
      if isinstance(target_oprnd, X86ImmediateOperand) or \
         isinstance(target_oprnd, ArmImmediateOperand):
          address = target_oprnd.immediate
  
      return address
new_contents: # Copyright (c) 2014, Fundacion Dr. Manuel Sadosky
  # All rights reserved.
  
  # Redistribution and use in source and binary forms, with or without
  # modification, are permitted provided that the following conditions are met:
  
  # 1. Redistributions of source code must retain the above copyright notice, this
  # list of conditions and the following disclaimer.
  
  # 2. Redistributions in binary form must reproduce the above copyright notice,
  # this list of conditions and the following disclaimer in the documentation
  # and/or other materials provided with the distribution.
  
  # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
  # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  # SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
  from barf.arch.arm.armbase import ArmImmediateOperand
  from barf.arch.x86.x86base import X86ImmediateOperand
  
  
  def extract_branch_target(asm_instruction):
      address = None
  
      target_oprnd = asm_instruction.operands[0]
      if isinstance(target_oprnd, X86ImmediateOperand) or \
         isinstance(target_oprnd, ArmImmediateOperand):
          address = target_oprnd.immediate
  
      return address
  
  def extract_call_target(asm_instruction):
      address = None
  
      target_oprnd = asm_instruction.operands[0]
      if isinstance(target_oprnd, X86ImmediateOperand) or \
         isinstance(target_oprnd, ArmImmediateOperand):
          address = target_oprnd.immediate
  
      return address
subject: Remove old TODO items