From 94763ab275bcc4a08b7f62e56fe7e3b60a9247fb Mon Sep 17 00:00:00 2001
From: Stefano Moioli <smxdev4@gmail.com>
Date: Sat, 6 Apr 2024 17:03:55 +0200
Subject: [PATCH] dasm_ctx_t: rename "first_instruction" to "instruction" fix
 wording in find_instruction_with_mem_operand

---
 xzre.c | 2 +-
 xzre.h | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/xzre.c b/xzre.c
index e1d3864..201163d 100644
--- a/xzre.c
+++ b/xzre.c
@@ -61,7 +61,7 @@ int main(int argc, char *argv[]){
 			ctx.flags);
 		printf("      --> ");
 		for(int i=0; i<ctx.instruction_size; i++){
-			printf("%02hhx ", ctx.first_instruction[i]);
+			printf("%02hhx ", ctx.instruction[i]);
 		}
 		printf("\n");
 	};
diff --git a/xzre.h b/xzre.h
index be52693..9a53c99 100644
--- a/xzre.h
+++ b/xzre.h
@@ -143,7 +143,7 @@ assert_offset(backdoor_setup_params_t, entry_ctx, 0x80);
 static_assert(sizeof(backdoor_setup_params_t) == 0x88);
 
 typedef struct __attribute__((packed)) {
-	u8* first_instruction;
+	u8* instruction;
 	u64 instruction_size;
 	u8 flags;
 	u8 flags2;
@@ -170,7 +170,7 @@ typedef struct __attribute__((packed)) {
 	PADDING(47);
 } dasm_ctx_t;
 
-assert_offset(dasm_ctx_t, first_instruction, 0);
+assert_offset(dasm_ctx_t, instruction, 0);
 assert_offset(dasm_ctx_t, instruction_size, 8);
 assert_offset(dasm_ctx_t, flags, 0x10);
 assert_offset(dasm_ctx_t, flags2, 0x11);
@@ -621,8 +621,8 @@ extern BOOL find_lea_instruction(u8 *code_start, u8 *code_end, u64 displacement)
  * @param code_start address to start searching from
  * @param code_end address to stop searching at
  * @param dctx disassembler context to hold the state
- * @param mem_address the expected address of the memory access
- * @return BOOL TRUE if found, FALSE otherwise
+ * @param mem_address the address of the memory fetch (where the instruction will fetch from)
+ * @return BOOL TRUE if an instruction was found, FALSE otherwise
  */
 extern BOOL find_instruction_with_mem_operand(
 	u8 *code_start,