From 843a5c22619d04e89ace01eeebdfe9c71bcec6c7 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 2 Jun 2021 16:34:00 +0200
Subject: [PATCH] Update 6502 flags handling.

---
 Ghidra/Processors/6502/data/languages/6502.slaspec | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Ghidra/Processors/6502/data/languages/6502.slaspec b/Ghidra/Processors/6502/data/languages/6502.slaspec
index 7775ef3f0d..6cf3f005eb 100644
--- a/Ghidra/Processors/6502/data/languages/6502.slaspec
+++ b/Ghidra/Processors/6502/data/languages/6502.slaspec
@@ -373,6 +373,7 @@ ADDRI:  imm16   is imm16    { tmp:2 = imm16; export *:2 tmp; }
 {
 	SP = SP + 1;
 	A = *:1 (SP);
+	resultFlags(A);
 }
 
 :ROL OP2     is (op=0x26 | op=0x2A | op=0x2E | op=0x36 | op=0x3E) ... & OP2
@@ -448,29 +449,28 @@ ADDRI:  imm16   is imm16    { tmp:2 = imm16; export *:2 tmp; }
 :STA OP1     is (cc=1 & aaa=4) ... & OP1
 {
 	OP1 = A;
-	resultFlags(A);
 }
 
 :STX OP2ST     is (op=0x86 | op=0x8E | op=0x96) ... & OP2ST
 {
 	OP2ST = X;
-	resultFlags(X);
 }
 
 :STY OP2     is (op=0x84 | op=0x8C | op=0x94) ... & OP2
 {
 	OP2 = Y;
-	resultFlags(Y);
 }
 
 :TAX     is op=0xAA
 {
 	X = A;
+	resultFlags(X);
 }
 
 :TAY     is op=0xA8
 {
 	Y = A;
+	resultFlags(Y);
 }
 
 :TSX     is op=0xBA
@@ -481,6 +481,7 @@ ADDRI:  imm16   is imm16    { tmp:2 = imm16; export *:2 tmp; }
 :TXA     is op=0x8A
 {
 	A = X;
+	resultFlags(A);
 }
 
 :TXS     is op=0x9A
@@ -491,4 +492,5 @@ ADDRI:  imm16   is imm16    { tmp:2 = imm16; export *:2 tmp; }
 :TYA     is op=0x98
 {
 	A = Y;
+	resultFlags(A);
 }