From 653efecd0273425fe1190d54094f1d5e36ceaeca Mon Sep 17 00:00:00 2001
From: YAMAMOTO Takashi <yamamoto@midokura.com>
Date: Thu, 30 Jun 2022 16:45:46 +0900
Subject: [PATCH] debug_engine: Fix a few typos (#1261)

no functional changes are intended.

cf.
https://sourceware.org/gdb/onlinedocs/gdb/General-Query-Packets.html#General-Query-Packets
---
 core/iwasm/libraries/debug-engine/debug_engine.c |  4 ++--
 core/iwasm/libraries/debug-engine/debug_engine.h |  2 +-
 core/iwasm/libraries/debug-engine/gdbserver.c    |  4 ++--
 core/iwasm/libraries/debug-engine/handler.c      | 16 ++++++++--------
 core/iwasm/libraries/debug-engine/handler.h      |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/core/iwasm/libraries/debug-engine/debug_engine.c b/core/iwasm/libraries/debug-engine/debug_engine.c
index 31f45a1f8..1852d05db 100644
--- a/core/iwasm/libraries/debug-engine/debug_engine.c
+++ b/core/iwasm/libraries/debug-engine/debug_engine.c
@@ -1201,11 +1201,11 @@ wasm_debug_instance_get_global(WASMDebugInstance *instance, int32 frame_index,
 
 uint64
 wasm_debug_instance_mmap(WASMDebugInstance *instance, uint32 size,
-                         int32 map_port)
+                         int32 map_prot)
 {
     WASMExecEnv *exec_env;
     uint32 offset = 0;
-    (void)map_port;
+    (void)map_prot;
 
     if (!instance)
         return 0;
diff --git a/core/iwasm/libraries/debug-engine/debug_engine.h b/core/iwasm/libraries/debug-engine/debug_engine.h
index 37d859aba..361f02e41 100644
--- a/core/iwasm/libraries/debug-engine/debug_engine.h
+++ b/core/iwasm/libraries/debug-engine/debug_engine.h
@@ -217,7 +217,7 @@ wasm_debug_instance_get_current_object_name(WASMDebugInstance *instance,
 
 uint64
 wasm_debug_instance_mmap(WASMDebugInstance *instance, uint32 size,
-                         int32 map_port);
+                         int32 map_prot);
 
 bool
 wasm_debug_instance_ummap(WASMDebugInstance *instance, uint64 addr);
diff --git a/core/iwasm/libraries/debug-engine/gdbserver.c b/core/iwasm/libraries/debug-engine/gdbserver.c
index d47449183..eeb0c06bd 100644
--- a/core/iwasm/libraries/debug-engine/gdbserver.c
+++ b/core/iwasm/libraries/debug-engine/gdbserver.c
@@ -19,8 +19,8 @@ struct packet_handler_elem {
 #define DEL_HANDLER(r, h) [r] = { .request = r, .handler = h }
 
 static struct packet_handler_elem packet_handler_table[255] = {
-    DEL_HANDLER('Q', handle_generay_set),
-    DEL_HANDLER('q', handle_generay_query),
+    DEL_HANDLER('Q', handle_general_set),
+    DEL_HANDLER('q', handle_general_query),
     DEL_HANDLER('v', handle_v_packet),
     DEL_HANDLER('?', handle_threadstop_request),
     DEL_HANDLER('H', handle_set_current_thread),
diff --git a/core/iwasm/libraries/debug-engine/handler.c b/core/iwasm/libraries/debug-engine/handler.c
index 0772b48ac..4623f21d4 100644
--- a/core/iwasm/libraries/debug-engine/handler.c
+++ b/core/iwasm/libraries/debug-engine/handler.c
@@ -33,7 +33,7 @@ handle_interrupt(WASMGDBServer *server)
 }
 
 void
-handle_generay_set(WASMGDBServer *server, char *payload)
+handle_general_set(WASMGDBServer *server, char *payload)
 {
     const char *name;
     char *args;
@@ -141,7 +141,7 @@ process_wasm_global(WASMGDBServer *server, char *args)
 }
 
 void
-handle_generay_query(WASMGDBServer *server, char *payload)
+handle_general_query(WASMGDBServer *server, char *payload)
 {
     const char *name;
     char *args;
@@ -179,7 +179,7 @@ handle_generay_query(WASMGDBServer *server, char *payload)
         name = args;
 
         if (!args) {
-            LOG_ERROR("payload parse error during handle_generay_query");
+            LOG_ERROR("payload parse error during handle_general_query");
             return;
         }
 
@@ -669,7 +669,7 @@ handle_malloc(WASMGDBServer *server, char *payload)
 {
     char *args;
     uint64 addr, size;
-    int32 map_port = MMAP_PROT_NONE;
+    int32 map_prot = MMAP_PROT_NONE;
 
     args = strstr(payload, ",");
     if (args) {
@@ -687,19 +687,19 @@ handle_malloc(WASMGDBServer *server, char *payload)
     if (size > 0) {
         while (*args) {
             if (*args == 'r') {
-                map_port |= MMAP_PROT_READ;
+                map_prot |= MMAP_PROT_READ;
             }
             if (*args == 'w') {
-                map_port |= MMAP_PROT_WRITE;
+                map_prot |= MMAP_PROT_WRITE;
             }
             if (*args == 'x') {
-                map_port |= MMAP_PROT_EXEC;
+                map_prot |= MMAP_PROT_EXEC;
             }
             args++;
         }
         addr = wasm_debug_instance_mmap(
             (WASMDebugInstance *)server->thread->debug_instance, size,
-            map_port);
+            map_prot);
         if (addr) {
             snprintf(tmpbuf, sizeof(tmpbuf), "%" PRIx64, addr);
         }
diff --git a/core/iwasm/libraries/debug-engine/handler.h b/core/iwasm/libraries/debug-engine/handler.h
index b2db17b41..47422fddb 100644
--- a/core/iwasm/libraries/debug-engine/handler.h
+++ b/core/iwasm/libraries/debug-engine/handler.h
@@ -18,10 +18,10 @@ void
 handle_interrupt(WASMGDBServer *server);
 
 void
-handle_generay_set(WASMGDBServer *server, char *payload);
+handle_general_set(WASMGDBServer *server, char *payload);
 
 void
-handle_generay_query(WASMGDBServer *server, char *payload);
+handle_general_query(WASMGDBServer *server, char *payload);
 
 void
 handle_v_packet(WASMGDBServer *server, char *payload);