Add option to disable safe TSX

Myself086 · Aug 29, 2021 · 7b8c93c · 7b8c93c
1 parent 986cb1d
commit 7b8c93c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/Assembly/Project/Recompiler.asm b/Assembly/Project/Recompiler.asm
@@ -492,9 +492,14 @@ b_loop:
 						jmp	$_Recompiler__Build_loop1_loop_next
 
 Recompiler__Build_loop1_loop_switch_Tsx:
-					// Flag as pulling return
-					lda	#_Opcode_F_PullReturn
-					tsb	$.recompileFlags
+					// Safe TSX?
+					lda	$=RomInfo_StackEmulation
+					and	#_RomInfo_StackEmu_SafeTsx
+					beq	$+b_1
+						// Flag as pulling return
+						lda	#_Opcode_F_PullReturn
+						tsb	$.recompileFlags
+b_1:
 					jmp	$_Recompiler__Build_loop1_loop_next
 
 

diff --git a/Assembly/Project/RomInfo.asm b/Assembly/Project/RomInfo.asm
@@ -117,6 +117,7 @@ RomInfo_StackEmulation:
 	.def	RomInfo_StackEmu_LazyDoubleReturn		0x0001
 	.def	RomInfo_StackEmu_StackUnderflow			0x0002
 	.def	RomInfo_StackEmu_NativeReturn			0x0004
+	.def	RomInfo_StackEmu_SafeTsx				0x0008
 	.def	RomInfo_StackEmu_NativeReturnInterrupt	0x0100
 	.def	RomInfo_StackEmu_NATIVE_MASK			0xff00
 
@@ -339,6 +340,13 @@ RomInfo_Description:
 		RomInfo_SummaryMac	"This option is ignored when 'Native return address' is turned off."
 		RomInfo_DefineMac	"public bool StackEmulation.StackUnderflow : Stack emulation, Stack underflow detection", RomInfo_StackEmulation, RomInfo_StackEmu_StackUnderflow
 
+		RomInfo_SummaryMac	"Treats TSX as needing a non-native return address."
+		RomInfo_SummaryMac	""
+		RomInfo_SummaryMac	"Has no effect on performance but may make or break games."
+		RomInfo_SummaryMac	""
+		RomInfo_SummaryMac	"This option is ignored when 'Native return address' is turned off."
+		RomInfo_DefineMac	"public bool StackEmulation.SafeTsx : Stack emulation, Safe TSX", RomInfo_StackEmulation, RomInfo_StackEmu_SafeTsx
+
 		RomInfo_SummaryMac	"Ignores waiting for interrupt to end when stack pointer is set by TXS to a range specified here."
 		RomInfo_SummaryMac	""
 		RomInfo_SummaryMac	"Only active when the lowest number is on the left side."

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -3,6 +3,7 @@ v1.4.1
 - Fixed some patch-only opcodes
 - Fixed checksum
 - Fixed using patch-only opcodes in WRAM/SRAM
+- Added option to disable safe TSX
 
 v1.4
 - Fixed CHR pattern swapping for mapper 4 (again)

diff --git a/Project Nested/Project_Nested.smc b/Project Nested/Project_Nested.smc