Replace assembler with a submodule

This commit is contained in:
Kingcom committed 2014-11-23 21:09:40 +01:00
1 parent 473f388088
commit f6cedcbff5
14 files changed
+123 -1395

No files matched your search

+2 -8
View File
@@ -259,8 +259,6 @@ std::string trimString(std::string input)
void CtrlDisAsmView::assembleOpcode(u32 address, std::string defaultText)
{
u32 encoded;
auto memLock = Memory::Lock();
if (Core_IsStepping() == false) {
MessageBox(wnd,L"Cannot change code while the core is running!",L"Error",MB_OK);
@@ -298,13 +296,9 @@ void CtrlDisAsmView::assembleOpcode(u32 address, std::string defaultText)
// try to assemble the input if it failed
}
result = MIPSAsm::MipsAssembleOpcode(op.c_str(),debugger,address,encoded);
result = MIPSAsm::MipsAssembleOpcode(op.c_str(),debugger,address);
if (result == true)
{
Memory::Write_U32(encoded, address);
// In case this is a delay slot or combined instruction, clear cache above it too.
if (MIPSComp::jit)
MIPSComp::jit->InvalidateCacheAt(address - 4, 8);
scanFunctions();
if (address == curAddress)
@@ -312,7 +306,7 @@ void CtrlDisAsmView::assembleOpcode(u32 address, std::string defaultText)
redraw();
} else {
std::wstring error = ConvertUTF8ToWString(MIPSAsm::GetAssembleError());
std::wstring error = MIPSAsm::GetAssembleError();
MessageBox(wnd,error.c_str(),L"Error",MB_OK);
}
}