summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid 'Digit' Turner2016-04-20 10:10:28 -0500
committerDavid 'Digit' Turner2016-06-21 13:24:55 -0500
commitecc1972fb080734d55939997008f57063556e2b4 (patch)
tree6cf422516a5b388bd8f78684bd262230721fa691 /libpixelflinger
parent44b7339aa207e212dd10b0991488d77665b50df0 (diff)
downloadplatform-system-core-ecc1972fb080734d55939997008f57063556e2b4.tar.gz
platform-system-core-ecc1972fb080734d55939997008f57063556e2b4.tar.xz
platform-system-core-ecc1972fb080734d55939997008f57063556e2b4.zip
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
Diffstat (limited to 'libpixelflinger')
-rw-r--r--libpixelflinger/Android.mk4
-rw-r--r--libpixelflinger/codeflinger/ARMAssembler.cpp14
-rw-r--r--libpixelflinger/codeflinger/ARMAssembler.h3
-rw-r--r--libpixelflinger/codeflinger/MIPS64Assembler.cpp4
-rw-r--r--libpixelflinger/codeflinger/MIPSAssembler.cpp11
-rw-r--r--libpixelflinger/codeflinger/MIPSAssembler.h3
6 files changed, 0 insertions, 39 deletions
diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk
index 9a937f8f4..55891db99 100644
--- a/libpixelflinger/Android.mk
+++ b/libpixelflinger/Android.mk
@@ -74,10 +74,6 @@ LOCAL_C_INCLUDES += $(LOCAL_EXPORT_C_INCLUDE_DIRS) \
74 external/safe-iop/include 74 external/safe-iop/include
75LOCAL_SHARED_LIBRARIES := libcutils liblog libutils 75LOCAL_SHARED_LIBRARIES := libcutils liblog libutils
76 76
77# Really this should go away entirely or at least not depend on
78# libhardware, but this at least gets us built.
79LOCAL_SHARED_LIBRARIES += libhardware_legacy
80LOCAL_CFLAGS += -DWITH_LIB_HARDWARE
81include $(BUILD_SHARED_LIBRARY) 77include $(BUILD_SHARED_LIBRARY)
82 78
83include $(call all-makefiles-under,$(LOCAL_PATH)) 79include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/libpixelflinger/codeflinger/ARMAssembler.cpp b/libpixelflinger/codeflinger/ARMAssembler.cpp
index 92243da9d..849512ac7 100644
--- a/libpixelflinger/codeflinger/ARMAssembler.cpp
+++ b/libpixelflinger/codeflinger/ARMAssembler.cpp
@@ -22,10 +22,6 @@
22#include <cutils/log.h> 22#include <cutils/log.h>
23#include <cutils/properties.h> 23#include <cutils/properties.h>
24 24
25#if defined(WITH_LIB_HARDWARE)
26#include <hardware_legacy/qemu_tracing.h>
27#endif
28
29#include <private/pixelflinger/ggl_context.h> 25#include <private/pixelflinger/ggl_context.h>
30 26
31#include "ARMAssembler.h" 27#include "ARMAssembler.h"
@@ -48,9 +44,6 @@ ARMAssembler::ARMAssembler(const sp<Assembly>& assembly)
48{ 44{
49 mBase = mPC = (uint32_t *)assembly->base(); 45 mBase = mPC = (uint32_t *)assembly->base();
50 mDuration = ggl_system_time(); 46 mDuration = ggl_system_time();
51#if defined(WITH_LIB_HARDWARE)
52 mQemuTracing = true;
53#endif
54} 47}
55 48
56ARMAssembler::~ARMAssembler() 49ARMAssembler::~ARMAssembler()
@@ -184,13 +177,6 @@ int ARMAssembler::generate(const char* name)
184 const char * const format = "generated %s (%d ins) at [%p:%p] in %lld ns\n"; 177 const char * const format = "generated %s (%d ins) at [%p:%p] in %lld ns\n";
185 ALOGI(format, name, int(pc()-base()), base(), pc(), duration); 178 ALOGI(format, name, int(pc()-base()), base(), pc(), duration);
186 179
187#if defined(WITH_LIB_HARDWARE)
188 if (__builtin_expect(mQemuTracing, 0)) {
189 int err = qemu_add_mapping(uintptr_t(base()), name);
190 mQemuTracing = (err >= 0);
191 }
192#endif
193
194 char value[PROPERTY_VALUE_MAX]; 180 char value[PROPERTY_VALUE_MAX];
195 property_get("debug.pf.disasm", value, "0"); 181 property_get("debug.pf.disasm", value, "0");
196 if (atoi(value) != 0) { 182 if (atoi(value) != 0) {
diff --git a/libpixelflinger/codeflinger/ARMAssembler.h b/libpixelflinger/codeflinger/ARMAssembler.h
index e0c7646cf..7178c65df 100644
--- a/libpixelflinger/codeflinger/ARMAssembler.h
+++ b/libpixelflinger/codeflinger/ARMAssembler.h
@@ -167,9 +167,6 @@ private:
167 uint32_t* mPC; 167 uint32_t* mPC;
168 uint32_t* mPrologPC; 168 uint32_t* mPrologPC;
169 int64_t mDuration; 169 int64_t mDuration;
170#if defined(WITH_LIB_HARDWARE)
171 bool mQemuTracing;
172#endif
173 170
174 struct branch_target_t { 171 struct branch_target_t {
175 inline branch_target_t() : label(0), pc(0) { } 172 inline branch_target_t() : label(0), pc(0) { }
diff --git a/libpixelflinger/codeflinger/MIPS64Assembler.cpp b/libpixelflinger/codeflinger/MIPS64Assembler.cpp
index 672040bc9..b9f31ff11 100644
--- a/libpixelflinger/codeflinger/MIPS64Assembler.cpp
+++ b/libpixelflinger/codeflinger/MIPS64Assembler.cpp
@@ -33,10 +33,6 @@
33#include <cutils/log.h> 33#include <cutils/log.h>
34#include <cutils/properties.h> 34#include <cutils/properties.h>
35 35
36#if defined(WITH_LIB_HARDWARE)
37#include <hardware_legacy/qemu_tracing.h>
38#endif
39
40#include <private/pixelflinger/ggl_context.h> 36#include <private/pixelflinger/ggl_context.h>
41 37
42#include "MIPS64Assembler.h" 38#include "MIPS64Assembler.h"
diff --git a/libpixelflinger/codeflinger/MIPSAssembler.cpp b/libpixelflinger/codeflinger/MIPSAssembler.cpp
index 5497faeb0..ae06a1344 100644
--- a/libpixelflinger/codeflinger/MIPSAssembler.cpp
+++ b/libpixelflinger/codeflinger/MIPSAssembler.cpp
@@ -55,10 +55,6 @@
55#include <cutils/log.h> 55#include <cutils/log.h>
56#include <cutils/properties.h> 56#include <cutils/properties.h>
57 57
58#if defined(WITH_LIB_HARDWARE)
59#include <hardware_legacy/qemu_tracing.h>
60#endif
61
62#include <private/pixelflinger/ggl_context.h> 58#include <private/pixelflinger/ggl_context.h>
63 59
64#include "MIPSAssembler.h" 60#include "MIPSAssembler.h"
@@ -1411,13 +1407,6 @@ int MIPSAssembler::generate(const char* name)
1411 const char * const format = "generated %s (%d ins) at [%p:%p] in %lld ns\n"; 1407 const char * const format = "generated %s (%d ins) at [%p:%p] in %lld ns\n";
1412 ALOGI(format, name, int(pc()-base()), base(), pc(), duration); 1408 ALOGI(format, name, int(pc()-base()), base(), pc(), duration);
1413 1409
1414#if defined(WITH_LIB_HARDWARE)
1415 if (__builtin_expect(mQemuTracing, 0)) {
1416 int err = qemu_add_mapping(uintptr_t(base()), name);
1417 mQemuTracing = (err >= 0);
1418 }
1419#endif
1420
1421 char value[PROPERTY_VALUE_MAX]; 1410 char value[PROPERTY_VALUE_MAX];
1422 value[0] = '\0'; 1411 value[0] = '\0';
1423 1412
diff --git a/libpixelflinger/codeflinger/MIPSAssembler.h b/libpixelflinger/codeflinger/MIPSAssembler.h
index b53fefb34..c1178b6fe 100644
--- a/libpixelflinger/codeflinger/MIPSAssembler.h
+++ b/libpixelflinger/codeflinger/MIPSAssembler.h
@@ -410,9 +410,6 @@ protected:
410 uint32_t* mPC; 410 uint32_t* mPC;
411 uint32_t* mPrologPC; 411 uint32_t* mPrologPC;
412 int64_t mDuration; 412 int64_t mDuration;
413#if defined(WITH_LIB_HARDWARE)
414 bool mQemuTracing;
415#endif
416 413
417 struct branch_target_t { 414 struct branch_target_t {
418 inline branch_target_t() : label(0), pc(0) { } 415 inline branch_target_t() : label(0), pc(0) { }