Remove qemu_tracing dependency.
The feature is not implemented anymore (and has been for a very long time). Moreover, this will allow us to cleanup hardware/ from any QEMU-specific items. BUG=25875346 Change-Id: I71488f4128c737dedf2b28433499fa6ffd29dcb5
This commit is contained in:
parent
44b7339aa2
commit
ecc1972fb0
|
@ -74,10 +74,6 @@ LOCAL_C_INCLUDES += $(LOCAL_EXPORT_C_INCLUDE_DIRS) \
|
|||
external/safe-iop/include
|
||||
LOCAL_SHARED_LIBRARIES := libcutils liblog libutils
|
||||
|
||||
# Really this should go away entirely or at least not depend on
|
||||
# libhardware, but this at least gets us built.
|
||||
LOCAL_SHARED_LIBRARIES += libhardware_legacy
|
||||
LOCAL_CFLAGS += -DWITH_LIB_HARDWARE
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
||||
include $(call all-makefiles-under,$(LOCAL_PATH))
|
||||
|
|
|
@ -22,10 +22,6 @@
|
|||
#include <cutils/log.h>
|
||||
#include <cutils/properties.h>
|
||||
|
||||
#if defined(WITH_LIB_HARDWARE)
|
||||
#include <hardware_legacy/qemu_tracing.h>
|
||||
#endif
|
||||
|
||||
#include <private/pixelflinger/ggl_context.h>
|
||||
|
||||
#include "ARMAssembler.h"
|
||||
|
@ -48,9 +44,6 @@ ARMAssembler::ARMAssembler(const sp<Assembly>& assembly)
|
|||
{
|
||||
mBase = mPC = (uint32_t *)assembly->base();
|
||||
mDuration = ggl_system_time();
|
||||
#if defined(WITH_LIB_HARDWARE)
|
||||
mQemuTracing = true;
|
||||
#endif
|
||||
}
|
||||
|
||||
ARMAssembler::~ARMAssembler()
|
||||
|
@ -184,13 +177,6 @@ int ARMAssembler::generate(const char* name)
|
|||
const char * const format = "generated %s (%d ins) at [%p:%p] in %lld ns\n";
|
||||
ALOGI(format, name, int(pc()-base()), base(), pc(), duration);
|
||||
|
||||
#if defined(WITH_LIB_HARDWARE)
|
||||
if (__builtin_expect(mQemuTracing, 0)) {
|
||||
int err = qemu_add_mapping(uintptr_t(base()), name);
|
||||
mQemuTracing = (err >= 0);
|
||||
}
|
||||
#endif
|
||||
|
||||
char value[PROPERTY_VALUE_MAX];
|
||||
property_get("debug.pf.disasm", value, "0");
|
||||
if (atoi(value) != 0) {
|
||||
|
|
|
@ -167,9 +167,6 @@ private:
|
|||
uint32_t* mPC;
|
||||
uint32_t* mPrologPC;
|
||||
int64_t mDuration;
|
||||
#if defined(WITH_LIB_HARDWARE)
|
||||
bool mQemuTracing;
|
||||
#endif
|
||||
|
||||
struct branch_target_t {
|
||||
inline branch_target_t() : label(0), pc(0) { }
|
||||
|
|
|
@ -33,10 +33,6 @@
|
|||
#include <cutils/log.h>
|
||||
#include <cutils/properties.h>
|
||||
|
||||
#if defined(WITH_LIB_HARDWARE)
|
||||
#include <hardware_legacy/qemu_tracing.h>
|
||||
#endif
|
||||
|
||||
#include <private/pixelflinger/ggl_context.h>
|
||||
|
||||
#include "MIPS64Assembler.h"
|
||||
|
|
|
@ -55,10 +55,6 @@
|
|||
#include <cutils/log.h>
|
||||
#include <cutils/properties.h>
|
||||
|
||||
#if defined(WITH_LIB_HARDWARE)
|
||||
#include <hardware_legacy/qemu_tracing.h>
|
||||
#endif
|
||||
|
||||
#include <private/pixelflinger/ggl_context.h>
|
||||
|
||||
#include "MIPSAssembler.h"
|
||||
|
@ -1411,13 +1407,6 @@ int MIPSAssembler::generate(const char* name)
|
|||
const char * const format = "generated %s (%d ins) at [%p:%p] in %lld ns\n";
|
||||
ALOGI(format, name, int(pc()-base()), base(), pc(), duration);
|
||||
|
||||
#if defined(WITH_LIB_HARDWARE)
|
||||
if (__builtin_expect(mQemuTracing, 0)) {
|
||||
int err = qemu_add_mapping(uintptr_t(base()), name);
|
||||
mQemuTracing = (err >= 0);
|
||||
}
|
||||
#endif
|
||||
|
||||
char value[PROPERTY_VALUE_MAX];
|
||||
value[0] = '\0';
|
||||
|
||||
|
|
|
@ -410,9 +410,6 @@ protected:
|
|||
uint32_t* mPC;
|
||||
uint32_t* mPrologPC;
|
||||
int64_t mDuration;
|
||||
#if defined(WITH_LIB_HARDWARE)
|
||||
bool mQemuTracing;
|
||||
#endif
|
||||
|
||||
struct branch_target_t {
|
||||
inline branch_target_t() : label(0), pc(0) { }
|
||||
|
|
Loading…
Reference in New Issue