Skip to content

Commit 2431ce3

Browse files
xusheng6xusheng6
authored
Test fix compiler warnings (#907)
1 parent 6f7e02a commit 2431ce3

28 files changed

+112
-2111
lines changed

‎core/adapters/corelliumadapter.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ bool CorelliumAdapter::LoadRegisterInfo()
122122
if (reg_attribute.name() == "regnum"s)
123123
register_info.m_regNum = reg_attribute.as_uint();
124124
else
125-
register_info.m_regNum = lastRegIndex + 1;
125+
register_info.m_regNum = (uint32_t)lastRegIndex + 1;
126126
}
127127

128128
this->m_registerInfo[register_name] = register_info;
@@ -149,12 +149,12 @@ bool CorelliumAdapter::LoadRegisterInfo()
149149
id_width[value.m_regNum] = value.m_bitSize;
150150
}
151151

152-
std::size_t max_id{};
152+
uint32_t max_id{};
153153
for ( auto [key, value] : this->m_registerInfo )
154154
max_id += value.m_regNum;
155155

156-
std::size_t offset{};
157-
for ( std::size_t index{}; index < max_id; index++ ) {
156+
uint32_t offset{};
157+
for ( uint32_t index{}; index < max_id; index++ ) {
158158
if ( !id_width[index] )
159159
break;
160160

@@ -184,9 +184,9 @@ bool CorelliumAdapter::Connect(const std::string& server, std::uint32_t port)
184184
this->m_socket = new Socket(AF_INET, SOCK_STREAM, 0);
185185

186186
sockaddr_in address{};
187-
address.sin_family = AF_INET;
187+
address.sin_family = (u_short)AF_INET;
188188
address.sin_addr.s_addr = inet_addr(ipAddress.c_str());
189-
address.sin_port = htons(serverPort);
189+
address.sin_port = htons((u_short)serverPort);
190190

191191
if (this->m_socket->Connect(address)) {
192192
connected = true;
@@ -226,8 +226,8 @@ bool CorelliumAdapter::Connect(const std::string& server, std::uint32_t port)
226226

227227
const auto reply = this->m_rspConnector->TransmitAndReceive(RspData("?"));
228228
auto map = RspConnector::PacketToUnorderedMap(reply);
229-
this->m_lastActiveThreadId = map["thread"];
230-
this->m_processPid = map["thread"];
229+
this->m_lastActiveThreadId = (uint32_t)map["thread"];
230+
this->m_processPid = (uint32_t)map["thread"];
231231
m_isTargetRunning = false;
232232

233233
Ref<Settings> settings = Settings::Instance();
@@ -695,7 +695,7 @@ DebugStopReason CorelliumAdapter::ResponseHandler()
695695
auto map = RspConnector::PacketToUnorderedMap(reply);
696696
const auto tid = map["thread"];
697697
m_isTargetRunning = false;
698-
m_lastActiveThreadId = tid;
698+
m_lastActiveThreadId = (uint32_t)tid;
699699

700700
auto reason = SignalToStopReason(map);
701701
DebuggerEvent dbgevt;
@@ -731,7 +731,7 @@ DebugStopReason CorelliumAdapter::ResponseHandler()
731731
{
732732
// Target exited
733733
std::string exitCodeString = reply.AsString().substr(1);
734-
uint8_t exitCode = strtoul(exitCodeString.c_str(), nullptr, 16);
734+
uint8_t exitCode = (uint8_t)strtoul(exitCodeString.c_str(), nullptr, 16);
735735
m_isTargetRunning = false;
736736
m_exitCode = exitCode;
737737

‎core/adapters/dbgengadapter.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ std::string DbgEngAdapter::GenerateRandomPipeName()
198198
{
199199
const std::string chars = "abcdefghijklmnopqrstuvwxyz1234567890";
200200
constexpr size_t length = 16;
201-
srand(time(NULL));
201+
srand((unsigned int)time(NULL));
202202

203203
std::string result;
204204
result.resize(length);
@@ -760,7 +760,7 @@ bool DbgEngAdapter::AttachInternal(std::uint32_t pid)
760760
return false;
761761
}
762762

763-
if (const auto result = this->m_debugClient->AttachProcess(m_server, attachPID, 0); result != S_OK)
763+
if (const auto result = this->m_debugClient->AttachProcess(m_server, (ULONG)attachPID, 0); result != S_OK)
764764
{
765765
this->Reset();
766766
DebuggerEvent event;
@@ -894,7 +894,7 @@ std::vector<DebugProcess> DbgEngAdapter::GetProcessList()
894894
}
895895

896896
std::vector<DebugProcess> debug_processes {};
897-
for (int i = 0; i < Count; i++)
897+
for (uint32_t i = 0; i < Count; i++)
898898
{
899899
char processName[MAX_PATH];
900900
ZeroMemory(processName, MAX_PATH);
@@ -1079,7 +1079,7 @@ bool DbgEngAdapter::RemoveBreakpoint(const DebugBreakpoint& breakpoint)
10791079
if (m_debugControl->GetNumberBreakpoints(&numBreakpoints) != S_OK)
10801080
return false;
10811081

1082-
for (size_t i = 0; i < numBreakpoints; i++)
1082+
for (ULONG i = 0; i < numBreakpoints; i++)
10831083
{
10841084
IDebugBreakpoint2* bp {};
10851085
if (m_debugControl->GetBreakpointByIndex2(i, &bp) != S_OK)
@@ -1244,7 +1244,7 @@ std::vector<std::string> DbgEngAdapter::GetRegisterList() const
12441244
return {};
12451245

12461246
std::vector<std::string> register_list {};
1247-
for (std::size_t reg_index {}; reg_index < register_count; reg_index++)
1247+
for (uint32_t reg_index {}; reg_index < register_count; reg_index++)
12481248
register_list.push_back(this->GetRegisterNameByIndex(reg_index));
12491249

12501250
return register_list;
@@ -1277,7 +1277,7 @@ std::vector<DebugModule> DbgEngAdapter::GetModuleList()
12771277
if (this->m_debugSymbols->GetModuleParameters(total_modules, nullptr, 0, module_parameters.get()) != S_OK)
12781278
return {};
12791279

1280-
for (std::size_t module_index {}; module_index < total_modules; module_index++)
1280+
for (uint32_t module_index {}; module_index < total_modules; module_index++)
12811281
{
12821282
const auto& parameters = module_parameters[module_index];
12831283

@@ -1733,7 +1733,7 @@ DataBuffer DbgEngAdapter::ReadMemory(std::uintptr_t address, std::size_t size)
17331733

17341734
unsigned long bytesRead {};
17351735
const auto success =
1736-
this->m_debugDataSpaces->ReadVirtual(address, source.get(), size, &bytesRead) == S_OK && bytesRead == size;
1736+
this->m_debugDataSpaces->ReadVirtual(address, source.get(), (ULONG)size, &bytesRead) == S_OK && bytesRead == size;
17371737
if (!success)
17381738
return {};
17391739

@@ -1743,7 +1743,7 @@ DataBuffer DbgEngAdapter::ReadMemory(std::uintptr_t address, std::size_t size)
17431743
bool DbgEngAdapter::WriteMemory(std::uintptr_t address, const DataBuffer& buffer)
17441744
{
17451745
unsigned long bytes_written {};
1746-
return this->m_debugDataSpaces->WriteVirtual(address, const_cast<void*>(buffer.GetData()), buffer.GetLength(), &bytes_written) == S_OK
1746+
return this->m_debugDataSpaces->WriteVirtual(address, const_cast<void*>(buffer.GetData()), (ULONG)buffer.GetLength(), &bytes_written) == S_OK
17471747
&& bytes_written == buffer.GetLength();
17481748
}
17491749

‎core/adapters/esrevenadapter.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ bool EsrevenAdapter::LoadRegisterInfo()
115115
if (reg_attribute.name() == "regnum"s)
116116
register_info.m_regNum = reg_attribute.as_uint();
117117
else
118-
register_info.m_regNum = lastRegIndex + 1;
118+
register_info.m_regNum = (uint32_t)lastRegIndex + 1;
119119
}
120120

121121
if (register_name.empty())
@@ -172,12 +172,12 @@ bool EsrevenAdapter::LoadRegisterInfo()
172172
id_width[value.m_regNum] = value.m_bitSize;
173173
}
174174

175-
std::size_t max_id{};
175+
uint32_t max_id{};
176176
for ( auto [key, value] : this->m_registerInfo )
177177
max_id += value.m_regNum;
178178

179-
std::size_t offset{};
180-
for ( std::size_t index{}; index < max_id; index++ ) {
179+
uint32_t offset{};
180+
for ( uint32_t index{}; index < max_id; index++ ) {
181181
if ( !id_width[index] )
182182
break;
183183

@@ -209,9 +209,9 @@ bool EsrevenAdapter::Connect(const std::string& server, std::uint32_t port)
209209
this->m_socket = new Socket(AF_INET, SOCK_STREAM, 0);
210210

211211
sockaddr_in address{};
212-
address.sin_family = AF_INET;
212+
address.sin_family = (u_short)AF_INET;
213213
address.sin_addr.s_addr = inet_addr(ipAddress.c_str());
214-
address.sin_port = htons(serverPort);
214+
address.sin_port = htons((u_short)serverPort);
215215

216216
if (this->m_socket->Connect(address)) {
217217
connected = true;
@@ -258,8 +258,8 @@ bool EsrevenAdapter::Connect(const std::string& server, std::uint32_t port)
258258

259259
const auto reply = this->m_rspConnector->TransmitAndReceive(RspData("?"));
260260
auto map = RspConnector::PacketToUnorderedMap(reply);
261-
this->m_lastActiveThreadId = map["thread"];
262-
this->m_processPid = map["thread"];
261+
this->m_lastActiveThreadId = (uint32_t)map["thread"];
262+
this->m_processPid = (uint32_t)map["thread"];
263263
m_isTargetRunning = false;
264264

265265
if (Settings::Instance()->Get<bool>("debugger.stopAtEntryPoint") && m_hasEntryFunction)
@@ -827,7 +827,7 @@ DebugStopReason EsrevenAdapter::ResponseHandler(bool notifyStopped)
827827
auto map = RspConnector::PacketToUnorderedMap(reply);
828828
const auto tid = map["thread"];
829829
m_isTargetRunning = false;
830-
m_lastActiveThreadId = tid;
830+
m_lastActiveThreadId = (uint32_t)tid;
831831

832832
CheckApplyPendingBreakpoints();
833833

@@ -873,7 +873,7 @@ DebugStopReason EsrevenAdapter::ResponseHandler(bool notifyStopped)
873873

874874
// Target exited
875875
std::string exitCodeString = reply.AsString().substr(1);
876-
uint8_t exitCode = strtoul(exitCodeString.c_str(), nullptr, 16);
876+
uint8_t exitCode = (uint8_t)strtoul(exitCodeString.c_str(), nullptr, 16);
877877
m_isTargetRunning = false;
878878
m_exitCode = exitCode;
879879

@@ -1044,7 +1044,7 @@ bool EsrevenAdapter::StepOverReverse()
10441044
// TODO: support the case where we cannot determined the remote arch
10451045
ArchitectureRef remoteArch = GetController()->GetState()->GetRemoteArchitecture();
10461046
if (!remoteArch)
1047-
return InternalError;
1047+
return false;
10481048

10491049
size_t size = remoteArch->GetMaxInstructionLength();
10501050
DataBuffer buffer = ReadMemory(remoteIP, size);
@@ -1055,7 +1055,7 @@ bool EsrevenAdapter::StepOverReverse()
10551055
remoteArch->GetInstructionLowLevelIL((const uint8_t*)buffer.GetData(), remoteIP, bytesRead, *ilFunc);
10561056

10571057
if (ilFunc->GetInstructionCount() == 0)
1058-
return InternalError;
1058+
return false;
10591059

10601060
const auto& instr = (*ilFunc)[0];
10611061
if (instr.operation != LLIL_RET)

‎core/adapters/gdb/.gitkeep‎

Whitespace-only changes.

‎core/adapters/gdb/gdbserver.zip‎

-235 KB
Binary file not shown.

‎core/adapters/gdbadapter.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ bool GdbAdapter::LoadRegisterInfo()
115115
if (reg_attribute.name() == "regnum"s)
116116
register_info.m_regNum = reg_attribute.as_uint();
117117
else
118-
register_info.m_regNum = lastRegIndex + 1;
118+
register_info.m_regNum = (uint32_t)lastRegIndex + 1;
119119
}
120120

121121
if (register_name.empty())
@@ -172,12 +172,12 @@ bool GdbAdapter::LoadRegisterInfo()
172172
id_width[value.m_regNum] = value.m_bitSize;
173173
}
174174

175-
std::size_t max_id{};
175+
uint32_t max_id{};
176176
for ( auto [key, value] : this->m_registerInfo )
177177
max_id += value.m_regNum;
178178

179-
std::size_t offset{};
180-
for ( std::size_t index{}; index < max_id; index++ ) {
179+
uint32_t offset{};
180+
for ( uint32_t index{}; index < max_id; index++ ) {
181181
if ( !id_width[index] )
182182
break;
183183

@@ -211,7 +211,7 @@ bool GdbAdapter::Connect(const std::string& server, std::uint32_t port)
211211
sockaddr_in address{};
212212
address.sin_family = AF_INET;
213213
address.sin_addr.s_addr = inet_addr(ipAddress.c_str());
214-
address.sin_port = htons(serverPort);
214+
address.sin_port = htons((u_short)serverPort);
215215

216216
if (this->m_socket->Connect(address)) {
217217
connected = true;
@@ -258,8 +258,8 @@ bool GdbAdapter::Connect(const std::string& server, std::uint32_t port)
258258

259259
const auto reply = this->m_rspConnector->TransmitAndReceive(RspData("?"));
260260
auto map = RspConnector::PacketToUnorderedMap(reply);
261-
this->m_lastActiveThreadId = map["thread"];
262-
this->m_processPid = map["thread"];
261+
this->m_lastActiveThreadId = (uint32_t)map["thread"];
262+
this->m_processPid = (uint32_t)map["thread"];
263263
m_isTargetRunning = false;
264264

265265
if (Settings::Instance()->Get<bool>("debugger.stopAtEntryPoint") && m_hasEntryFunction)
@@ -822,7 +822,7 @@ DebugStopReason GdbAdapter::ResponseHandler(bool notifyStopped)
822822
auto map = RspConnector::PacketToUnorderedMap(reply);
823823
const auto tid = map["thread"];
824824
m_isTargetRunning = false;
825-
m_lastActiveThreadId = tid;
825+
m_lastActiveThreadId = (uint32_t)tid;
826826

827827
CheckApplyPendingBreakpoints();
828828

@@ -868,7 +868,7 @@ DebugStopReason GdbAdapter::ResponseHandler(bool notifyStopped)
868868

869869
// Target exited
870870
std::string exitCodeString = reply.AsString().substr(1);
871-
uint8_t exitCode = strtoul(exitCodeString.c_str(), nullptr, 16);
871+
uint8_t exitCode = (uint8_t)strtoul(exitCodeString.c_str(), nullptr, 16);
872872
m_isTargetRunning = false;
873873
m_exitCode = exitCode;
874874

@@ -1092,7 +1092,7 @@ bool GdbAdapter::StepOverReverse()
10921092
// TODO: support the case where we cannot determined the remote arch
10931093
ArchitectureRef remoteArch = GetController()->GetState()->GetRemoteArchitecture();
10941094
if (!remoteArch)
1095-
return InternalError;
1095+
return false;
10961096

10971097
size_t size = remoteArch->GetMaxInstructionLength();
10981098
DataBuffer buffer = ReadMemory(remoteIP, size);
@@ -1103,7 +1103,7 @@ bool GdbAdapter::StepOverReverse()
11031103
remoteArch->GetInstructionLowLevelIL((const uint8_t*)buffer.GetData(), remoteIP, bytesRead, *ilFunc);
11041104

11051105
if (ilFunc->GetInstructionCount() == 0)
1106-
return InternalError;
1106+
return false;
11071107

11081108
const auto& instr = (*ilFunc)[0];
11091109
if (instr.operation != LLIL_RET)

0 commit comments

Comments
 (0)