From 19a42a387a4a9316e5626c8079bed4d989d9c3ac Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Mon, 29 Apr 2019 12:16:41 -0700
Subject: [PATCH] LR35902: Fix trailing whitespace in disassembly

---
 CHANGES               |  1 +
 src/lr35902/decoder.c | 15 +++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index a0af8727d..37d9bdb00 100644
--- a/CHANGES
+++ b/CHANGES
@@ -30,6 +30,7 @@ Other fixes:
  - 3DS: Ensure core 2 can be used for threaded renderer (fixes mgba.io/i/1371)
  - GB Core: Fix toggling WIN and OBJ being swapped
  - All: Fix several memory leaks
+ - LR35902: Fix trailing whitespace in disassembly
 Misc:
  - GBA Savedata: EEPROM performance fixes
  - GBA Savedata: Automatically map 1Mbit Flash files as 1Mbit Flash
diff --git a/src/lr35902/decoder.c b/src/lr35902/decoder.c
index 089b52c69..af7a605e6 100644
--- a/src/lr35902/decoder.c
+++ b/src/lr35902/decoder.c
@@ -504,6 +504,9 @@ static int _decodeOperand(struct LR35902Operand op, uint16_t pc, char* buffer, i
 		return 0;
 	}
 
+	strncpy(buffer, " ", blen - 1);
+	ADVANCE(1);
+
 	if (op.flags & LR35902_OP_FLAG_MEMORY) {
 		strncpy(buffer, "[", blen - 1);
 		ADVANCE(1);
@@ -545,16 +548,16 @@ int LR35902Disassemble(struct LR35902InstructionInfo* info, uint16_t pc, char* b
 	int total = 0;
 	const char* cond = _lr35902Conditions[info->condition];
 
-	written = snprintf(buffer, blen - 1, "%s ", mnemonic);
+	written = snprintf(buffer, blen - 1, "%s", mnemonic);
 	ADVANCE(written);
 
 	if (cond) {
-		written = snprintf(buffer, blen - 1, "%s", cond);
+		written = snprintf(buffer, blen - 1, " %s", cond);
 		ADVANCE(written);
 
 		if (info->op1.reg || info->op1.immediate || info->op2.reg || info->op2.immediate) {
-			strncpy(buffer, ", ", blen - 1);
-			ADVANCE(2);
+			strncpy(buffer, ",", blen - 1);
+			ADVANCE(1);
 		}
 	}
 
@@ -565,8 +568,8 @@ int LR35902Disassemble(struct LR35902InstructionInfo* info, uint16_t pc, char* b
 
 	if (info->op2.reg || (!info->op1.immediate && info->opcodeSize > 1 && info->opcode[0] != 0xCB)) {
 		if (written) {
-			strncpy(buffer, ", ", blen - 1);
-			ADVANCE(2);
+			strncpy(buffer, ",", blen - 1);
+			ADVANCE(1);
 		}
 		written = _decodeOperand(info->op2, pc, buffer, blen);
 		ADVANCE(written);