Skip to content

debug-engine: fix a few type mismatches #4189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lum1n0us merged 2 commits into from
Apr 16, 2025
Merged

debug-engine: fix a few type mismatches #4189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
832ff71
debug-engine: fix a few type mismatches
yamt Apr 10, 2025
151e123
debug-engine: use strict prototypes
yamt Apr 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions core/iwasm/libraries/debug-engine/debug_engine.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ static WASMDebugEngine *g_debug_engine;
static uint32 current_instance_id = 1;

static uint32
allocate_instance_id()
allocate_instance_id(void)
{
uint32 id;

Expand Down Expand Up @@ -302,7 +302,7 @@ wasm_debug_control_thread_destroy(WASMDebugInstance *debug_instance)
}

static WASMDebugEngine *
wasm_debug_engine_create()
wasm_debug_engine_create(void)
{
WASMDebugEngine *engine;

Expand All @@ -326,7 +326,7 @@ wasm_debug_engine_create()
}

void
wasm_debug_engine_destroy()
wasm_debug_engine_destroy(void)
{
if (g_debug_engine) {
wasm_debug_handler_deinit();
Expand Down
2 changes: 1 addition & 1 deletion core/iwasm/libraries/debug-engine/debug_engine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ bool
wasm_debug_engine_init(char *ip_addr, int32 process_port);

void
wasm_debug_engine_destroy();
wasm_debug_engine_destroy(void);

WASMExecEnv *
wasm_debug_instance_get_current_env(WASMDebugInstance *instance);
Expand Down
2 changes: 1 addition & 1 deletion core/iwasm/libraries/debug-engine/gdbserver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ static const struct packet_handler_elem packet_handler_table[255] = {
};

WASMGDBServer *
wasm_create_gdbserver(const char *host, int32 *port)
wasm_create_gdbserver(const char *host, int *port)
{
bh_socket_t listen_fd = (bh_socket_t)-1;
WASMGDBServer *server;
Expand Down
2 changes: 1 addition & 1 deletion core/iwasm/libraries/debug-engine/gdbserver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ typedef struct WASMGDBServer {
} WASMGDBServer;

WASMGDBServer *
wasm_create_gdbserver(const char *host, int32 *port);
wasm_create_gdbserver(const char *host, int *port);

bool
wasm_gdbserver_listen(WASMGDBServer *server);
Expand Down
17 changes: 9 additions & 8 deletions core/iwasm/libraries/debug-engine/handler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ static char *tmpbuf;
static korp_mutex tmpbuf_lock;

int
wasm_debug_handler_init()
wasm_debug_handler_init(void)
{
int ret;
tmpbuf = wasm_runtime_malloc(MAX_PACKET_SIZE);
Expand All @@ -51,7 +51,7 @@ wasm_debug_handler_init()
}

void
wasm_debug_handler_deinit()
wasm_debug_handler_deinit(void)
{
wasm_runtime_free(tmpbuf);
tmpbuf = NULL;
Expand Down Expand Up @@ -204,8 +204,7 @@ handle_general_query(WASMGDBServer *server, char *payload)
if (!strcmp(name, "Supported")) {
os_mutex_lock(&tmpbuf_lock);
snprintf(tmpbuf, MAX_PACKET_SIZE,
"qXfer:libraries:read+;PacketSize=%" PRIx32 ";",
MAX_PACKET_SIZE);
"qXfer:libraries:read+;PacketSize=%x;", MAX_PACKET_SIZE);
write_packet(server, tmpbuf);
os_mutex_unlock(&tmpbuf_lock);
}
Expand Down Expand Up @@ -384,7 +383,7 @@ send_thread_stop_status(WASMGDBServer *server, uint32 status, korp_tid tid)

if (status == 0) {
os_mutex_lock(&tmpbuf_lock);
snprintf(tmpbuf, MAX_PACKET_SIZE, "W%02x", status);
snprintf(tmpbuf, MAX_PACKET_SIZE, "W%02" PRIx32, status);
write_packet(server, tmpbuf);
os_mutex_unlock(&tmpbuf_lock);
return;
Expand All @@ -400,8 +399,9 @@ send_thread_stop_status(WASMGDBServer *server, uint32 status, korp_tid tid)

os_mutex_lock(&tmpbuf_lock);
// TODO: how name a wasm thread?
len += snprintf(tmpbuf, MAX_PACKET_SIZE, "T%02xthread:%" PRIx64 ";name:%s;",
gdb_status, (uint64)(uintptr_t)tid, "nobody");
len += snprintf(tmpbuf, MAX_PACKET_SIZE,
"T%02" PRIx32 "thread:%" PRIx64 ";name:%s;", gdb_status,
(uint64)(uintptr_t)tid, "nobody");
if (tids_count > 0) {
len += snprintf(tmpbuf + len, MAX_PACKET_SIZE - len, "threads:");
while (i < tids_count) {
Expand Down Expand Up @@ -624,7 +624,8 @@ void
handle_get_write_memory(WASMGDBServer *server, char *payload)
{
size_t hex_len;
int32 offset, act_len;
int offset;
int32 act_len;
uint64 maddr, mlen;
char *buff;
bool ret;
Expand Down
4 changes: 2 additions & 2 deletions core/iwasm/libraries/debug-engine/handler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
#include "gdbserver.h"

int
wasm_debug_handler_init();
wasm_debug_handler_init(void);

void
wasm_debug_handler_deinit();
wasm_debug_handler_deinit(void);

void
handle_interrupt(WASMGDBServer *server);
Expand Down
Loading