ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename

This commit is contained in:
shygoo 2018-12-06 22:19:28 -06:00
parent 9f4323c06b
commit 91ec99bd52
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Project64/UserInterface/API.js
View File

@ -299,10 +299,10 @@ const events = (function()
return events.on('exec', callback, param, param2) return events.on('exec', callback, param, param2)
}, },
onexecvalue: function(addr, value, arg3, arg4) onexecopcode: function(addr, value, arg3, arg4)
{ {
// onexecvalue(addr, value, callback) // onexecopcode(addr, value, callback)
// onexecvalue(addr, value, mask, callback) // onexecopcode(addr, value, mask, callback)
var start = 0; var start = 0;
var end = 0; var end = 0;
@ -331,7 +331,7 @@ const events = (function()
} }
this._stashCallback(callback); this._stashCallback(callback);
return _native.addCallback('execvalue', callback, start, end, value, mask) return _native.addCallback('execopcode', callback, start, end, value, mask)
}, },
onread: function(addr, callback) onread: function(addr, callback)
{ {

2
Source/Project64/UserInterface/Debugger/Debugger.cpp
View File

@ -391,7 +391,7 @@ void CDebuggerUI::CPUStepStarted()
uint32_t JumpToLocation = R4300iOp::m_JumpToLocation; uint32_t JumpToLocation = R4300iOp::m_JumpToLocation;
m_ScriptSystem->HookCPUExec()->InvokeByParamInRange(PROGRAM_COUNTER); m_ScriptSystem->HookCPUExec()->InvokeByParamInRange(PROGRAM_COUNTER);
m_ScriptSystem->HookCPUExecValue()->InvokeByParamInRangeWithMaskedValue(PROGRAM_COUNTER, R4300iOp::m_Opcode.Hex); m_ScriptSystem->HookCPUExecOpcode()->InvokeByParamInRangeWithMaskedValue(PROGRAM_COUNTER, R4300iOp::m_Opcode.Hex);
// Memory breakpoints // Memory breakpoints

4
Source/Project64/UserInterface/Debugger/ScriptSystem.cpp
View File

@ -25,7 +25,7 @@ CScriptSystem::CScriptSystem(CDebuggerUI* debugger)
m_Debugger = debugger; m_Debugger = debugger;
m_HookCPUExec = new CScriptHook(this); m_HookCPUExec = new CScriptHook(this);
m_HookCPUExecValue = new CScriptHook(this); m_HookCPUExecOpcode = new CScriptHook(this);
m_HookCPURead = new CScriptHook(this); m_HookCPURead = new CScriptHook(this);
m_HookCPUWrite = new CScriptHook(this); m_HookCPUWrite = new CScriptHook(this);
m_HookFrameDrawn = new CScriptHook(this); m_HookFrameDrawn = new CScriptHook(this);
@ -34,7 +34,7 @@ CScriptSystem::CScriptSystem(CDebuggerUI* debugger)
RegisterHook("read", m_HookCPURead); RegisterHook("read", m_HookCPURead);
RegisterHook("write", m_HookCPUWrite); RegisterHook("write", m_HookCPUWrite);
RegisterHook("draw", m_HookFrameDrawn); RegisterHook("draw", m_HookFrameDrawn);
RegisterHook("execvalue", m_HookCPUExecValue); RegisterHook("execopcode", m_HookCPUExecOpcode);
HMODULE hInst = GetModuleHandle(NULL); HMODULE hInst = GetModuleHandle(NULL);
HRSRC hRes = FindResource(hInst, MAKEINTRESOURCE(IDR_JSAPI_TEXT), "TEXT"); HRSRC hRes = FindResource(hInst, MAKEINTRESOURCE(IDR_JSAPI_TEXT), "TEXT");

6
Source/Project64/UserInterface/Debugger/ScriptSystem.h
View File

@ -54,7 +54,7 @@ private:
CScriptHook* m_HookCPUExec; CScriptHook* m_HookCPUExec;
CScriptHook* m_HookCPURead; CScriptHook* m_HookCPURead;
CScriptHook* m_HookCPUWrite; CScriptHook* m_HookCPUWrite;
CScriptHook* m_HookCPUExecValue; CScriptHook* m_HookCPUExecOpcode;
CScriptHook* m_HookFrameDrawn; CScriptHook* m_HookFrameDrawn;
@ -121,9 +121,9 @@ public:
return m_HookCPUWrite; return m_HookCPUWrite;
} }
CScriptHook* HookCPUExecValue() CScriptHook* HookCPUExecOpcode()
{ {
return m_HookCPUExecValue; return m_HookCPUExecOpcode;
} }
CScriptHook* HookFrameDrawn() CScriptHook* HookFrameDrawn()