replace by mask53

koron-go · Jul 23, 2022 · 09530a6 · 09530a6
1 parent 53f368c
commit 09530a6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/accum.go b/accum.go
@@ -74,7 +74,7 @@ func (cpu *CPU) cpU8(a, b uint8) uint8 {
 	var nand uint8 = maskS53 | maskZ | maskH | maskPV | maskN | maskC
 	var or uint8
 	or |= uint8(r) & maskS
-	or |= b & (mask5 | mask3)
+	or |= b & mask53
 	if uint8(r) == 0 {
 		or |= maskZ
 	}
@@ -171,9 +171,9 @@ func (cpu *CPU) addU16(a, b uint16) uint16 {
 	a32, b32 := uint32(a), uint32(b)
 	r := a32 + b32
 	c := r ^ a32 ^ b32
-	var nand uint8 = maskH | maskN | maskC | mask5 | mask3
+	var nand uint8 = mask53 | maskH | maskN | maskC
 	var or uint8
-	or |= uint8(r>>8) & (mask5 | mask3)
+	or |= uint8(r>>8) & mask53
 	or |= uint8(c>>8) & maskH
 	or |= uint8(r>>16) & maskC
 	cpu.AF.Lo = cpu.AF.Lo&^nand | or
@@ -282,7 +282,7 @@ func (cpu *CPU) bitchk8(b, v uint8) {
 		or |= maskS
 	}
 	or |= maskH
-	or |= v & (mask5 | mask3)
+	or |= v & mask53
 	cpu.AF.Lo = cpu.AF.Lo&^nand | or
 }
 

diff --git a/op_exbtsg.go b/op_exbtsg.go
@@ -33,7 +33,7 @@ func oopEXSPPIY(cpu *CPU) {
 }
 
 func (cpu *CPU) updateFlagLDID(a uint8) {
-	var nand uint8 = maskH | maskPV | maskN | mask5 | mask3
+	var nand uint8 = mask53 | maskH | maskPV | maskN
 	var or uint8
 	if cpu.BC.Lo != 0 || cpu.BC.Hi != 0 {
 		or |= maskPV

diff --git a/op_rotateshift.go b/op_rotateshift.go
@@ -3,9 +3,9 @@ package z80
 import "math/bits"
 
 func (cpu *CPU) updateFlagRL(r uint8) {
-	var nand uint8 = maskH | maskN | maskC | mask5 | mask3
+	var nand uint8 = mask53 | maskH | maskN | maskC
 	var or = (r >> 7) & maskC
-	or |= r << 1 & (mask5 | mask3)
+	or |= r << 1 & mask53
 	cpu.AF.Lo = cpu.AF.Lo&^nand | or
 }
 
@@ -24,9 +24,9 @@ func oopRLA(cpu *CPU) {
 }
 
 func (cpu *CPU) updateFlagRR(r uint8) {
-	var nand uint8 = maskH | maskN | maskC | mask5 | mask3
+	var nand uint8 = mask53 | maskH | maskN | maskC
 	var or = r & maskC
-	or |= r >> 1 & (mask5 | mask3)
+	or |= r >> 1 & mask53
 	cpu.AF.Lo = cpu.AF.Lo&^nand | or
 }