From b4cdbf3ee859273e801112c8bea65f55bfaf3bd2 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 19 Jul 2018 15:17:50 -0400 Subject: [PATCH 1/2] gdbstub: Get rid of a few signed/unsigned comparisons Ensures both operands in comparisons are the same signedness. --- src/core/gdbstub/gdbstub.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/gdbstub/gdbstub.cpp b/src/core/gdbstub/gdbstub.cpp index 5d4e94f0a..9711c9c71 100644 --- a/src/core/gdbstub/gdbstub.cpp +++ b/src/core/gdbstub/gdbstub.cpp @@ -514,7 +514,7 @@ static bool IsDataAvailable() { fd_set fd_socket; FD_ZERO(&fd_socket); - FD_SET(gdbserver_socket, &fd_socket); + FD_SET(static_cast(gdbserver_socket), &fd_socket); struct timeval t; t.tv_sec = 0; @@ -564,7 +564,7 @@ static void ReadRegisters() { u8* bufptr = buffer; - for (int reg = 0; reg <= R15_REGISTER; reg++) { + for (u32 reg = 0; reg <= R15_REGISTER; reg++) { IntToGdbHex(bufptr + reg * CHAR_BIT, Core::CPU().GetReg(reg)); } @@ -574,7 +574,7 @@ static void ReadRegisters() { bufptr += CHAR_BIT; - for (int reg = 0; reg <= 31; reg++) { + for (u32 reg = 0; reg <= 31; reg++) { IntToGdbHex(bufptr + reg * CHAR_BIT, Core::CPU().GetVFPReg(reg)); } @@ -618,7 +618,7 @@ static void WriteRegisters() { if (command_buffer[0] != 'G') return SendReply("E01"); - for (int i = 0, reg = 0; reg <= FPSCR_REGISTER; i++, reg++) { + for (u32 i = 0, reg = 0; reg <= FPSCR_REGISTER; i++, reg++) { if (reg <= R15_REGISTER) { Core::CPU().SetReg(reg, GdbHexToInt(buffer_ptr + i * CHAR_BIT)); } else if (reg == CPSR_REGISTER) { From 5a47cbed174b127c7a07fa559584f64c71daf7d0 Mon Sep 17 00:00:00 2001 From: zhupengfei Date: Mon, 30 Jul 2018 22:36:35 +0800 Subject: [PATCH 2/2] no need to cast to u32 according to @wwylele comment --- src/core/gdbstub/gdbstub.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/gdbstub/gdbstub.cpp b/src/core/gdbstub/gdbstub.cpp index 9711c9c71..57e683c49 100644 --- a/src/core/gdbstub/gdbstub.cpp +++ b/src/core/gdbstub/gdbstub.cpp @@ -514,7 +514,7 @@ static bool IsDataAvailable() { fd_set fd_socket; FD_ZERO(&fd_socket); - FD_SET(static_cast(gdbserver_socket), &fd_socket); + FD_SET(gdbserver_socket, &fd_socket); struct timeval t; t.tv_sec = 0;