Always support debugging and profiling.
This eliminates the use of the WITH_DEBUGGER and WITH_PROFILER
conditional compilation flags. We've never shipped a device without
these features, and it's unlikely we ever will. They're not worth
the code clutter they cause.
As usual, since I can't test the x86-atom code I left that alone and
added an item to the TODO list.
Bug 2923442.
Change-Id: I335ebd5193bc86f7641513b1b41c0378839be1fe
diff --git a/vm/interp/Interp.c b/vm/interp/Interp.c
index 506a125..9f44a13 100644
--- a/vm/interp/Interp.c
+++ b/vm/interp/Interp.c
@@ -21,9 +21,7 @@
* facilitates switching between them. The standard interpreter may
* use the "fast" or "portable" implementation.
*
- * Some debugger support functions are included here. Ideally their
- * entire existence would be "#ifdef WITH_DEBUGGER", but we're not that
- * aggressive in other parts of the code yet.
+ * Some debugger support functions are included here.
*/
#include "Dalvik.h"
#include "interp/InterpDefs.h"
@@ -44,12 +42,8 @@
*/
bool dvmBreakpointStartup(void)
{
-#ifdef WITH_DEBUGGER
gDvm.breakpointSet = dvmBreakpointSetAlloc();
return (gDvm.breakpointSet != NULL);
-#else
- return true;
-#endif
}
/*
@@ -57,13 +51,10 @@
*/
void dvmBreakpointShutdown(void)
{
-#ifdef WITH_DEBUGGER
dvmBreakpointSetFree(gDvm.breakpointSet);
-#endif
}
-#ifdef WITH_DEBUGGER
/*
* This represents a breakpoint inserted in the instruction stream.
*
@@ -376,7 +367,6 @@
}
}
}
-#endif /*WITH_DEBUGGER*/
/*
@@ -384,7 +374,6 @@
*/
void dvmInitBreakpoints(void)
{
-#ifdef WITH_DEBUGGER
/* quick sanity check */
BreakpointSet* pSet = gDvm.breakpointSet;
dvmBreakpointSetLock(pSet);
@@ -393,9 +382,6 @@
/* generally not good, but we can keep going */
}
dvmBreakpointSetUnlock(pSet);
-#else
- assert(false);
-#endif
}
/*
@@ -414,14 +400,10 @@
*/
void dvmAddBreakAddr(Method* method, unsigned int instrOffset)
{
-#ifdef WITH_DEBUGGER
BreakpointSet* pSet = gDvm.breakpointSet;
dvmBreakpointSetLock(pSet);
dvmBreakpointSetAdd(pSet, method, instrOffset);
dvmBreakpointSetUnlock(pSet);
-#else
- assert(false);
-#endif
}
/*
@@ -436,18 +418,12 @@
*/
void dvmClearBreakAddr(Method* method, unsigned int instrOffset)
{
-#ifdef WITH_DEBUGGER
BreakpointSet* pSet = gDvm.breakpointSet;
dvmBreakpointSetLock(pSet);
dvmBreakpointSetRemove(pSet, method, instrOffset);
dvmBreakpointSetUnlock(pSet);
-
-#else
- assert(false);
-#endif
}
-#ifdef WITH_DEBUGGER
/*
* Get the original opcode from under a breakpoint.
*
@@ -496,7 +472,6 @@
dvmBreakpointSetFlush(pSet, clazz);
dvmBreakpointSetUnlock(pSet);
}
-#endif
/*
* Add a single step event. Currently this is a global item.
@@ -509,7 +484,6 @@
*/
bool dvmAddSingleStep(Thread* thread, int size, int depth)
{
-#ifdef WITH_DEBUGGER
StepControl* pCtrl = &gDvm.stepControl;
if (pCtrl->active && thread != pCtrl->thread) {
@@ -605,10 +579,6 @@
dvmJdwpStepSizeStr(pCtrl->size));
return true;
-#else
- assert(false);
- return false;
-#endif
}
/*
@@ -616,13 +586,9 @@
*/
void dvmClearSingleStep(Thread* thread)
{
-#ifdef WITH_DEBUGGER
UNUSED_PARAMETER(thread);
gDvm.stepControl.active = false;
-#else
- assert(false);
-#endif
}
@@ -1307,9 +1273,7 @@
interpState.debugTrackedRefStart =
dvmReferenceTableEntries(&self->internalLocalRefTable);
#endif
-#if defined(WITH_PROFILER) || defined(WITH_DEBUGGER)
interpState.debugIsMethodEntry = true;
-#endif
#if defined(WITH_JIT)
dvmJitCalleeSave(interpState.calleeSave);
/* Initialize the state to kJitNot */
@@ -1380,12 +1344,10 @@
LOGVV("threadid=%d: interp STD\n", self->threadId);
change = (*stdInterp)(self, &interpState);
break;
-#if defined(WITH_PROFILER) || defined(WITH_DEBUGGER) || defined(WITH_JIT)
case INTERP_DBG:
LOGVV("threadid=%d: interp DBG\n", self->threadId);
change = dvmInterpretDbg(self, &interpState);
break;
-#endif
default:
dvmAbort();
}