UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed a corruption bug when toggling debug mode

Browse Source 
--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%40698
This commit is contained in:
David Anderson 2007-04-13 17:12:25 +00:00
parent c7db185400
commit 3f25c99653
2 changed files with 53 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
core/vm/sp_vm_basecontext.cpp
View File

@ -42,9 +42,12 @@ BaseContext::BaseContext(sp_context_t *_ctx)
m_InExec = false; m_InExec = false;
m_CustomMsg = false; m_CustomMsg = false;
m_funcsnum = ctx->vmbase->FunctionCount(ctx); m_funcsnum = ctx->vmbase->FunctionCount(ctx);
#if 0
m_priv_funcs = NULL; m_priv_funcs = NULL;
#endif
m_pub_funcs = NULL; m_pub_funcs = NULL;
#if 0
/** /**
* Note: Since the m_plugin member will never change, * Note: Since the m_plugin member will never change,
* it is safe to assume the function count will never change * it is safe to assume the function count will never change
@ -56,6 +59,7 @@ BaseContext::BaseContext(sp_context_t *_ctx)
} else { } else {
m_priv_funcs = NULL; m_priv_funcs = NULL;
} }
#endif
if (ctx->plugin->info.publics_num && m_pub_funcs == NULL) if (ctx->plugin->info.publics_num && m_pub_funcs == NULL)
{ {
@ -66,44 +70,72 @@ BaseContext::BaseContext(sp_context_t *_ctx)
} }
} }
void BaseContext::FlushFunctionCache(bool remove) void BaseContext::FlushFunctionCache()
{ {
if (m_pub_funcs) if (m_pub_funcs)
{ {
for (uint32_t i=0; i<ctx->plugin->info.publics_num; i++) for (uint32_t i=0; i<ctx->plugin->info.publics_num; i++)
{ {
if (remove) delete m_pub_funcs[i];
{ m_pub_funcs[i] = NULL;
delete m_pub_funcs[i];
m_pub_funcs[i] = NULL;
} else if (m_pub_funcs[i]) {
m_pub_funcs[i]->Invalidate();
}
} }
} }
#if 0
if (m_priv_funcs) if (m_priv_funcs)
{ {
for (unsigned int i=0; i<m_funcsnum; i++) for (unsigned int i=0; i<m_funcsnum; i++)
{ {
if (remove) delete m_priv_funcs[i];
{ m_priv_funcs[i] = NULL;
delete m_priv_funcs[i];
m_priv_funcs[i] = NULL;
} else if (m_priv_funcs[i]) {
m_priv_funcs[i]->Invalidate();
}
} }
} }
#endif
}
void BaseContext::RefreshFunctionCache()
{
if (m_pub_funcs)
{
sp_public_t *pub;
for (uint32_t i=0; i<ctx->plugin->info.publics_num; i++)
{
if (!m_pub_funcs[i])
{
continue;
}
if (GetPublicByIndex(i, &pub) != SP_ERROR_NONE)
{
continue;
}
m_pub_funcs[i]->Set(pub->code_offs, this);
}
}
#if 0
if (m_priv_funcs)
{
for (unsigned int i=0; i<m_funcsnum; i++)
{
if (!m_priv_funcs[i])
{
continue;
}
g_pVM->
}
}
#endif
} }
BaseContext::~BaseContext() BaseContext::~BaseContext()
{ {
FlushFunctionCache(true); FlushFunctionCache();
delete [] m_pub_funcs; delete [] m_pub_funcs;
m_pub_funcs = NULL; m_pub_funcs = NULL;
#if 0
delete [] m_priv_funcs; delete [] m_priv_funcs;
m_priv_funcs = NULL; m_priv_funcs = NULL;
#endif
} }
void BaseContext::SetContext(sp_context_t *_ctx) void BaseContext::SetContext(sp_context_t *_ctx)
@ -115,7 +147,7 @@ void BaseContext::SetContext(sp_context_t *_ctx)
ctx = _ctx; ctx = _ctx;
ctx->context = this; ctx->context = this;
ctx->dbreak = GlobalDebugBreak; ctx->dbreak = GlobalDebugBreak;
FlushFunctionCache(false); RefreshFunctionCache();
} }
IVirtualMachine *BaseContext::GetVirtualMachine() IVirtualMachine *BaseContext::GetVirtualMachine()

5
core/vm/sp_vm_basecontext.h
View File

@ -78,7 +78,8 @@ namespace SourcePawn
void SetContext(sp_context_t *_ctx); void SetContext(sp_context_t *_ctx);
private: private:
void SetErrorMessage(const char *msg, va_list ap); void SetErrorMessage(const char *msg, va_list ap);
void FlushFunctionCache(bool remove); void FlushFunctionCache();
void RefreshFunctionCache();
private: private:
sp_context_t *ctx; sp_context_t *ctx;
#if defined SOURCEMOD_BUILD #if defined SOURCEMOD_BUILD
@ -88,7 +89,9 @@ namespace SourcePawn
bool m_CustomMsg; bool m_CustomMsg;
bool m_InExec; bool m_InExec;
unsigned int m_funcsnum; unsigned int m_funcsnum;
#if 0
CFunction **m_priv_funcs; CFunction **m_priv_funcs;
#endif
CFunction **m_pub_funcs; CFunction **m_pub_funcs;
}; };
}; };