Emulation/Mesen
1
0
Fork 0
mirror of https://github.com/SourMesen/Mesen.git synced 2025-04-02 10:52:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

Debugger: Lua memory callback fixes + allow lua script to change read/written value

Browse source
This commit is contained in:
Souryo 2017-09-08 17:20:40 -04:00
parent 46ecd361f7
commit 6969caa1b8
10 changed files with 61 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Core/Debugger.cpp
View file

@ -594,7 +594,7 @@ bool Debugger::SleepUntilResume()
return false;
}
void Debugger::PrivateProcessVramReadOperation(MemoryOperationType type, uint16_t addr, uint8_t value)
void Debugger::PrivateProcessVramReadOperation(MemoryOperationType type, uint16_t addr, uint8_t &value)
{
int32_t absoluteAddr = _mapper->ToAbsoluteChrAddress(addr);
_codeDataLogger->SetFlag(absoluteAddr, type == MemoryOperationType::Read ? CdlChrFlags::Read : CdlChrFlags::Drawn);
@ -611,7 +611,7 @@ void Debugger::PrivateProcessVramReadOperation(MemoryOperationType type, uint16_
ProcessPpuOperation(addr, value, MemoryOperationType::Read);
}
void Debugger::PrivateProcessVramWriteOperation(uint16_t addr, uint8_t value)
void Debugger::PrivateProcessVramWriteOperation(uint16_t addr, uint8_t &value)
{
if(_hasBreakpoint[BreakpointType::WriteVram]) {
OperationInfo operationInfo{ addr, value, MemoryOperationType::Write };
@ -813,14 +813,14 @@ bool Debugger::ProcessRamOperation(MemoryOperationType type, uint16_t &addr, uin
return true;
}
void Debugger::ProcessVramReadOperation(MemoryOperationType type, uint16_t addr, uint8_t value)
void Debugger::ProcessVramReadOperation(MemoryOperationType type, uint16_t addr, uint8_t &value)
{
if(Debugger::Instance) {
Debugger::Instance->PrivateProcessVramReadOperation(type, addr, value);
}
}
void Debugger::ProcessVramWriteOperation(uint16_t addr, uint8_t value)
void Debugger::ProcessVramWriteOperation(uint16_t addr, uint8_t &value)
{
if(Debugger::Instance) {
Debugger::Instance->PrivateProcessVramWriteOperation(addr, value);
@ -1078,7 +1078,7 @@ const char* Debugger::GetScriptLog(int32_t scriptId)
return "";
}
void Debugger::ProcessCpuOperation(uint16_t addr, uint8_t value, MemoryOperationType type)
void Debugger::ProcessCpuOperation(uint16_t addr, uint8_t &value, MemoryOperationType type)
{
if(_hasScript) {
for(shared_ptr<ScriptHost> &script : _scripts) {
@ -1087,11 +1087,11 @@ void Debugger::ProcessCpuOperation(uint16_t addr, uint8_t value, MemoryOperation
}
}
void Debugger::ProcessPpuOperation(uint16_t addr, uint8_t value, MemoryOperationType type)
void Debugger::ProcessPpuOperation(uint16_t addr, uint8_t &value, MemoryOperationType type)
{
if(_hasScript) {
for(shared_ptr<ScriptHost> &script : _scripts) {
script->ProcessPpuOperation(addr, value, MemoryOperationType::Write);
script->ProcessPpuOperation(addr, value, type);
}
}
}

12
Core/Debugger.h
View file

@ -121,8 +121,8 @@ private:
void PrivateProcessPpuCycle();
bool PrivateProcessRamOperation(MemoryOperationType type, uint16_t &addr, uint8_t &value);
void PrivateProcessVramReadOperation(MemoryOperationType type, uint16_t addr, uint8_t value);
void PrivateProcessVramWriteOperation(uint16_t addr, uint8_t value);
void PrivateProcessVramReadOperation(MemoryOperationType type, uint16_t addr, uint8_t &value);
void PrivateProcessVramWriteOperation(uint16_t addr, uint8_t &value);
bool HasMatchingBreakpoint(BreakpointType type, OperationInfo &operationInfo);
void UpdateCallstack(uint32_t addr);
@ -192,8 +192,8 @@ public:
int32_t EvaluateExpression(string expression, EvalResultType &resultType);
static bool ProcessRamOperation(MemoryOperationType type, uint16_t &addr, uint8_t &value);
static void ProcessVramReadOperation(MemoryOperationType type, uint16_t addr, uint8_t value);
static void ProcessVramWriteOperation(uint16_t addr, uint8_t value);
static void ProcessVramReadOperation(MemoryOperationType type, uint16_t addr, uint8_t &value);
static void ProcessVramWriteOperation(uint16_t addr, uint8_t &value);
static void ProcessPpuCycle();
static void SetLastFramePpuScroll(uint16_t x, uint16_t y);
@ -224,7 +224,7 @@ public:
int32_t LoadScript(string content, int32_t scriptId);
void RemoveScript(int32_t scriptId);
const char* GetScriptLog(int32_t scriptId);
void ProcessCpuOperation(uint16_t addr, uint8_t value, MemoryOperationType type);
void ProcessPpuOperation(uint16_t addr, uint8_t value, MemoryOperationType type);
void ProcessCpuOperation(uint16_t addr, uint8_t &value, MemoryOperationType type);
void ProcessPpuOperation(uint16_t addr, uint8_t &value, MemoryOperationType type);
void ProcessEvent(EventType type);
};

12
Core/LuaApi.cpp
View file

@ -160,7 +160,7 @@ int LuaApi::WriteMemory(lua_State *lua)
checkparams();
errorCond(value > 255 || value < -128, "value out of range");
errorCond(address < 0, "address must be >= 0");
_memoryDumper->SetMemoryValue(type, address, value, false);
_memoryDumper->SetMemoryValue(type, address, value, false, false);
return l.ReturnCount();
}
@ -171,7 +171,7 @@ int LuaApi::DebugReadMemory(lua_State *lua)
int address = l.ReadInteger();
checkparams();
errorCond(address < 0, "address must be >= 0");
l.Return(_memoryDumper->GetMemoryValue(type, address));
l.Return(_memoryDumper->GetMemoryValue(type, address, true));
return l.ReturnCount();
}
@ -184,7 +184,7 @@ int LuaApi::DebugWriteMemory(lua_State *lua)
checkparams();
errorCond(value > 255 || value < -128, "value out of range");
errorCond(address < 0, "address must be >= 0");
_memoryDumper->SetMemoryValue(type, address, value);
_memoryDumper->SetMemoryValue(type, address, value, false, true);
return l.ReturnCount();
}
@ -208,7 +208,7 @@ int LuaApi::WriteMemoryWord(lua_State *lua)
checkparams();
errorCond(value > 65535 || value < -32768, "value out of range");
errorCond(address < 0, "address must be >= 0");
_memoryDumper->SetMemoryValueWord(type, address, value, false);
_memoryDumper->SetMemoryValueWord(type, address, value, false, false);
return l.ReturnCount();
}
@ -219,7 +219,7 @@ int LuaApi::DebugReadMemoryWord(lua_State *lua)
int address = l.ReadInteger();
checkparams();
errorCond(address < 0, "address must be >= 0");
l.Return(_memoryDumper->GetMemoryValueWord(type, address));
l.Return(_memoryDumper->GetMemoryValueWord(type, address, true));
return l.ReturnCount();
}
@ -232,7 +232,7 @@ int LuaApi::DebugWriteMemoryWord(lua_State *lua)
checkparams();
errorCond(value > 65535 || value < -32768, "value out of range");
errorCond(address < 0, "address must be >= 0");
_memoryDumper->SetMemoryValueWord(type, address, value);
_memoryDumper->SetMemoryValueWord(type, address, value, false, true);
return l.ReturnCount();
}

14
Core/LuaScriptingContext.cpp
View file

@ -40,15 +40,23 @@ bool LuaScriptingContext::LoadScript(string scriptContent, Debugger* debugger)
return false;
}
void LuaScriptingContext::CallMemoryCallback(int addr, int value, CallbackType type)
void LuaScriptingContext::CallMemoryCallback(uint16_t addr, uint8_t &value, CallbackType type)
{
LuaApi::SetContext(this);
for(int &ref : _callbacks[(int)type][addr]) {
int top = lua_gettop(_lua);
lua_rawgeti(_lua, LUA_REGISTRYINDEX, ref);
lua_pushinteger(_lua, addr);
lua_pushinteger(_lua, value);
if(lua_pcall(_lua, 2, 0, 0) != 0) {
lua_pushinteger(_lua, value);
if(lua_pcall(_lua, 2, LUA_MULTRET, 0) != 0) {
Log(lua_tostring(_lua, -1));
} else {
int returnParamCount = lua_gettop(_lua) - top;
if(returnParamCount && lua_isinteger(_lua, -1)) {
int newValue = (int)lua_tointeger(_lua, -1);
value = (uint8_t)newValue;
}
lua_settop(_lua, top);
}
}
}

2
Core/LuaScriptingContext.h
View file

@ -15,6 +15,6 @@ public:
~LuaScriptingContext();
bool LoadScript(string scriptContent, Debugger* debugger);
void CallMemoryCallback(int addr, int value, CallbackType type);
void CallMemoryCallback(uint16_t addr, uint8_t &value, CallbackType type);
int InternalCallEventCallback(EventType type);
};

40
Core/MemoryDumper.cpp
View file

@ -130,15 +130,19 @@ void MemoryDumper::SetMemoryValue(DebugMemoryType memoryType, uint32_t address,
{
switch(memoryType) {
case DebugMemoryType::CpuMemory:
AddressTypeInfo info;
_debugger->GetAbsoluteAddressAndType(address, &info);
if(info.Address >= 0) {
switch(info.Type) {
case AddressType::InternalRam: SetMemoryValue(DebugMemoryType::InternalRam, info.Address, value, preventRebuildCache, disableSideEffects); break;
case AddressType::PrgRom: SetMemoryValue(DebugMemoryType::PrgRom, info.Address, value, preventRebuildCache, disableSideEffects); break;
case AddressType::WorkRam: SetMemoryValue(DebugMemoryType::WorkRam, info.Address, value, preventRebuildCache, disableSideEffects); break;
case AddressType::SaveRam: SetMemoryValue(DebugMemoryType::SaveRam, info.Address, value, preventRebuildCache, disableSideEffects); break;
if(disableSideEffects) {
AddressTypeInfo info;
_debugger->GetAbsoluteAddressAndType(address, &info);
if(info.Address >= 0) {
switch(info.Type) {
case AddressType::InternalRam: SetMemoryValue(DebugMemoryType::InternalRam, info.Address, value, preventRebuildCache, true); break;
case AddressType::PrgRom: SetMemoryValue(DebugMemoryType::PrgRom, info.Address, value, preventRebuildCache, true); break;
case AddressType::WorkRam: SetMemoryValue(DebugMemoryType::WorkRam, info.Address, value, preventRebuildCache, true); break;
case AddressType::SaveRam: SetMemoryValue(DebugMemoryType::SaveRam, info.Address, value, preventRebuildCache, true); break;
}
}
} else {
_memoryManager->DebugWrite(address, value, false);
}
break;
@ -181,15 +185,19 @@ uint8_t MemoryDumper::GetMemoryValue(DebugMemoryType memoryType, uint32_t addres
{
switch(memoryType) {
case DebugMemoryType::CpuMemory:
AddressTypeInfo info;
_debugger->GetAbsoluteAddressAndType(address, &info);
if(info.Address >= 0) {
switch(info.Type) {
case AddressType::InternalRam: return GetMemoryValue(DebugMemoryType::InternalRam, info.Address, disableSideEffects);
case AddressType::PrgRom: return GetMemoryValue(DebugMemoryType::PrgRom, info.Address, disableSideEffects);
case AddressType::WorkRam: return GetMemoryValue(DebugMemoryType::WorkRam, info.Address, disableSideEffects);
case AddressType::SaveRam: return GetMemoryValue(DebugMemoryType::SaveRam, info.Address, disableSideEffects);
if(disableSideEffects) {
AddressTypeInfo info;
_debugger->GetAbsoluteAddressAndType(address, &info);
if(info.Address >= 0) {
switch(info.Type) {
case AddressType::InternalRam: return GetMemoryValue(DebugMemoryType::InternalRam, info.Address, true);
case AddressType::PrgRom: return GetMemoryValue(DebugMemoryType::PrgRom, info.Address, true);
case AddressType::WorkRam: return GetMemoryValue(DebugMemoryType::WorkRam, info.Address, true);
case AddressType::SaveRam: return GetMemoryValue(DebugMemoryType::SaveRam, info.Address, true);
}
}
} else {
return _memoryManager->DebugRead(address, false);
}
break;

4
Core/ScriptHost.cpp
View file

@ -31,7 +31,7 @@ bool ScriptHost::LoadScript(string scriptContent, Debugger* debugger)
return true;
}
void ScriptHost::ProcessCpuOperation(uint16_t addr, uint8_t value, MemoryOperationType type)
void ScriptHost::ProcessCpuOperation(uint16_t addr, uint8_t &value, MemoryOperationType type)
{
if(_context) {
switch(type) {
@ -42,7 +42,7 @@ void ScriptHost::ProcessCpuOperation(uint16_t addr, uint8_t value, MemoryOperati
}
}
void ScriptHost::ProcessPpuOperation(uint16_t addr, uint8_t value, MemoryOperationType type)
void ScriptHost::ProcessPpuOperation(uint16_t addr, uint8_t &value, MemoryOperationType type)
{
if(_context) {
switch(type) {

4
Core/ScriptHost.h
View file

@ -19,7 +19,7 @@ public:
bool LoadScript(string scriptContent, Debugger* debugger);
void ProcessCpuOperation(uint16_t addr, uint8_t value, MemoryOperationType type);
void ProcessPpuOperation(uint16_t addr, uint8_t value, MemoryOperationType type);
void ProcessCpuOperation(uint16_t addr, uint8_t &value, MemoryOperationType type);
void ProcessPpuOperation(uint16_t addr, uint8_t &value, MemoryOperationType type);
void ProcessEvent(EventType eventType);
};

2
Core/ScriptingContext.h
View file

@ -33,7 +33,7 @@ public:
void Log(string message);
const char* GetLog();
virtual void CallMemoryCallback(int addr, int value, CallbackType type) = 0;
virtual void CallMemoryCallback(uint16_t addr, uint8_t &value, CallbackType type) = 0;
virtual int InternalCallEventCallback(EventType type) = 0;
int CallEventCallback(EventType type);

1
GUI.NET/Debugger/frmScript.cs
View file

@ -82,6 +82,7 @@ namespace Mesen.GUI.Debugger
using(StreamReader reader = new StreamReader(stream)) {
txtScriptContent.Text = reader.ReadToEnd();
_originalText = txtScriptContent.Text;
txtScriptContent.ClearUndo();
}
}
}