final cleaned revision (I hope)
This commit is contained in:
@@ -47,24 +47,28 @@ public:
|
||||
class Tracer
|
||||
{
|
||||
public:
|
||||
|
||||
struct trace_info
|
||||
{
|
||||
trace_info() : cip(0), frm(0), used(false), next(NULL), prev(NULL)
|
||||
{
|
||||
};
|
||||
trace_info() : cip(0), frm(0), used(false), next(NULL), prev(NULL) {};
|
||||
|
||||
cell cip;
|
||||
cell frm;
|
||||
|
||||
trace_info *next;
|
||||
trace_info *prev;
|
||||
|
||||
bool used;
|
||||
};
|
||||
|
||||
public:
|
||||
Tracer() : m_Error(0), m_pStart(NULL), m_pEnd(NULL), m_Reset(true) { };
|
||||
Tracer() : m_Error(0), m_pStart(NULL), m_pEnd(NULL), m_Reset(true) {};
|
||||
~Tracer();
|
||||
public:
|
||||
void StepI(cell frm, cell cip);
|
||||
void Reset();
|
||||
void Clear();
|
||||
|
||||
Debugger::Tracer::trace_info *GetStart() const;
|
||||
Debugger::Tracer::trace_info *GetEnd() const;
|
||||
public:
|
||||
@@ -72,14 +76,15 @@ public:
|
||||
private:
|
||||
trace_info *m_pStart;
|
||||
trace_info *m_pEnd;
|
||||
|
||||
bool m_Reset;
|
||||
};
|
||||
|
||||
public:
|
||||
Debugger(AMX *pAmx, AMX_DBG *pAmxDbg) :
|
||||
m_pAmx(pAmx), m_pAmxDbg(pAmxDbg), m_Top(-1)
|
||||
{
|
||||
_CacheAmxOpcodeList();
|
||||
};
|
||||
Debugger(AMX *pAmx, AMX_DBG *pAmxDbg) : m_pAmx(pAmx), m_pAmxDbg(pAmxDbg), m_Top(-1)
|
||||
{
|
||||
_CacheAmxOpcodeList();
|
||||
};
|
||||
~Debugger();
|
||||
public:
|
||||
//Begin a trace for a function
|
||||
@@ -104,7 +109,7 @@ public:
|
||||
//Returns true if an error exists
|
||||
bool ErrorExists();
|
||||
|
||||
//Formats the error message into a buffer.
|
||||
//Formats the error message into a buffer.
|
||||
//returns length of data copied, or -1 if there is no error.
|
||||
int FormatError(char *buffer, size_t maxLength);
|
||||
|
||||
@@ -123,19 +128,24 @@ public:
|
||||
public:
|
||||
//generic static opcode breaker
|
||||
static int AMXAPI DebugHook(AMX *amx);
|
||||
|
||||
static void FmtGenericMsg(AMX *amx, int error, char buffer[], size_t maxLength);
|
||||
static void GenericMessage(AMX *amx, int error);
|
||||
private:
|
||||
void _CacheAmxOpcodeList();
|
||||
|
||||
int _GetOpcodeFromCip(cell cip, cell *&addr);
|
||||
cell _CipAsVa(cell cip);
|
||||
|
||||
const char *_GetFilename();
|
||||
public:
|
||||
AMX *m_pAmx;
|
||||
AMX_DBG *m_pAmxDbg;
|
||||
|
||||
int m_Top;
|
||||
cell *m_pOpcodeList;
|
||||
String m_FileName;
|
||||
|
||||
CVector<Tracer *> m_pCalls;
|
||||
};
|
||||
|
||||
@@ -148,11 +158,8 @@ typedef Debugger::Tracer::trace_info trace_info_t;
|
||||
class Handler
|
||||
{
|
||||
public:
|
||||
Handler(AMX *pAmx) : m_pAmx(pAmx),
|
||||
m_iErrFunc(-1), m_iModFunc(-1), m_iNatFunc(-1),
|
||||
m_Handling(false), m_InNativeFilter(false)
|
||||
{ };
|
||||
~Handler() { };
|
||||
Handler(AMX *pAmx) : m_pAmx(pAmx), m_iErrFunc(-1), m_iModFunc(-1), m_iNatFunc(-1), m_Handling(false), m_InNativeFilter(false) {};
|
||||
~Handler() {};
|
||||
public:
|
||||
int SetErrorHandler(const char *function);
|
||||
int SetNativeFilter(const char *function);
|
||||
@@ -164,21 +171,28 @@ public:
|
||||
public:
|
||||
bool IsHandling() const { return m_Handling; }
|
||||
void SetErrorMsg(const char *msg);
|
||||
|
||||
const char *GetLastMsg();
|
||||
trace_info_t *GetTrace() const { return m_pTrace; }
|
||||
const char *GetFmtCache() { return m_FmtCache.c_str(); }
|
||||
|
||||
bool IsNativeFiltering() { return (m_iNatFunc > 0); }
|
||||
bool InNativeFilter() { return m_InNativeFilter; }
|
||||
private:
|
||||
AMX *m_pAmx;
|
||||
|
||||
int m_iErrFunc;
|
||||
int m_iModFunc;
|
||||
int m_iNatFunc;
|
||||
|
||||
bool m_Handling;
|
||||
|
||||
//in the future, make this a stack!
|
||||
bool m_InNativeFilter;
|
||||
|
||||
String m_MsgCache;
|
||||
String m_FmtCache;
|
||||
|
||||
trace_info_t *m_pTrace;
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user