Skip to content

Commit 9398c15

Browse files
authored
Normalize implementation of calls to AccessMemory (#3162)
***NO_CI***
1 parent c2c71d1 commit 9398c15

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

src/CLR/Debugger/Debugger.cpp

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -998,12 +998,12 @@ bool CLR_DBG_Debugger::Monitor_WriteMemory(WP_Message *msg)
998998
{
999999
NATIVE_PROFILE_CLR_DEBUGGER();
10001000

1001-
CLR_DBG_Commands_Monitor_WriteMemory *cmd = (CLR_DBG_Commands_Monitor_WriteMemory *)msg->m_payload;
1002-
CLR_DBG_Commands_Monitor_WriteMemory_Reply cmdReply;
1001+
auto *cmd = (CLR_DBG_Commands_Monitor_WriteMemory *)msg->m_payload;
1002+
CLR_DBG_Commands_Monitor_WriteMemory_Reply errorCode = AccessMemoryErrorCode_NoError;
10031003

1004-
g_CLR_DBG_Debugger->AccessMemory(cmd->address, cmd->length, cmd->data, AccessMemory_Write, &cmdReply);
1004+
g_CLR_DBG_Debugger->AccessMemory(cmd->address, cmd->length, cmd->data, AccessMemory_Write, &errorCode);
10051005

1006-
WP_ReplyToCommand(msg, true, false, &cmdReply, sizeof(cmdReply));
1006+
WP_ReplyToCommand(msg, errorCode == AccessMemoryErrorCode_NoError, false, &errorCode, sizeof(errorCode));
10071007

10081008
return true;
10091009
}
@@ -1012,14 +1012,13 @@ bool CLR_DBG_Debugger::Monitor_CheckMemory(WP_Message *msg)
10121012
{
10131013
NATIVE_PROFILE_CLR_DEBUGGER();
10141014

1015-
CLR_DBG_Commands_Monitor_CheckMemory *cmd = (CLR_DBG_Commands_Monitor_CheckMemory *)msg->m_payload;
1016-
CLR_DBG_Commands_Monitor_CheckMemory_Reply cmdReply;
1017-
uint32_t errorCode;
1015+
auto *cmd = (CLR_DBG_Commands_Monitor_CheckMemory *)msg->m_payload;
1016+
CLR_DBG_Commands_Monitor_CheckMemory_Reply errorCode = AccessMemoryErrorCode_NoError;
10181017

10191018
g_CLR_DBG_Debugger
1020-
->AccessMemory(cmd->address, cmd->length, (unsigned char *)&cmdReply, AccessMemory_Check, &errorCode);
1019+
->AccessMemory(cmd->address, cmd->length, (unsigned char *)&errorCode, AccessMemory_Check, &errorCode);
10211020

1022-
WP_ReplyToCommand(msg, errorCode == AccessMemoryErrorCode_NoError, false, &cmdReply, sizeof(cmdReply));
1021+
WP_ReplyToCommand(msg, errorCode == AccessMemoryErrorCode_NoError, false, &errorCode, sizeof(errorCode));
10231022

10241023
return true;
10251024
}
@@ -1028,12 +1027,12 @@ bool CLR_DBG_Debugger::Monitor_EraseMemory(WP_Message *msg)
10281027
{
10291028
NATIVE_PROFILE_CLR_DEBUGGER();
10301029

1031-
CLR_DBG_Commands_Monitor_EraseMemory *cmd = (CLR_DBG_Commands_Monitor_EraseMemory *)msg->m_payload;
1032-
CLR_DBG_Commands_Monitor_EraseMemory_Reply cmdReply;
1030+
auto *cmd = (CLR_DBG_Commands_Monitor_EraseMemory *)msg->m_payload;
1031+
CLR_DBG_Commands_Monitor_EraseMemory_Reply errorCode = AccessMemoryErrorCode_NoError;
10331032

1034-
g_CLR_DBG_Debugger->AccessMemory(cmd->address, cmd->length, NULL, AccessMemory_Erase, &cmdReply);
1033+
g_CLR_DBG_Debugger->AccessMemory(cmd->address, cmd->length, nullptr, AccessMemory_Erase, &errorCode);
10351034

1036-
WP_ReplyToCommand(msg, true, false, &cmdReply, sizeof(cmdReply));
1035+
WP_ReplyToCommand(msg, errorCode == AccessMemoryErrorCode_NoError, false, &errorCode, sizeof(errorCode));
10371036

10381037
return true;
10391038
}

0 commit comments

Comments
 (0)