Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca94f65e authored by Christopher Ferris's avatar Christopher Ferris Committed by Gerrit Code Review
Browse files

Merge "Make the library usable as a library."

parents 5be05733 d226a514

libunwindstack/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -44,6 +44,7 @@ cc_defaults { 
cc_library {

cc_library {

    name: "libunwindstack",

    name: "libunwindstack",

    defaults: ["libunwindstack_flags"],

    defaults: ["libunwindstack_flags"],

    export_include_dirs: ["include"],





    srcs: [

    srcs: [

        "ArmExidx.cpp",

        "ArmExidx.cpp",

libunwindstack/ArmExidx.cpp

+8 −3
Original line number Original line Diff line number Diff line
@@ -21,12 +21,15 @@ 




#include <android-base/stringprintf.h>

#include <android-base/stringprintf.h>





#include <unwindstack/Log.h>

#include <unwindstack/Memory.h>

#include <unwindstack/Regs.h>



#include "ArmExidx.h"

#include "ArmExidx.h"

#include "Check.h"

#include "Check.h"

#include "Log.h"

#include "Machine.h"

#include "Machine.h"

#include "Memory.h"



#include "Regs.h"

namespace unwindstack {





void ArmExidx::LogRawData() {

void ArmExidx::LogRawData() {

  std::string log_str("Raw Data:");

  std::string log_str("Raw Data:");
@@ -684,3 +687,5 @@ bool ArmExidx::Eval() { 
  while (Decode());

  while (Decode());

  return status_ == ARM_STATUS_FINISH;

  return status_ == ARM_STATUS_FINISH;

}

}



}  // namespace unwindstack

libunwindstack/ArmExidx.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,8 @@ 




#include <deque>

#include <deque>





namespace unwindstack {



// Forward declarations.

// Forward declarations.

class Memory;

class Memory;

class RegsArm;

class RegsArm;
@@ -105,4 +107,6 @@ class ArmExidx { 
  bool pc_set_ = false;

  bool pc_set_ = false;

};

};





}  // namespace unwindstack



#endif  // _LIBUNWINDSTACK_ARM_EXIDX_H
 
#endif  // _LIBUNWINDSTACK_ARM_EXIDX_H

libunwindstack/Check.h

+5 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,9 @@ 




#include <stdlib.h>

#include <stdlib.h>





#include "Log.h"

#include <unwindstack/Log.h>



namespace unwindstack {





#define CHECK(assertion)                                   \

#define CHECK(assertion)                                   \

  if (__builtin_expect(!(assertion), false)) {             \

  if (__builtin_expect(!(assertion), false)) {             \
@@ -27,4 +29,6 @@ 
    abort();                                               \

    abort();                                               \

  }

  }





}  // namespace unwindstack



#endif  // _LIBUNWINDSTACK_ERROR_H
 
#endif  // _LIBUNWINDSTACK_ERROR_H

libunwindstack/DwarfCfa.cpp

+8 −3
Original line number Original line Diff line number Diff line
@@ -23,12 +23,15 @@ 




#include <android-base/stringprintf.h>

#include <android-base/stringprintf.h>





#include <unwindstack/DwarfLocation.h>

#include <unwindstack/Log.h>



#include "DwarfCfa.h"

#include "DwarfCfa.h"

#include "DwarfEncoding.h"

#include "DwarfEncoding.h"

#include "DwarfMemory.h"

#include "DwarfError.h"

#include "DwarfOp.h"

#include "DwarfOp.h"

#include "DwarfStructs.h"



#include "Log.h"

namespace unwindstack {





template <typename AddressType>

template <typename AddressType>

constexpr typename DwarfCfa<AddressType>::process_func DwarfCfa<AddressType>::kCallbackTable[64];

constexpr typename DwarfCfa<AddressType>::process_func DwarfCfa<AddressType>::kCallbackTable[64];
@@ -711,3 +714,5 @@ const DwarfCfaInfo::Info DwarfCfaInfo::kTable[64] = { 
// Explicitly instantiate DwarfCfa.

// Explicitly instantiate DwarfCfa.

template class DwarfCfa<uint32_t>;

template class DwarfCfa<uint32_t>;

template class DwarfCfa<uint64_t>;

template class DwarfCfa<uint64_t>;



}  // namespace unwindstack