# HG changeset patch
# User Michael Pavone <pavone@retrodev.com>
# Date 1752256533 25200
# Node ID 8d4ee0c04ee0a206b6108f0881b59cdfcf48d544
# Parent  d30e7f605ff83eeb4370bad28a4a7d267d5e2a2b
Implement some more UPD78K/II instructions

diff -r d30e7f605ff8 -r 8d4ee0c04ee0 upd78k2.cpu
--- a/upd78k2.cpu	Thu Jul 10 20:27:49 2025 -0700
+++ b/upd78k2.cpu	Fri Jul 11 10:55:33 2025 -0700
@@ -9,7 +9,7 @@
 	body upd78k2_run_op
 	sync_cycle upd78k2_sync_cycle
 	interrupt upd78k2_interrupt
-	extra_tables sfr bit1 bit2 muldiv base sfrbit spmov indexed regind alt_base alt_indexed alt_regind mov_reg
+	extra_tables sfr bit1 bit2 muldiv base sfrbit spmov indexed regind alt_base alt_indexed alt_regind mov_reg xch_reg
 	include upd78k2_util.c
 regs
 	main 8 x a c b e d l h
@@ -346,6 +346,10 @@
 	upd78k2_op_fetch
 	dispatch scratch1 mov_reg
 
+00100101 xch_reg_prefix
+	upd78k2_op_fetch
+	dispatch scratch1 xch_reg
+
 sfr 00000110 alt_base_prefix
 	upd78k2_op_fetch
 	dispatch scratch1 alt_base
@@ -764,6 +768,32 @@
 	upd78k2_op_fetch
 	main.dst = scratch1
 
+muldiv 1110001R movw_ax_mem
+	local address 16
+	local reg 8
+	reg = R << 2
+	reg |= 5
+	address = main.reg << 8
+	reg -= 1
+	address |= main.reg
+	mem_read address 0
+	x = scratch1
+	address += 1
+	mem_read address 0
+	a = scratch1
+
+muldiv 1110011R movw_mem_ax
+	local address 16
+	local reg 8
+	reg = R << 2
+	reg |= 5
+	address = main.reg << 8
+	reg -= 1
+	address |= main.reg
+	mem_write address x 0
+	address += 1
+	mem_write address a 0
+
 10111RRR mov_r_immed
 	local dst 8
 	dst = R << 1
@@ -845,6 +875,12 @@
 	sfr_write offset x
 	offset += 1
 	sfr_write offset a
+	
+xch_reg 0DDD0SSS xch_r_r
+	xchg main.D main.S
+
+11011RRR xch_a_r
+	xchg a main.R
 
 11000RRR inc_r
 	cycles 2
@@ -1126,6 +1162,34 @@
 muldiv 11001001 decw_sp
 	sp -= 1
 
+010001PP incw_rp
+	local rp 16
+	local reg 8
+	reg = P << 1
+	reg += 1
+	rp = main.reg << 8
+	reg -= 1
+	rp |= main.reg
+	rp += 1
+	update_flags ZA
+	main.reg = rp
+	reg += 1
+	main.reg = rp >> 8
+
+010011PP decw_rp
+	local rp 16
+	local reg 8
+	reg = P << 1
+	reg += 1
+	rp = main.reg << 8
+	reg -= 1
+	rp |= main.reg
+	rp -= 1
+	update_flags ZA
+	main.reg = rp
+	reg += 1
+	main.reg = rp >> 8
+
 00001011 movw_sfrp_immed
 	local offset 8
 	upd78k2_op_fetch