# HG changeset patch
# User Michael Pavone <pavone@retrodev.com>
# Date 1549177339 28800
# Node ID 1f0a86f5e0552579cc2ec9e43a8623046f68a799
# Parent  3b286be82ea5219971f717dd28495f918cb23064
Implemented LDI in new Z80 core

diff -r 3b286be82ea5 -r 1f0a86f5e055 cpu_dsl.py
--- a/cpu_dsl.py	Sat Feb 02 21:22:02 2019 -0800
+++ b/cpu_dsl.py	Sat Feb 02 23:02:19 2019 -0800
@@ -873,11 +873,19 @@
 		params = [prog.resolveParam(p, parent, fieldVals) for p in prog.lastOp.params]
 		return '\n\tif ({a} >= {b}) '.format(a=params[1], b = params[0]) + '{'
 	else:
-		raise ion(">=U not implemented in the general case yet")
+		raise Exception(">=U not implemented in the general case yet")
+
+def _eqCImpl(prog, parent, fieldVals, output):
+	return '\n\tif (!{a}) {'.format(a=prog.resolveParam(prog.lastDst, None, {}))
+
+def _neqCImpl(prog, parent, fieldVals, output):
+	return '\n\tif ({a}) {'.format(a=prog.resolveParam(prog.lastDst, None, {}))
 	
 _ifCmpImpl = {
 	'c': {
-		'>=U': _geuCImpl
+		'>=U': _geuCImpl,
+		'=': _eqCImpl,
+		'!=': _neqCImpl
 	}
 }
 #represents a DSL conditional construct
diff -r 3b286be82ea5 -r 1f0a86f5e055 z80.cpu
--- a/z80.cpu	Sat Feb 02 21:22:02 2019 -0800
+++ b/z80.cpu	Sat Feb 02 23:02:19 2019 -0800
@@ -2015,4 +2015,46 @@
 	z80_set_index B tmp
 	
 fdcb 11BBBRRR set_iyd_reg
-	z80_set_index B main.R
\ No newline at end of file
+	z80_set_index B main.R
+
+ed 10100000 ldi
+	local tmp 16
+	local tmp8 8
+	lsl h 8 tmp
+	or l tmp tmp
+	mov tmp scratch1
+	add 1 tmp tmp
+	mov tmp l
+	lsr tmp 8 h
+	ocall read_8
+	cycles 1
+	
+	add a scratch1 tmp8
+	update_flags H0XN0
+	
+	and 0x2 tmp8 tmp8
+	lsl 4 tmp8 tmp8
+	and 0x88 last_flag_result last_flag_result
+	or tmp8 last_flag_result last_flag_result
+	
+	lsl d 8 tmp
+	or e tmp tmp
+	mov tmp scratch2
+	add 1 tmp tmp
+	mov tmp e
+	lsr tmp 8 d
+	ocall write_8
+	
+	lsl b 8 tmp
+	or c tmp tmp
+	sub 1 tmp tmp
+	
+	mov tmp c
+	lsr tmp 8 b
+	mov c pvflag
+	or b pvflag pvflag
+	
+	
+	
+	cycles 5
+	
\ No newline at end of file