X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fmcs51%2Fpeeph.def;h=d2206dcb7443a901cb8c639b4d4c51398aaa52e3;hb=a24b75e7d87bf0a98c986653268766e8823967a8;hp=97095ba55720498bf40f3856c09b5546c7105d61;hpb=4db4740164fed3cb25145cfdaadb986fc0690507;p=fw%2Fsdcc

diff --git a/src/mcs51/peeph.def b/src/mcs51/peeph.def
index 97095ba5..d2206dcb 100644
--- a/src/mcs51/peeph.def
+++ b/src/mcs51/peeph.def
@@ -1,20 +1,3 @@
-//replace restart {
-//	  pop  %1
-//	  push %1
-//} by {
-//	  ;	  Peephole 1	 removed pop %1 push %1 (not push pop)
-//}
-
-//replace restart {
-//	  pop  %1
-//	  mov  %2,%3
-//	  push %1
-//} by {
-//	  ;	  Peephole 2	 removed pop %1 push %1 (not push pop)
-//	  mov  %2,%3
-//}
-
-//
 // added by Jean Louis VERN for
 // his shift stuff
 replace {
@@ -44,7 +27,7 @@ replace {
 	mov	%1,a
 }
 
-replace {
+replace restart {
 // saving 1 byte, loosing 1 cycle but maybe allowing peephole 3.b to start
 	mov	%1,#0x00
 	mov	%2,#0x00
@@ -126,7 +109,7 @@ replace {
 	clr	a
 	mov	%1,a
 	mov	%2,a
-	;	Peephole 3.h	changed mov %3,#0x00 to %3,a
+	;	Peephole 3.h	changed mov %3,#0x00 to ...,a
 	mov	%3,a
 }
 
@@ -141,7 +124,7 @@ replace {
 	mov	%1,a
 	mov	%2,a
 	mov	%3,a
-	;	Peephole 3.i	changed mov %4,#0x00 to %4,a
+	;	Peephole 3.i	changed mov %4,#0x00 to ...,a
 	mov	%4,a
 }
 
@@ -158,7 +141,7 @@ replace {
 	mov	%2,a
 	mov	%3,a
 	mov	%4,a
-	;	Peephole 3.j	changed mov %5,#0x00 to %5,a
+	;	Peephole 3.j	changed mov %5,#0x00 to ...,a
 	mov	%5,a
 }
 
@@ -177,7 +160,7 @@ replace {
 	mov %3,a
 	mov %4,a
 	mov %5,a
-	;	Peephole 3.k	changed mov %6,#0x00 to %6,a
+	;	Peephole 3.k	changed mov %6,#0x00 to ...,a
 	mov %6,a
 }
 
@@ -187,12 +170,58 @@ replace {
 	mov	a,%1
 	movx	@dptr,a
 } by {
-	;	Peephole 100	removed redundant mov
 	mov	%1,a
 	mov	dptr,#%2
+	;	Peephole 100	removed redundant mov
+	movx	@dptr,a
+} if notVolatile %1
+
+// applies to f.e. lib/src/time.c (--model-large)
+replace {
+	mov	a,%1
+	movx	@dptr,a
+	inc	dptr
+	mov	a,%1
+	movx	@dptr,a
+	inc	dptr
+	mov	a,%1
+	movx	@dptr,a
+	inc	dptr
+	mov	a,%1
+	movx	@dptr,a
+} by {
+	mov	a,%1
+	movx	@dptr,a
+	inc	dptr
+	;	Peephole 101.a	removed redundant moves
+	movx	@dptr,a
+	inc	dptr
+	movx	@dptr,a
+	inc	dptr
+	movx	@dptr,a
+} if notVolatile %1
+
+// applies to f.e. support/regression/tests/literalop.c (--model-large)
+replace {
+	mov	a,%1
+	movx	@dptr,a
+	inc	dptr
+	mov	a,%1
+	movx	@dptr,a
+	inc	dptr
+	mov	a,%1
+	movx	@dptr,a
+} by {
+	mov	a,%1
+	movx	@dptr,a
+	inc	dptr
+	;	Peephole 101.b	removed redundant moves
+	movx	@dptr,a
+	inc	dptr
 	movx	@dptr,a
 } if notVolatile %1
 
+// applies to f.e. support/regression/tests/onebyte.c (--model-large)
 replace {
 	mov	a,%1
 	movx	@dptr,a
@@ -200,10 +229,10 @@ replace {
 	mov	a,%1
 	movx	@dptr,a
 } by {
-	;	Peephole 101	removed redundant mov
 	mov	a,%1
 	movx	@dptr,a
 	inc	dptr
+	;	Peephole 101.c	removed redundant mov
 	movx	@dptr,a
 } if notVolatile %1
 
@@ -215,19 +244,19 @@ replace {
 %3:
 	mov	dpl,%1
 %7:
-	mov	sp,bp
-	pop	bp
+	mov	sp,_bp
+	pop	_bp
 } by {
-	;	Peephole 102	removed redundant mov
+	;	Peephole 102	removed redundant mov to %1
 	mov	dpl,%2
 	ljmp	%3
 %4:
 	mov	dpl,%5
 %3:
 %7:
-	mov	sp,bp
-	pop	bp
-} if notVolatile %1
+	mov	sp,_bp
+	pop	_bp
+} if notVolatile(%1), labelRefCount(%3 1)
 
 replace {
 	mov	%1,%2
@@ -237,37 +266,38 @@ replace {
 %3:
 	mov	dpl,%1
 %7:
-	mov	sp,bp
-	pop	bp
+	mov	sp,_bp
+	pop	_bp
 } by {
-	;	Peephole 103	removed redundant mov
+	;	Peephole 103	removed redundant mov to %1
 	mov	dpl,%2
 	ljmp	%3
 %4:
 	mov	dpl,%5
 %3:
 %7:
-	mov	sp,bp
-	pop	bp
-}
+	mov	sp,_bp
+	pop	_bp
+} if labelRefCount(%3 1)
 
-replace {
-	mov	a,bp
-	clr	c
-	add	a,#0x01
-	mov	r%1,a
-} by {
-	;	Peephole 104	optimized increment (acc not set to r%1, flags undefined)
-	mov	r%1,bp
-	inc	r%1
-}
+// Does not seem to be triggered anymore
+//replace {
+//	mov	a,_bp
+//	clr	c
+//	add	a,#0x01
+//	mov	r%1,a
+//} by {
+//	;	Peephole 104	optimized increment (acc not set to r%1, flags undefined)
+//	mov	r%1,_bp
+//	inc	r%1
+//}
 
 replace {
 	mov	%1,a
 	mov	a,%1
 } by {
-	;	Peephole 105	removed redundant mov
 	mov	%1,a
+	;	Peephole 105	removed redundant mov
 } if notVolatile %1
 
 replace {
@@ -275,9 +305,9 @@ replace {
 	clr	c
 	mov	a,%1
 } by {
-	;	Peephole 106	removed redundant mov
 	mov	%1,a
 	clr	c
+	;	Peephole 106	removed redundant mov
 } if notVolatile %1
 
 replace {
@@ -286,57 +316,57 @@ replace {
 } by {
 	;	Peephole 107	removed redundant ljmp
 %1:
-}
+} if labelRefCountChange(%1 -1)
 
 replace {
 	jc	%1
 	ljmp	%5
 %1:
 } by {
-	;	Peephole 108	removed ljmp by inverse jump logic
+	;	Peephole 108.a	removed ljmp by inverse jump logic
 	jnc	%5
 %1:
-} if labelInRange
+} if labelInRange(), labelRefCountChange(%1 -1)
 
 replace {
 	jz	%1
 	ljmp	%5
 %1:
 } by {
-	;	Peephole 109	removed ljmp by inverse jump logic
+	;	Peephole 108.b	removed ljmp by inverse jump logic
 	jnz	%5
 %1:
-} if labelInRange
+} if labelInRange(), labelRefCountChange(%1 -1)
 
 replace {
 	jnz	%1
 	ljmp	%5
 %1:
 } by {
-	;	Peephole 110	removed ljmp by inverse jump logic
+	;	Peephole 108.c	removed ljmp by inverse jump logic
 	jz	%5
 %1:
-} if labelInRange
+} if labelInRange(), labelRefCountChange(%1 -1)
 
 replace {
 	jb	%1,%2
 	ljmp	%5
 %2:
 } by {
-	;	Peephole 111	removed ljmp by inverse jump logic
+	;	Peephole 108.d	removed ljmp by inverse jump logic
 	jnb	%1,%5
 %2:
-} if labelInRange
+} if labelInRange(), labelRefCountChange(%2 -1)
 
 replace {
 	jnb	%1,%2
 	ljmp	%5
 %2:
 } by {
-	;	Peephole 112.a	removed ljmp by inverse jump logic
+	;	Peephole 108.e	removed ljmp by inverse jump logic
 	jb	%1,%5
 %2:
-} if labelInRange
+} if labelInRange(), labelRefCountChange(%2 -1)
 
 replace {
 	ljmp	%5
@@ -355,7 +385,7 @@ replace {
 	rrc	a
 	mov	%4,c
 } by {
-	;	Peephole 113	optimized misc sequence
+	;	Peephole 113.a	optimized misc sequence
 	clr	%4
 	cjne	%1,%2,%3
 	setb	%4
@@ -371,7 +401,7 @@ replace {
 	rrc	a
 	mov	%4,c
 } by {
-	;	Peephole 114	optimized misc sequence
+	;	Peephole 113.b	optimized misc sequence
 	clr	%4
 	cjne	%1,%2,%3
 	cjne	%10,%11,%3
@@ -386,7 +416,7 @@ replace {
 %3:
 	jnz	%4
 } by {
-	;	Peephole 115.a	jump optimization
+	;	Peephole 115.a	jump optimization (acc not set)
 	cjne	%1,%2,%3
 	sjmp	%4
 %3:
@@ -398,11 +428,11 @@ replace {
 	sjmp	%3
 %2:
 } by {
-	;	Peephole 115.b	jump optimization
 	mov	%1,a
+	;	Peephole 115.b	jump optimization
 	jz	%3
 %2:
-}
+} if labelRefCountChange(%2 -1)
 
 replace {
 	clr	a
@@ -412,7 +442,7 @@ replace {
 %3:
 	jnz	%4
 } by {
-	;	Peephole 116	jump optimization
+	;	Peephole 115.c	jump optimization (acc not set)
 	cjne	%1,%2,%3
 	cjne	%9,%10,%3
 	sjmp	%4
@@ -428,7 +458,7 @@ replace {
 %3:
 	jnz %4
 } by {
-	;	Peephole 117	jump optimization
+	;	Peephole 115.d	jump optimization (acc not set)
 	cjne	%1,%2,%3
 	cjne	%9,%10,%3
 	cjne	%11,%12,%3
@@ -446,7 +476,7 @@ replace {
 %3:
 	jnz	%4
 } by {
-	;	Peephole 118	jump optimization
+	;	Peephole 115.e	jump optimization (acc not set)
 	cjne	%1,%2,%3
 	cjne	%9,%10,%3
 	cjne	%11,%12,%3
@@ -462,10 +492,10 @@ replace {
 %3:
 	jnz	%4
 } by {
-	;	Peephole 119	jump optimization
+	;	Peephole 115.f	jump optimization (acc not set)
 	cjne	%1,%2,%4
 %3:
-} if labelRefCount %3 1
+} if labelRefCount(%3 1), labelRefCountChange(%3 -1)
 
 replace {
 	mov	a,#0x01
@@ -475,11 +505,11 @@ replace {
 %3:
 	jnz	%4
 } by {
-	;	Peephole 120	jump optimization
+	;	Peephole 115.g	jump optimization (acc not set)
 	cjne	%1,%2,%4
 	cjne	%10,%11,%4
 %3:
-} if labelRefCount %3 2
+} if labelRefCount(%3 2), labelRefCountChange(%3 -2), labelRefCountChange(%4 1)
 
 replace {
 	mov	a,#0x01
@@ -490,12 +520,12 @@ replace {
 %3:
 	jnz  %4
 } by {
-	;	Peephole 121	jump optimization
+	;	Peephole 115.h	jump optimization (acc not set)
 	cjne	%1,%2,%4
 	cjne	%10,%11,%4
 	cjne	%12,%13,%4
 %3:
-} if labelRefCount %3 3
+} if labelRefCount(%3 3), labelRefCountChange(%3 -3), labelRefCountChange(%4 2)
 
 replace {
 	mov	a,#0x01
@@ -507,13 +537,13 @@ replace {
 %3:
 	jnz	%4
 } by {
-	;	Peephole 122	jump optimization
+	;	Peephole 115.i	jump optimization (acc not set)
 	cjne	%1,%2,%4
 	cjne	%10,%11,%4
 	cjne	%12,%13,%4
 	cjne	%14,%15,%4
 %3:
-} if labelRefCount %3 4
+} if labelRefCount(%3 4), labelRefCountChange(%3 -4), labelRefCountChange(%4 3)
 
 replace {
 	mov	a,#0x01
@@ -522,7 +552,7 @@ replace {
 %3:
 	jz	%4
 } by {
-	;	Peephole 123	jump optimization
+	;	Peephole 115.j	jump optimization (acc not set)
 	cjne	%1,%2,%3
 	sjmp	%4
 %3:
@@ -536,7 +566,7 @@ replace {
 %3:
 	jz	%4
 } by {
-	;	Peephole 124	jump optimization
+	;	Peephole 115.k	jump optimization (acc not set)
 	cjne	%1,%2,%3
 	cjne	%10,%11,%3
 	sjmp	%4
@@ -552,7 +582,7 @@ replace {
 %3:
 	jz	%4
 } by {
-	;	Peephole 125	jump optimization
+	;	Peephole 115.l	jump optimization (acc not set)
 	cjne	%1,%2,%3
 	cjne	%10,%11,%3
 	cjne	%12,%13,%3
@@ -570,7 +600,7 @@ replace {
 %3:
 	jz	%4
 } by {
-	;	Peephole 126	jump optimization
+	;	Peephole 115.m	jump optimization (acc not set)
 	cjne	%1,%2,%3
 	cjne	%10,%11,%3
 	cjne	%12,%13,%3
@@ -582,11 +612,11 @@ replace {
 replace {
 	push	psw
 	mov	psw,%1
-	push	bp
-	mov	bp,%2
+	push	_bp
+	mov	_bp,%2
 %3:
-	mov	%2,bp
-	pop	bp
+	mov	%2,_bp
+	pop	_bp
 	pop	psw
 	ret
 } by {
@@ -684,7 +714,7 @@ replace {
 	mov	a,%2
 	add	a,#0xff - %1
 	mov	%3,c
-}
+} if operandsLiteral(%1)
 
 replace {
 	clr	c
@@ -696,7 +726,7 @@ replace {
 	mov	a,%2
 	add	a,#0xff - %1
 	jnc	%5
-}
+} if operandsLiteral(%1)
 
 replace {
 	clr	c
@@ -708,19 +738,20 @@ replace {
 	mov	a,%2
 	add	a,#0xff - %1
 	jc	%5
-}
+} if operandsLiteral(%1)
 
-replace {
-	clr	c
-	mov	a,%1
-	subb	a,#%2
-	mov	%3,c
-} by {
-	;	Peephole 132.d	optimized genCmpGt by inverse logic
-	mov	a,#0x100 - %2
-	add	a,%1
-	mov	%3,c
-} if operandsNotRelated('0x00' %2)
+// disabled. See bug1734654.c
+//replace {
+//	clr	c
+//	mov	a,%1
+//	subb	a,#%2
+//	mov	%3,c
+//} by {
+//	;	Peephole 132.d	optimized genCmpGt by inverse logic
+//	mov	a,#0x100 - %2
+//	add	a,%1
+//	mov	%3,c
+//} if operandsNotRelated('0x00' %2), operandsLiteral(%2)
 
 replace {
 	clr	c
@@ -732,7 +763,7 @@ replace {
 	mov	a,#0x100 - %2
 	add	a,%1
 	jc	%5
-} if operandsNotRelated('0x00' %2)
+} if operandsNotRelated('0x00' %2), operandsLiteral(%2)
 
 replace {
 	clr	c
@@ -744,7 +775,7 @@ replace {
 	mov	a,#0x100 - %2
 	add	a,%1
 	jnc	%5
-} if operandsNotRelated('0x00' %2)
+} if operandsNotRelated('0x00' %2), operandsLiteral(%2)
 
 
 replace {
@@ -754,8 +785,8 @@ replace {
 	mov	r%4,%2
 	mov	@r%4,ar%3
 } by {
-	;	Peephole 133	removed redundant moves
 	mov	r%1,%2
+	;	Peephole 133	removed redundant moves
 	inc	@r%1
 	mov	ar%3,@r%1
 } if notVolatile
@@ -767,8 +798,8 @@ replace {
 	mov	r%4,%2
 	mov	@r%4,ar%3
 } by {
-	;	Peephole 134	removed redundant moves
 	mov	r%1,%2
+	;	Peephole 134	removed redundant moves
 	dec	@r%1
 	mov	ar%3,@r%1
 } if notVolatile
@@ -778,8 +809,8 @@ replace {
 	mov	a,r%2
 	orl	a,r%1
 } by {
-	;	Peephole 135	removed redundant mov
 	mov	r%1,a
+	;	Peephole 135	removed redundant mov
 	orl	a,r%2
 }
 
@@ -789,10 +820,10 @@ replace {
 	mov	dph,%3
 	mov	a,%1
 } by {
-	;	Peephole 136	removed redundant moves
 	mov	%1,a
 	mov	dpl,%2
 	mov	dph,%3
+	;	Peephole 136	removed redundant mov
 } if notVolatile %1
 
 // WTF? Doesn't look sensible to me...
@@ -832,7 +863,7 @@ replace {
 	anl	ar%1,%2
 	mov	a,r%1
 } by {
-	;	Peephole 139	removed redundant mov
+	;	Peephole 139.a	removed redundant mov
 	anl	a,%2
 	mov	r%1,a
 }
@@ -842,26 +873,40 @@ replace {
 	orl	ar%1,%2
 	mov	a,r%1
 } by {
-	;	Peephole 140	removed redundant mov
+	;	Peephole 139.b	removed redundant mov
 	orl	a,%2
-	mov	r%1,a }
+	mov	r%1,a
+}
 
 replace {
 	mov	r%1,a
 	xrl	ar%1,%2
 	mov	a,r%1
 } by {
-	;	Peephole 141	removed redundant mov
+	;	Peephole 139.c	removed redundant mov
 	xrl	a,%2
 	mov	r%1,a
 }
 
+// applies to genlshOne
+replace {
+	mov	ar%1,@%2
+	mov	a,r%1
+	add	a,acc
+	mov	r%1,a
+} by {
+	;	Peephole 140	removed redundant mov
+	mov	a,@%2
+	add	a,@%2
+	mov	r%1,a
+}
+
 replace {
 	mov	r%1,a
 	mov	r%2,ar%1
 	mov	ar%1,@r%2
 } by {
-	;	Peephole 142	removed redundant moves
+	;	Peephole 142	removed redundant mov
 	mov	r%2,a
 	mov	ar%1,@r%2
 }
@@ -870,7 +915,7 @@ replace {
 	rlc	a
 	mov	acc.0,c
 } by {
-	;	Peephole 143	converted rlc to rl
+	;	Peephole 143.a	converted rlc to rl
 	rl	a
 }
 
@@ -878,7 +923,7 @@ replace {
 	rrc	a
 	mov	acc.7,c
 } by {
-	;	Peephole 144	converted rrc to rc
+	;	Peephole 143.b	converted rrc to rc
 	rr	a
 }
 
@@ -886,7 +931,7 @@ replace {
 	clr	c
 	addc	a,%1
 } by {
-	;	Peephole 145	changed to add without carry
+	;	Peephole 145.a	changed to add without carry
 	add	a,%1
 }
 
@@ -895,29 +940,30 @@ replace {
 	mov	a,%1
 	addc	a,%2
 } by {
-	;	Peephole 146	changed to add without carry
+	;	Peephole 145.b	changed to add without carry
 	mov	a,%1
 	add	a,%2
 }
 
+// 147: Fix compiler output to comply with 8051 instruction set.
 replace {
 	orl	r%1,a
 } by {
-	;	Peephole 147	changed target address mode r%1 to ar%1
+	;	Peephole 147.a	changed target address mode r%1 to ar%1
 	orl	ar%1,a
 }
 
 replace {
 	anl	r%1,a
 } by {
-	;	Peephole 148	changed target address mode r%1 to ar%1
+	;	Peephole 147.b	changed target address mode r%1 to ar%1
 	anl	ar%1,a
 }
 
 replace {
 	xrl	r%1,a
 } by {
-	;	Peephole 149	changed target address mode r%1 to ar%1
+	;	Peephole 147.c	changed target address mode r%1 to ar%1
 	xrl	ar%1,a
 }
 
@@ -927,7 +973,7 @@ replace {
 %9:
 	ret
 } by {
-	;	Peephole 150	removed misc moves via dpl before return
+	;	Peephole 150.a	removed misc moves via dpl before return
 %9:
 	ret
 }
@@ -940,7 +986,7 @@ replace {
 %9:
 	ret
 } by {
-	;	Peephole 151	removed misc moves via dph, dpl before return
+	;	Peephole 150.b	removed misc moves via dph, dpl before return
 %9:
 	ret
 }
@@ -952,7 +998,7 @@ replace {
 %9:
 	ret
 } by {
-	;	Peephole 152	removed misc moves via dph, dpl before return
+	;	Peephole 150.c	removed misc moves via dph, dpl before return
 %9:
 	ret
 }
@@ -967,7 +1013,7 @@ replace {
 %9:
 	ret
 } by {
-	;	Peephole 153	removed misc moves via dph, dpl, b before return
+	;	Peephole 150.d	removed misc moves via dph, dpl, b before return
 %9:
 	ret
 }
@@ -980,7 +1026,7 @@ replace {
 %9:
 	ret
 } by {
-	;	Peephole 154	removed misc moves via dph, dpl, b before return
+	;	Peephole 150.e	removed misc moves via dph, dpl, b before return
 %9:
 	ret
 }
@@ -994,7 +1040,7 @@ replace {
 %9:
 	ret
 } by {
-	;	Peephole 155	removed misc moves via dph, dpl, b before return
+	;	Peephole 150.f	removed misc moves via dph, dpl, b before return
 %9:
 	ret
 }
@@ -1011,7 +1057,7 @@ replace {
 %9:
 	ret
 } by {
-	;	Peephole 156	removed misc moves via dph, dpl, b, a before return
+	;	Peephole 150.g	removed misc moves via dph, dpl, b, a before return
 %9:
 	ret
 }
@@ -1026,7 +1072,7 @@ replace {
 %9:
 	ret
 } by {
-	;	Peephole 157	removed misc moves via dph, dpl, b, a before return
+	;	Peephole 150.h	removed misc moves via dph, dpl, b, a before return
 %9:
 	ret
 }
@@ -1040,11 +1086,12 @@ replace {
 %9:
 	ret
 } by {
-	;	Peephole 158	removed misc moves via dph, dpl, b, a before return
+	;	Peephole 150.i	removed misc moves via dph, dpl, b, a before return
 %9:
 	ret
 }
 
+// peephole 213.a might revert this
 replace {
 	mov	%1,#%2
 	xrl	%1,#0x80
@@ -1058,69 +1105,69 @@ replace {
 	sjmp	%2
 %1:
 } by {
-	;	Peephole 160	removed sjmp by inverse jump logic
+	;	Peephole 160.a	removed sjmp by inverse jump logic
 	jc	%2
 %1:
-}
+} if labelRefCountChange(%1 -1)
 
 replace {
 	jc	%1
 	sjmp	%2
 %1:
 } by {
-	;	Peephole 161	removed sjmp by inverse jump logic
+	;	Peephole 160.b	removed sjmp by inverse jump logic
 	jnc	%2
 %1:
-}
+} if labelRefCountChange(%1 -1)
 
 replace {
 	jnz	%1
 	sjmp	%2
 %1:
 } by {
-	;	Peephole 162	removed sjmp by inverse jump logic
+	;	Peephole 160.c	removed sjmp by inverse jump logic
 	jz	%2
 %1:
-}
+} if labelRefCountChange(%1 -1)
 
 replace {
 	jz	%1
 	sjmp	%2
 %1:
 } by {
-	;	Peephole 163	removed sjmp by inverse jump logic
+	;	Peephole 160.d	removed sjmp by inverse jump logic
 	jnz	%2
 %1:
-}
+} if labelRefCountChange(%1 -1)
 
 replace {
 	jnb	%3,%1
 	sjmp	%2
 %1:
 } by {
-	;	Peephole 164	removed sjmp by inverse jump logic
+	;	Peephole 160.e	removed sjmp by inverse jump logic
 	jb	%3,%2
 %1:
-}
+} if labelRefCountChange(%1 -1)
 
 replace {
 	jb	%3,%1
 	sjmp	%2
 %1:
 } by {
-	;	Peephole 165	removed sjmp by inverse jump logic
+	;	Peephole 160.f	removed sjmp by inverse jump logic
 	jnb	%3,%2
 %1:
-}
+} if labelRefCountChange(%1 -1)
 
 replace {
 	mov	%1,%2
 	mov	%3,%1
 	mov	%2,%1
 } by {
-	;	Peephole 166	removed redundant mov
 	mov	%1,%2
 	mov	%3,%1
+	;	Peephole 166	removed redundant mov
 } if notVolatile %1 %2
 
 replace {
@@ -1140,7 +1187,7 @@ replace {
 	;	Peephole 168	jump optimization
 	jb	%1,%3
 %2:
-}
+} if labelRefCountChange(%2 -1)
 
 replace {
 	jb	%1,%2
@@ -1150,7 +1197,7 @@ replace {
 	;	Peephole 169	jump optimization
 	jnb	%1,%3
 %2:
-}
+} if labelRefCountChange(%2 -1)
 
 replace {
 	clr	a
@@ -1162,7 +1209,7 @@ replace {
 	;	Peephole 170	jump optimization
 	cjne	%1,%2,%4
 %3:
-} if labelRefCount %3 1
+} if labelRefCount(%3 1), labelRefCountChange(%3 -1)
 
 replace {
 	clr	a
@@ -1176,7 +1223,7 @@ replace {
 	cjne	%1,%2,%4
 	cjne	%9,%10,%4
 %3:
-} if labelRefCount %3 2
+} if labelRefCount(%3 2), labelRefCountChange(%3 -2), labelRefCountChange(%4 1)
 
 replace {
 	clr	a
@@ -1192,7 +1239,7 @@ replace {
 	cjne	%9,%10,%4
 	cjne	%11,%12,%4
 %3:
-} if labelRefCount %3 3
+} if labelRefCount(%3 3), labelRefCountChange(%3 -3), labelRefCountChange(%4 2)
 
 replace {
 	clr	a
@@ -1210,7 +1257,7 @@ replace {
 	cjne	%11,%12,%4
 	cjne	%13,%14,%4
 %3:
-} if labelRefCount %3 4
+} if labelRefCount(%3 4), labelRefCountChange(%3 -4), labelRefCountChange(%4 3)
 
 replace {
 	mov	r%1,%2
@@ -1219,8 +1266,8 @@ replace {
 	subb	a,#0x01
 	mov	%2,a
 } by {
-	;	Peephole 174	optimized decrement (acc not set to %2, flags undefined)
 	mov	r%1,%2
+	;	Peephole 174.a	optimized decrement (acc not set to %2, flags undefined)
 	dec	%2
 }
 
@@ -1230,8 +1277,8 @@ replace {
 	add	a,#0x01
 	mov	%2,a
 } by {
-	;	Peephole 175	optimized increment (acc not set to %2, flags undefined)
 	mov	r%1,%2
+	;	Peephole 174.b	optimized increment (acc not set to %2, flags undefined)
 	inc	%2
 }
 
@@ -1240,7 +1287,7 @@ replace {
 	inc	%1
 	mov	@r%2,%1
 } by {
-	;	Peephole 176	optimized increment, removed redundant mov
+	;	Peephole 174.c	optimized increment, removed redundant mov
 	inc	@r%2
 	mov	%1,@r%2
 } if notVolatile
@@ -1250,8 +1297,8 @@ replace {
 	mov  %1,%2
 	mov  %2,%1
 } by {
-	;	Peephole 177.a	removed redundant mov
 	mov  %1,%2
+	;	Peephole 177.a	removed redundant mov
 } if notVolatile %1 %2
 
 // applies to f.e. scott-add.asm (--model-large)
@@ -1259,8 +1306,8 @@ replace {
 	mov	r%1,a
 	mov	a,ar%1
 } by {
-	;	Peephole 177.b	removed redundant mov
 	mov	r%1,a
+	;	Peephole 177.b	removed redundant mov
 }
 
 // applies to f.e. bug-408972.c
@@ -1268,9 +1315,9 @@ replace {
 	mov	%1,%2
 	mov	%1,%3
 } by {
-	;	Peephole 177.c	removed redundant move
+	;	Peephole 177.c	removed redundant mov
 	mov	%1,%3
-} if notVolatile %1 %2
+} if notVolatile(%1 %2),operandsNotRelated(%1 %3)
 
 // applies to f.e. bug-408972.c
 // not before peephole 177.c
@@ -1279,10 +1326,10 @@ replace restart {
 	mov	%3,%4
 	mov	%2,%1
 } by {
-	;	Peephole 177.d	removed redundant move
 	mov	%1,%2
 	mov	%3,%4
-} if notVolatile(%1 %2),operandsNotRelated(%1 %3)
+	;	Peephole 177.d	removed redundant mov
+} if notVolatile(%1 %2),operandsNotRelated(%1 %2 %3)
 
 // applies to f.e. bug-607243.c
 // also check notVolatile %3, as it will return FALSE if it's @r%1
@@ -1290,7 +1337,7 @@ replace {
 	mov	r%1,%2
 	mov	ar%1,%3
 } by {
-	;	peephole 177.e	removed redundant move
+	;	peephole 177.e	removed redundant mov
 	mov	ar%1,%3
 } if notVolatile %2 %3
 
@@ -1298,7 +1345,7 @@ replace {
 	mov	ar%1,%2
 	mov	r%1,%3
 } by {
-	;	peephole 177.f	removed redundant move
+	;	peephole 177.f	removed redundant mov
 	mov	r%1,%3
 } if notVolatile %2
 
@@ -1320,6 +1367,16 @@ replace {
 	mov	%1,a
 } if notVolatile %2
 
+// applies to f.e. testfwk.c
+replace {
+	mov	r%1,a
+	mov	ar%2,r%1
+} by {
+	mov	r%1,a
+	;	peephole 177.i	optimized mov sequence
+	mov	r%2,a
+}
+
 replace {
 	mov	a,%1
 	mov	b,a
@@ -1349,10 +1406,10 @@ replace {
 	movx	@dptr,a
 	mov	dptr,%1
 } by {
-	;	Peephole 180.a	removed redundant mov to dptr
 	mov	dptr,%1
 	mov	a,%2
 	movx	@dptr,a
+	;	Peephole 180.a	removed redundant mov to dptr
 }
 
 // volatile xdata char t; t=0x01; t=0x03; t=0x01;
@@ -1364,12 +1421,12 @@ replace {
 	movx	@dptr,a
 	mov	dptr,%1
 } by {
-	;	Peephole 180.b	removed redundant mov to dptr
 	mov	dptr,%1
 	mov	a,%2
 	movx	@dptr,a
 	mov	a,%3
 	movx	@dptr,a
+	;	Peephole 180.b	removed redundant mov to dptr
 }
 
 // saving 1 byte, 0 cycles
@@ -1424,7 +1481,7 @@ replace {
 	anl	%1,#%3
 } by {
 	;	Peephole 183	avoided anl during execution
-	anl	%1,#(%2 & %3)
+	anl	%1,#(%2&%3)
 }
 
 replace {
@@ -1437,17 +1494,18 @@ replace {
 	mov	%1,a
 } if notVolatile %1
 
-replace {
-// acc being incremented might cause problems
-	mov	%1,a
-	inc	%1
-} by {
-	;	Peephole 185	changed order of increment (acc incremented also!)
-	inc	a
-	mov	%1,a
-} if notVolatile %1
+//replace {
+// acc being incremented might cause problems with register tracking
+//	mov	%1,a
+//	inc	%1
+//} by {
+//	;	Peephole 185	changed order of increment (acc incremented also!)
+//	inc	a
+//	mov	%1,a
+//} if notVolatile %1
 
-replace {
+// char indexed access to: long code table[] = {4,3,2,1};
+replace restart {
 	add	a,#%1
 	mov	dpl,a
 	clr	a
@@ -1466,25 +1524,28 @@ replace {
 	mov	%4,a
 	inc	dptr
 	clr	a
+	movc	a,@a+dptr
 } by {
 	;	Peephole 186.a	optimized movc sequence
+	mov	b,a
 	mov	dptr,#%1
-	mov	b,acc
 	movc	a,@a+dptr
 	mov	%2,a
-	mov	acc,b
 	inc	dptr
+	mov	a,b
 	movc	a,@a+dptr
 	mov	%3,a
-	mov	acc,b
 	inc	dptr
+	mov	a,b
 	movc	a,@a+dptr
 	mov	%4,a
-	mov	acc,b
 	inc	dptr
+	mov	a,b
+	movc	a,@a+dptr
 }
 
-replace {
+// char indexed access to: void* code table[] = {4,3,2,1};
+replace restart {
 	add	a,#%1
 	mov	dpl,a
 	clr	a
@@ -1499,21 +1560,24 @@ replace {
 	mov	%3,a
 	inc	dptr
 	clr	a
+	movc	a,@a+dptr
 } by {
 	;	Peephole 186.b	optimized movc sequence
+	mov	b,a
 	mov	dptr,#%1
-	mov	b,acc
 	movc	a,@a+dptr
 	mov	%2,a
-	mov	acc,b
 	inc	dptr
+	mov	a,b
 	movc	a,@a+dptr
 	mov	%3,a
-	mov	acc,b
 	inc	dptr
+	mov	a,b
+	movc	a,@a+dptr
 }
 
-replace {
+// char indexed access to: int code table[] = {4,3,2,1};
+replace restart {
 	add	a,#%1
 	mov	dpl,a
 	clr	a
@@ -1524,14 +1588,15 @@ replace {
 	mov	%2,a
 	inc	dptr
 	clr	a
+	movc	a,@a+dptr
 } by {
 	;	Peephole 186.c	optimized movc sequence
+	mov	%2,a
 	mov	dptr,#%1
-	mov	b,acc
 	movc	a,@a+dptr
-	mov	%2,a
-	mov	acc,b
+	xch	a,%2
 	inc	dptr
+	movc	a,@a+dptr
 }
 
 // char indexed access to: char code table[] = {4,3,2,1};
@@ -1555,8 +1620,8 @@ replace {
 	mul	ab
 	add	a,#%2
 	mov	dpl,a
-	mov	a,b
-	addc	a,#(%2 >> 8)
+	mov	a,#(%2 >> 8)
+	addc	a,b
 	mov	dph,a
 	clr	a
 	movc	a,@a+dptr
@@ -1606,9 +1671,9 @@ replace {
 	mov	a,#0x0f
 	anl	a,%1
 } by {
-	;	Peephole 189	removed redundant mov and anl
 	anl	a,#0x0f
 	mov	%1,a
+	;	Peephole 189	removed redundant mov and anl
 } if notVolatile %1
 
 // rules 190 & 191 need to be in order
@@ -1617,9 +1682,9 @@ replace {
 	lcall	__gptrput
 	mov	a,%1
 } by {
-	;	Peephole 190	removed redundant mov
 	mov	a,%1
 	lcall	__gptrput
+	;	Peephole 190	removed redundant mov
 } if notVolatile %1
 
 replace {
@@ -1629,22 +1694,33 @@ replace {
 	mov	b,%4
 	mov	a,%1
 } by {
-	;	Peephole 191	removed redundant mov
 	mov	%1,a
 	mov	dpl,%2
 	mov	dph,%3
 	mov	b,%4
+	;	Peephole 191	removed redundant mov
 } if notVolatile %1
 
+// applies to f.e. regression/ports/mcs51/support.c
 replace {
 	mov	r%1,a
 	mov	@r%2,ar%1
 } by {
-	;	Peephole 192	used a instead of ar%1 as source
 	mov	r%1,a
+	;	Peephole 192.a	used a instead of ar%1 as source
 	mov	@r%2,a
 }
 
+// applies to f.e. printf_large.c
+replace {
+	mov	ar%1,@r%2
+	mov	a,r%1
+} by {
+	;	Peephole 192.b	used a instead of ar%1 as destination
+	mov	a,@r%2
+	mov	r%1,a
+}
+
 replace {
 	jnz	%3
 	mov	a,%4
@@ -1666,8 +1742,8 @@ replace {
 	mov	a,%12
 	cjne	%13,%14,%8
 	sjmp	%7
-;%3:
-} if labelRefCount %3 4
+%3:
+} if labelInRange(%8), labelRefCount(%3 4), labelRefCountChange(%3 -4), labelRefCountChange(%8 3)
 
 replace {
 	cjne	%1,%2,%3
@@ -1690,8 +1766,8 @@ replace {
 	mov	a,%12
 	cjne	%13,%14,%8
 	sjmp	%7
-;%3:
-} if labelRefCount %3 4
+%3:
+} if labelInRange(%8), labelRefCount(%3 4), labelRefCountChange(%3 -4), labelRefCountChange(%8 3)
 
 replace {
 	cjne	@%1,%2,%3
@@ -1714,8 +1790,8 @@ replace {
 	inc	%1
 	cjne	@%1,%14,%8
 	sjmp	%7
-;%3:
-} if labelRefCount %3 4
+%3:
+} if labelInRange(%8), labelRefCount(%3 4), labelRefCountChange(%3 -4), labelRefCountChange(%8 3)
 
 replace {
 	cjne	%1,%2,%3
@@ -1732,8 +1808,8 @@ replace {
 	cjne	%10,%11,%8
 	cjne	%13,%14,%8
 	sjmp	%7
-;%3:
-} if labelRefCount %3 4
+%3:
+} if labelInRange(%8), labelRefCount(%3 4), labelRefCountChange(%3 -4), labelRefCountChange(%8 3)
 
 replace {
 	jnz	%3
@@ -1752,8 +1828,8 @@ replace {
 	mov	a,%9
 	cjne	%10,%11,%8
 	sjmp	%7
-;%3:
-} if labelRefCount %3 3
+%3:
+} if labelInRange(%8), labelRefCount(%3 3), labelRefCountChange(%3 -3), labelRefCountChange(%8 2)
 
 replace {
 	cjne	%1,%2,%3
@@ -1772,8 +1848,8 @@ replace {
 	mov	a,%9
 	cjne	%10,%11,%8
 	sjmp	%7
-;%3:
-} if labelRefCount %3 3
+%3:
+} if labelInRange(%8), labelRefCount(%3 3), labelRefCountChange(%3 -3), labelRefCountChange(%8 2)
 
 replace {
 	cjne	@%1,%2,%3
@@ -1792,8 +1868,8 @@ replace {
 	inc	%1
 	cjne	@%1,%11,%8
 	sjmp	%7
-;%3:
-} if labelRefCount %3 3
+%3:
+} if labelInRange(%8), labelRefCount(%3 3), labelRefCountChange(%3 -3), labelRefCountChange(%8 2)
 
 replace {
 	cjne	%1,%2,%3
@@ -1808,8 +1884,8 @@ replace {
 	cjne	%5,%6,%8
 	cjne	%10,%11,%8
 	sjmp	%7
-;%3:
-} if labelRefCount %3 3
+%3:
+} if labelInRange(%8), labelRefCount(%3 3), labelRefCountChange(%3 -3), labelRefCountChange(%8 2)
 
 replace {
 	jnz	%3
@@ -1824,8 +1900,8 @@ replace {
 	mov	a,%4
 	cjne	%5,%6,%8
 	sjmp	%7
-;%3:
-} if labelRefCount %3 2
+%3:
+} if labelInRange(%8), labelRefCount(%3 2), labelRefCountChange(%3 -2), labelRefCountChange(%8 1)
 
 replace {
 	cjne	%1,%2,%3
@@ -1840,8 +1916,8 @@ replace {
 	mov	a,%4
 	cjne	%5,%6,%8
 	sjmp	%7
-;%3:
-} if labelRefCount %3 2
+%3:
+} if labelInRange(%8), labelRefCount(%3 2), labelRefCountChange(%3 -2), labelRefCountChange(%8 1)
 
 replace {
 	cjne	 @%1,%2,%3
@@ -1856,8 +1932,8 @@ replace {
 	inc	%1
 	cjne	@%1,%6,%8
 	sjmp	%7
-;%3:
-} if labelRefCount %3 2
+%3:
+} if labelInRange(%8), labelRefCount(%3 2), labelRefCountChange(%3 -2), labelRefCountChange(%8 1)
 
 replace {
 	cjne	%1,%2,%3
@@ -1866,12 +1942,12 @@ replace {
 %3:
 	sjmp	%8
 } by {
-	;	Peephole 198	optimized misc jump sequence
+	;	Peephole 198.a	optimized misc jump sequence
 	cjne	%1,%2,%8
 	cjne	%5,%6,%8
 	sjmp	%7
-;%3:
-} if labelRefCount %3 2
+%3:
+} if labelInRange(%8), labelRefCount(%3 2), labelRefCountChange(%3 -2), labelRefCountChange(%8 1)
 
 replace {
 	cjne	%1,%2,%3
@@ -1879,29 +1955,29 @@ replace {
 %3:
 	sjmp	%5
 } by {
-	;	Peephole 199	optimized misc jump sequence
+	;	Peephole 198.b	optimized misc jump sequence
 	cjne	%1,%2,%5
 	sjmp	%4
-;%3:
-} if labelRefCount %3 1
+%3:
+} if labelInRange(%5), labelRefCount(%3 1), labelRefCountChange(%3 -1)
 
 replace {
 	sjmp	%1
 %1:
 } by {
-	;	Peephole 200	removed redundant sjmp
+	;	Peephole 200.a	removed redundant sjmp
 %1:
-}
+} if labelRefCountChange(%1 -1)
 
 replace {
 	sjmp	%1
 %2:
 %1:
 } by {
-	;	Peephole 201	removed redundant sjmp
+	;	Peephole 200.b	removed redundant sjmp
 %2:
 %1:
-}
+} if labelRefCountChange(%1 -1)
 
 replace {
 	push	acc
@@ -1942,22 +2018,23 @@ replace {
 	djnz	%1,%4
 %2:
 %3:
-} if labelRefCount %2 1
+} if labelRefCount(%2 1), labelRefCountChange(%2 -1), labelRefCountChange(%3 -1)
 
 replace {
 	mov	%1,%1
 } by {
 	;	Peephole 206	removed redundant mov %1,%1
-} if notVolatile
+} if notVolatile %1
 
-replace {
-	mov	a,_bp
-	add	a,#0x00
-	mov	%1,a
-} by {
-	;	Peephole 207	removed zero add (acc not set to %1, flags undefined)
-	mov	%1,_bp
-}
+// Does not seem to be triggered anymore
+//replace {
+//	mov	a,_bp
+//	add	a,#0x00
+//	mov	%1,a
+//} by {
+//	;	Peephole 207	removed zero add (acc not set to %1, flags undefined)
+//	mov	%1,_bp
+//}
 
 replace {
 	push	acc
@@ -1968,16 +2045,17 @@ replace {
 	mov	r%1,_bp
 }
 
-replace {
-	mov	a,_bp
-	add	a,#0x00
-	inc	a
-	mov	%1,a
-} by {
-	;	Peephole 209	optimized increment (acc not set to %1, flags undefined)
-	mov	%1,_bp
-	inc	%1
-}
+// Does not seem to be triggered anymore
+//replace {
+//	mov	a,_bp
+//	add	a,#0x00
+//	inc	a
+//	mov	%1,a
+//} by {
+//	;	Peephole 209	optimized increment (acc not set to %1, flags undefined)
+//	mov	%1,_bp
+//	inc	%1
+//}
 
 replace {
 	mov	dptr,#((((%1 >> 8)) <<8) + %1)
@@ -1993,16 +2071,18 @@ replace {
 	;	Peephole 211	removed redundant push %1 pop %1
 }
 
-replace {
-	mov	a,_bp
-	add	a,#0x01
-	mov	r%1,a
-} by {
-	;	Peephole 212	reduced add sequence to inc
-	mov	r%1,_bp
-	inc	r%1
-}
+// Does not seem to be triggered anymore
+//replace {
+//	mov	a,_bp
+//	add	a,#0x01
+//	mov	r%1,a
+//} by {
+//	;	Peephole 212	reduced add sequence to inc
+//	mov	r%1,_bp
+//	inc	r%1
+//}
 
+// reverts peephole 159? asx8051 cannot handle, too complex?
 replace {
 	mov	%1,#(( %2 >> 8 ) ^ 0x80)
 } by {
@@ -2025,8 +2105,8 @@ replace	 {
 	mov	a,%2
 	add	a,%1
 } by {
-	;	Peephole 214	reduced some extra moves
 	mov	%1,a
+	;	Peephole 214.a	removed redundant mov
 	add	a,%2
 } if operandsNotSame
 
@@ -2035,7 +2115,7 @@ replace {
 	add	a,%2
 	mov	%1,a
 } by {
-	;	Peephole 215	removed some moves
+	;	Peephole 214.b	removed redundant mov
 	add	a,%2
 	mov	%1,a
 } if operandsNotSame
@@ -2048,9 +2128,9 @@ replace {
 	dec	r%1
 	mov	@r%1,a
 } by {
-	;	Peephole 216	simplified clear (2bytes)
 	mov	r%1,%2
 	clr	a
+	;	Peephole 216.a	simplified clear (2 bytes)
 	mov	@r%1,a
 	inc	r%1
 	mov	@r%1,a
@@ -2067,9 +2147,9 @@ replace {
 	dec	r%1
 	mov	@r%1,a
 } by {
-	;	Peephole 217	simplified clear (3bytes)
 	mov	r%1,%2
 	clr	a
+	;	Peephole 216.b	simplified clear (3 bytes)
 	mov	@r%1,a
 	inc	r%1
 	mov	@r%1,a
@@ -2091,9 +2171,9 @@ replace {
 	dec	r%1
 	mov	@r%1,a
 } by {
-	;	Peephole 218	simplified clear (4bytes)
 	mov	r%1,%2
 	clr	a
+	;	Peephole 216.c	simplified clear (4 bytes)
 	mov	@r%1,a
 	inc	r%1
 	mov	@r%1,a
@@ -2110,7 +2190,7 @@ replace {
 	clr	a
 	movx	@dptr,a
 } by {
-	;	Peephole 219	removed redundant clear
+	;	Peephole 219.a	removed redundant clear
 	clr	a
 	movx	@dptr,a
 	mov	dptr,%1
@@ -2126,12 +2206,12 @@ replace {
 	clr	a
 	movx	@dptr,a
 } by {
-	;	Peephole 219.a	removed redundant clear
 	clr	a
 	movx	@dptr,a
 	mov	dptr,%1
 	movx	@dptr,a
 	mov	dptr,%2
+	;	Peephole 219.b	removed redundant clear
 	movx	@dptr,a
 }
 
@@ -2154,13 +2234,13 @@ replace {
 replace {
 	mov	%1 + %2,(%2 + %1)
 } by {
-	;	Peephole 221.a	remove redundant move
+	;	Peephole 221.a	remove redundant mov
 } if notVolatile
 
 replace {
 	mov	(%1 + %2 + %3),((%2 + %1) + %3)
 } by {
-	;	Peephole 221.b	remove redundant move
+	;	Peephole 221.b	remove redundant mov
 } if notVolatile
 
 replace {
@@ -2176,9 +2256,9 @@ replace {
 	mov	dpl,%1
 	mov	dph,%2
 } by {
-	;	Peephole 223	removed redundant dph/dpl moves
 	mov	%1,dpl
 	mov	%2,dph
+	;	Peephole 223.a	removed redundant dph/dpl moves
 } if notVolatile %1 %2
 
 replace {
@@ -2187,9 +2267,9 @@ replace {
 	mov	dpl,%1
 	mov	dph,(%1 + 1)
 } by {
-	;	Peephole 224	removed redundant dph/dpl moves
 	mov	%1,dpl
 	mov	(%1 + 1),dph
+	;	Peephole 223.b	removed redundant dph/dpl moves
 } if notVolatile %1
 
 replace {
@@ -2200,28 +2280,40 @@ replace {
 	mov	b,%4
 	mov	a,%1
 } by {
-	;	Peephole 225	removed redundant move to acc
 	mov	a,%1
 	movx	@dptr,a
 	mov	dpl,%2
 	mov	dph,%3
 	mov	b,%4
+	;	Peephole 225	removed redundant move to acc
 } if notVolatile %1
 
 replace {
 	clr	a
 	movx	@%1,a
 	inc	%1
-	movx	@%1,a
-	inc	%1
 	clr	a
 } by {
-	;	Peephole 226	removed unnecessary clr
 	clr	a
 	movx	@%1,a
 	inc	%1
-	movx	@%1,a
-	inc	%1
+	;	Peephole 226.a	removed unnecessary clr
+}
+
+replace {
+	clr	a
+	movx	@%1,a
+	inc	%1
+	movx	@%1,a
+	inc	%1
+	clr	a
+} by {
+	clr	a
+	movx	@%1,a
+	inc	%1
+	movx	@%1,a
+	inc	%1
+	;	Peephole 226.b	removed unnecessary clr
 }
 
 replace {
@@ -2238,9 +2330,9 @@ replace {
 	lcall	__decdptr
 	movx	@dptr,a
 } by {
-	;	Peephole 227	replaced inefficient 32 bit clear
 	mov	dptr,#%1
 	clr	a
+	;	Peephole 227.a	replaced inefficient 32 bit clear
 	movx	@dptr,a
 	inc	dptr
 	movx	@dptr,a
@@ -2266,8 +2358,8 @@ replace {
 	mov	a,#%2
 	movx	@dptr,a
 } by {
-	;	Peephole 228	replaced inefficient 32 constant
 	mov	dptr,#%1
+	;	Peephole 227.b	replaced inefficient 32 constant
 	mov	a,#%2
 	movx	@dptr,a
 	inc	dptr
@@ -2288,9 +2380,9 @@ replace {
 	lcall	__decdptr
 	movx	@dptr,a
 } by {
-	;	Peephole 229	replaced inefficient 16 bit clear
 	mov	dptr,#%1
 	clr	a
+	;	Peephole 227.c	replaced inefficient 16 bit clear
 	movx	@dptr,a
 	inc	dptr
 	movx	@dptr,a
@@ -2306,8 +2398,8 @@ replace {
 	mov	a,#%2
 	movx	@dptr,a
 } by {
-	;	Peephole 230	replaced inefficient 16 bit constant
 	mov	dptr,#%1
+	;	Peephole 227.d	replaced inefficient 16 bit constant
 	mov	a,#%2
 	movx	@dptr,a
 	inc	dptr
@@ -2316,12 +2408,12 @@ replace {
 	mov	dptr,#%1
 }
 
-// this last peephole often removes the last mov from 227-230
+// this last peephole often removes the last mov from 227.a - 227.d
 replace {
 	mov	dptr,#%1
 	mov	dptr,#%2
 } by {
-	;	Peephole 231	removed redundant mov to dptr
+	;	Peephole 227.e	removed redundant mov to dptr
 	mov	dptr,#%2
 }
 
@@ -2346,7 +2438,7 @@ replace {
 %2:
 	ret
 } by {
-	;	Peephole 234	loading dpl directly from a(ccumulator), r%1 not set
+	;	Peephole 234.a	loading dpl directly from a(ccumulator), r%1 not set
 	mov	dpl,a
 %2:
 	ret
@@ -2359,7 +2451,7 @@ replace {
 %3:
 	ret
 } by {
-	;	Peephole 235	loading dph directly from a(ccumulator), r%1 not set
+	;	Peephole 234.b	loading dph directly from a(ccumulator), r%1 not set
 	mov	dpl,r%2
 	mov	dph,a
 %3:
@@ -2479,7 +2571,7 @@ replace {
 	mov	%3,%4
 %1:
 	ret
-}
+} if labelRefCountChange(%1 -1)
 
 replace {
 	sjmp	%1
@@ -2498,7 +2590,7 @@ replace {
 	mov	dph,%6
 %1:
 	ret
-}
+} if labelRefCountChange(%1 -1)
 
 // applies to f.e. device/lib/log10f.c
 replace {
@@ -2527,7 +2619,7 @@ replace {
 	mov	%7,%15
 	mov	%8,%16
 	;	Peephole 238.a	removed 4 redundant moves
-} if operandsNotSame8 %1 %2 %3 %4 %5 %6 %7 %8
+} if operandsNotSame8(%1 %2 %3 %4 %5 %6 %7 %8), notVolatile(%1 %2 %3 %4 %9 %10 %11 %12)
 
 // applies to device/lib/log10f.c
 replace {
@@ -2545,7 +2637,7 @@ replace {
 	mov	%3,%7
 	mov	%4,%8
 	;	Peephole 238.b	removed 3 redundant moves
-} if operandsNotSame7 %1 %2 %3 %4 %5 %6 %7
+} if operandsNotSame7(%1 %2 %3 %4 %5 %6 %7), notVolatile(%1 %2 %3 %5 %6 %7)
 
 // applies to f.e. device/lib/time.c
 replace {
@@ -2564,7 +2656,7 @@ replace {
 	mov	%3,%7
 	mov	%4,%8
 	;	Peephole 238.c	removed 2 redundant moves
-} if operandsNotSame4 %1 %2 %3 %4
+} if operandsNotSame4(%1 %2 %3 %4), notVolatile(%1 %2 %5 %6)
 
 // applies to f.e. support/regression/tests/bug-524209.c
 replace {
@@ -2580,7 +2672,7 @@ replace {
 	mov	%2,%5
 	mov	%3,%6
 	;	Peephole 238.d	removed 3 redundant moves
-} if operandsNotSame6 %1 %2 %3 %4 %5 %6
+} if operandsNotSame6(%1 %2 %3 %4 %5 %6), notVolatile(%1 %2 %3 %4 %5 %6)
 
 // applies to f.e. ser_ir.asm
 replace {
@@ -2599,133 +2691,180 @@ replace restart {
 	addc	a,%1
 }
 
-// peepholes 241.a to 241.c and 241.d to 241.f need to be in order
+// peepholes 241.a to 241.d and 241.e to 241.h need to be in order
 replace {
-	cjne	r%1,#%2,%3
-	cjne	r%4,#%5,%3
-	cjne	r%6,#%7,%3
-	cjne	r%8,#%9,%3
+	cjne	r%2,#%3,%0
+	cjne	r%4,#%5,%0
+	cjne	r%6,#%7,%0
+	cjne	r%8,#%9,%0
 	mov	a,#0x01
-	sjmp	%10
-%3:
+	sjmp	%1
+%0:
 	clr	a
-%10:
+%1:
 } by {
 	;	Peephole 241.a	optimized compare
 	clr	a
-	cjne	r%1,#%2,%3
-	cjne	r%4,#%5,%3
-	cjne	r%6,#%7,%3
-	cjne	r%8,#%9,%3
+	cjne	r%2,#%3,%0
+	cjne	r%4,#%5,%0
+	cjne	r%6,#%7,%0
+	cjne	r%8,#%9,%0
 	inc	a
-%3:
-%10:
-}
+%0:
+%1:
+} if labelRefCountChange(%1 -1)
 
-// applies to f.e. time.c
+// applies to generic pointer compare
 replace {
-	cjne	r%1,#%2,%3
-	cjne	r%4,#%5,%3
+	cjne	r%2,#%3,%0
+	cjne	r%4,#%5,%0
+	cjne	r%6,#%7,%0
 	mov	a,#0x01
-	sjmp	%6
-%3:
+	sjmp	%1
+%0:
 	clr	a
-%6:
+%1:
 } by {
 	;	Peephole 241.b	optimized compare
 	clr	a
-	cjne	r%1,#%2,%3
-	cjne	r%4,#%5,%3
+	cjne	r%2,#%3,%0
+	cjne	r%4,#%5,%0
+	cjne	r%6,#%7,%0
 	inc	a
-%3:
-%6:
-}
+%0:
+%1:
+} if labelRefCountChange(%1 -1)
 
-// applies to f.e. malloc.c
+// applies to f.e. time.c
 replace {
-	cjne	r%1,#%2,%3
+	cjne	r%2,#%3,%0
+	cjne	r%4,#%5,%0
 	mov	a,#0x01
-	sjmp	%4
-%3:
+	sjmp	%1
+%0:
 	clr	a
-%4:
+%1:
 } by {
 	;	Peephole 241.c	optimized compare
 	clr	a
-	cjne	r%1,#%2,%3
+	cjne	r%2,#%3,%0
+	cjne	r%4,#%5,%0
 	inc	a
-%3:
-%4:
-}
+%0:
+%1:
+} if labelRefCountChange(%1 -1)
+
+// applies to f.e. malloc.c
+replace {
+	cjne	r%2,#%3,%0
+	mov	a,#0x01
+	sjmp	%1
+%0:
+	clr	a
+%1:
+} by {
+	;	Peephole 241.d	optimized compare
+	clr	a
+	cjne	r%2,#%3,%0
+	inc	a
+%0:
+%1:
+} if labelRefCountChange(%1 -1)
 
 // applies to f.e. j = (k!=0x1000);
 // with volatile idata long k;
 replace {
-	cjne	@r%1,#%2,%3
-	inc	r%1
-	cjne	@r%1,#%4,%3
-	inc	r%1
-	cjne	@r%1,#%5,%3
-	inc	r%1
-	cjne	@r%1,#%6,%3
+	cjne	@r%0,#%3,%1
+	inc	r%0
+	cjne	@r%0,#%4,%1
+	inc	r%0
+	cjne	@r%0,#%5,%1
+	inc	r%0
+	cjne	@r%0,#%6,%1
 	mov	a,#0x01
-	sjmp	%7
-%3:
+	sjmp	%2
+%1:
 	clr	a
-%7:
+%2:
 } by {
-	;	Peephole 241.d	optimized compare
+	;	Peephole 241.e	optimized compare
 	clr	a
-	cjne	@r%1,#%2,%3
-	inc	r%1
-	cjne	@r%1,#%4,%3
-	inc	r%1
-	cjne	@r%1,#%5,%3
-	inc	r%1
-	cjne	@r%1,#%6,%3
+	cjne	@r%0,#%3,%1
+	inc	r%0
+	cjne	@r%0,#%4,%1
+	inc	r%0
+	cjne	@r%0,#%5,%1
+	inc	r%0
+	cjne	@r%0,#%6,%1
 	inc	a
-%3:
-%7:
-}
+%1:
+%2:
+} if labelRefCountChange(%2 -1)
+
+// applies to f.e. j = (p!=NULL);
+// with volatile idata char *p;
+replace {
+	cjne	@r%0,#%3,%1
+	inc	r%0
+	cjne	@r%0,#%4,%1
+	inc	r%0
+	cjne	@r%0,#%5,%1
+	mov	a,#0x01
+	sjmp	%2
+%1:
+	clr	a
+%2:
+} by {
+	;	Peephole 241.f	optimized compare
+	clr	a
+	cjne	@r%0,#%3,%1
+	inc	r%0
+	cjne	@r%0,#%4,%1
+	inc	r%0
+	cjne	@r%0,#%5,%1
+	inc	a
+%1:
+%2:
+} if labelRefCountChange(%2 -1)
 
 // applies to f.e. j = (k!=0x1000);
 // with volatile idata int k;
 replace {
-	cjne	@r%1,#%2,%3
-	inc	r%1
-	cjne	@r%1,#%4,%3
+	cjne	@r%0,#%3,%1
+	inc	r%0
+	cjne	@r%0,#%4,%1
 	mov	a,#0x01
-	sjmp	%7
-%3:
+	sjmp	%2
+%1:
 	clr	a
-%7:
+%2:
 } by {
-	;	Peephole 241.e	optimized compare
+	;	Peephole 241.g	optimized compare
 	clr	a
-	cjne	@r%1,#%2,%3
-	inc	r%1
-	cjne	@r%1,#%4,%3
+	cjne	@r%0,#%3,%1
+	inc	r%0
+	cjne	@r%0,#%4,%1
 	inc	a
-%3:
-%7:
-}
+%1:
+%2:
+} if labelRefCountChange(%2 -1)
 
 // applies to f.e. vprintf.asm (--stack-auto)
 replace {
-	cjne	@r%1,#%2,%3
+	cjne	@r%0,#%3,%1
 	mov	a,#0x01
-	sjmp	%7
-%3:
+	sjmp	%2
+%1:
 	clr	a
-%7:
+%2:
 } by {
-	;	Peephole 241.f	optimized compare
+	;	Peephole 241.h	optimized compare
 	clr	a
-	cjne	@r%1,#%2,%3
+	cjne	@r%0,#%3,%1
 	inc	a
-%3:
-%7:
-}
+%1:
+%2:
+} if labelRefCountChange(%2 -1)
 
 // applies to f.e. scott-bool1.c
 replace {
@@ -2734,9 +2873,9 @@ replace {
 %1:
 	jz	%4
 } by {
-	;	Peephole 242.a	avoided branch jnz to jz
 	jnz	%1
 	mov	%2,%3
+	;	Peephole 242.a	avoided branch jnz to jz
 	jz	%4
 %1:
 } if labelRefCount %1 1
@@ -2749,10 +2888,10 @@ replace {
 %1:
 	jz	%4
 } by {
-	;	Peephole 242.b	avoided branch jnz to jz
 	jnz	%1
 	mov	%2,%3
 	orl	a,%5
+	;	Peephole 242.b	avoided branch jnz to jz
 	jz	%4
 %1:
 } if labelRefCount %1 1
@@ -2767,12 +2906,12 @@ replace {
 %1:
 	jz	%4
 } by {
-	;	Peephole 242.c	avoided branch jnz to jz
 	jnz	%1
 	mov	%2,%3
 	orl	a,%5
 	orl	a,%6
 	orl	a,%7
+	;	Peephole 242.c	avoided branch jnz to jz
 	jz	%4
 %1:
 } if labelRefCount %1 1
@@ -2790,7 +2929,7 @@ replace {
 	inc	%4
 %3:
 	sjmp	%5
-} if labelInRange
+} if labelInRange(), labelRefCountChange(%3 -1), labelRefCountChange(%5 1)
 
 // applies to f.e. simplefloat.c (saving 1 cycle)
 replace {
@@ -2818,8 +2957,8 @@ replace {
 	mov	r%1,a
 	mov	dpl,r%1
 } by {
-	;	Peephole 244.c	loading dpl from a instead of r%1
 	mov	r%1,a
+	;	Peephole 244.c	loading dpl from a instead of r%1
 	mov	dpl,a
 }
 
@@ -2827,8 +2966,8 @@ replace {
 	mov	r%1,a
 	mov	dph,r%1
 } by {
-	;	Peephole 244.d	loading dph from a instead of r%1
 	mov	r%1,a
+	;	Peephole 244.d	loading dph from a instead of r%1
 	mov	dph,a
 }
 
@@ -2850,7 +2989,7 @@ replace {
 	clr	a
 	rlc	a
 	mov	r%1,a
-} if labelRefCount %2 1
+} if labelRefCount(%2 1), labelRefCountChange(%2 -1)
 
 // this one will not be triggered if 245 is present
 // please remove 245 if 245.a 245.b are found to be safe
@@ -2868,7 +3007,7 @@ replace {
 } by {
 	;	Peephole 245.a	optimized conditional jump (r%1 and acc not set!)
 	jc	%3
-} if labelRefCount %2 1
+} if labelRefCount(%2 1), labelRefCountChange(%2 -1)
 
 // this one will not be triggered if 245 is present
 // please remove 245 if 245.a 245.b are found to be safe
@@ -2886,7 +3025,7 @@ replace {
 } by {
 	;	Peephole 245.b	optimized conditional jump (r%1 and acc not set!)
 	jnc	%3
-} if labelRefCount %2 1
+} if labelRefCount(%2 1), labelRefCountChange(%2 -1)
 
 
 // rules 246.x apply to f.e. bitfields.c
@@ -2900,9 +3039,9 @@ replace {
 	anl	a,#%3
 	movx	@dptr,a
 } by {
-	;	Peephole 246.a	combined clr/clr
 	mov	dptr,#%1
 	movx	a,@dptr
+	;	Peephole 246.a	combined clr/clr
 	anl	a,#%2&%3
 	movx	@dptr,a
 } if notVolatile %1
@@ -2917,9 +3056,9 @@ replace {
 	orl	a,#%3
 	movx	@dptr,a
 } by {
-	;	Peephole 246.b	combined set/set
 	mov	dptr,#%1
 	movx	a,@dptr
+	;	Peephole 246.b	combined set/set
 	orl	a,#%2|%3
 	movx	@dptr,a
 } if notVolatile %1
@@ -2934,10 +3073,10 @@ replace {
 	anl	a,#%3
 	movx	@dptr,a
 } by {
-	;	Peephole 246.c	combined set/clr
 	mov	dptr,#%1
 	movx	a,@dptr
 	orl	a,#%2
+	;	Peephole 246.c	combined set/clr
 	anl	a,#%3
 	movx	@dptr,a
 } if notVolatile %1
@@ -2952,10 +3091,10 @@ replace {
 	orl	a,#%3
 	movx	@dptr,a
 } by {
-	;	Peephole 246.d	combined clr/set
 	mov	dptr,#%1
 	movx	a,@dptr
 	anl	a,#%2
+	;	Peephole 246.d	combined clr/set
 	orl	a,#%3
 	movx	@dptr,a
 } if notVolatile %1
@@ -2971,10 +3110,10 @@ replace {
 	anl	a,#%4
 	movx	@dptr,a
 } by {
-	;	Peephole 246.e	combined set/clr/clr
 	mov	dptr,#%1
 	movx	a,@dptr
 	orl	a,#%2
+	;	Peephole 246.e	combined set/clr/clr
 	anl	a,#%3&%4
 	movx	@dptr,a
 } if notVolatile %1
@@ -2990,11 +3129,11 @@ replace {
 	orl	a,#%4
 	movx	@dptr,a
 } by {
-	;	Peephole 246.f	combined set/clr/set
 	mov	dptr,#%1
 	movx	a,@dptr
 	orl	a,#%2
 	anl	a,#%3
+	;	Peephole 246.f	combined set/clr/set
 	orl	a,#%4
 	movx	@dptr,a
 } if notVolatile %1
@@ -3010,11 +3149,11 @@ replace {
 	anl	a,#%4
 	movx	@dptr,a
 } by {
-	;	Peephole 246.g	combined clr/set/clr
 	mov	dptr,#%1
 	movx	a,@dptr
 	anl	a,#%2
 	orl	a,#%3
+	;	Peephole 246.g	combined clr/set/clr
 	anl	a,#%4
 	movx	@dptr,a
 } if notVolatile %1
@@ -3030,17 +3169,15 @@ replace {
 	orl	a,#%4
 	movx	@dptr,a
 } by {
-	;	Peephole 246.h	combined clr/set/set
 	mov	dptr,#%1
 	movx	a,@dptr
 	anl	a,#%2
+	;	Peephole 246.h	combined clr/set/set
 	orl	a,#%3|%4
 	movx	@dptr,a
 } if notVolatile %1
 
 
-
-
 // rules 247.x apply to f.e. bitfields.c
 replace {
 	mov	r%5,#%1
@@ -3052,9 +3189,9 @@ replace {
 	anl	a,#%3
 	mov	@r%5,a
 } by {
-	;	Peephole 247.a	combined clr/clr
 	mov	r%5,#%1
 	mov	a,@r%5
+	;	Peephole 247.a	combined clr/clr
 	anl	a,#%2&%3
 	mov	@r%5,a
 } if notVolatile %1
@@ -3069,9 +3206,9 @@ replace {
 	orl	a,#%3
 	mov	@r%5,a
 } by {
-	;	Peephole 247.b	combined set/set
 	mov	r%5,#%1
 	mov	a,@r%5
+	;	Peephole 247.b	combined set/set
 	orl	a,#%2|%3
 	mov	@r%5,a
 } if notVolatile %1
@@ -3086,10 +3223,10 @@ replace {
 	anl	a,#%3
 	mov	@r%5,a
 } by {
-	;	Peephole 247.c	combined set/clr
 	mov	r%5,#%1
 	mov	a,@r%5
 	orl	a,#%2
+	;	Peephole 247.c	combined set/clr
 	anl	a,#%3
 	mov	@r%5,a
 } if notVolatile %1
@@ -3104,10 +3241,10 @@ replace {
 	orl	a,#%3
 	mov	@r%5,a
 } by {
-	;	Peephole 247.d	combined clr/set
 	mov	r%5,#%1
 	mov	a,@r%5
 	anl	a,#%2
+	;	Peephole 247.d	combined clr/set
 	orl	a,#%3
 	mov	@r%5,a
 } if notVolatile %1
@@ -3123,10 +3260,10 @@ replace {
 	anl	a,#%4
 	mov	@r%5,a
 } by {
-	;	Peephole 247.e	combined set/clr/clr
 	mov	r%5,#%1
 	mov	a,@r%5
 	orl	a,#%2
+	;	Peephole 247.e	combined set/clr/clr
 	anl	a,#%3&%4
 	mov	@r%5,a
 } if notVolatile %1
@@ -3142,11 +3279,11 @@ replace {
 	orl	a,#%4
 	mov	@r%5,a
 } by {
-	;	Peephole 247.f	combined set/clr/set
 	mov	r%5,#%1
 	mov	a,@r%5
 	orl	a,#%2
 	anl	a,#%3
+	;	Peephole 247.f	combined set/clr/set
 	orl	a,#%4
 	mov	@r%5,a
 } if notVolatile %1
@@ -3162,11 +3299,11 @@ replace {
 	anl	a,#%4
 	mov	@r%5,a
 } by {
-	;	Peephole 247.g	combined clr/set/clr
 	mov	r%5,#%1
 	mov	a,@r%5
 	anl	a,#%2
 	orl	a,#%3
+	;	Peephole 247.g	combined clr/set/clr
 	anl	a,#%4
 	mov	@r%5,a
 } if notVolatile %1
@@ -3182,10 +3319,10 @@ replace {
 	orl	a,#%4
 	mov	@r%5,a
 } by {
-	;	Peephole 247.h	combined clr/set/set
 	mov	r%5,#%1
 	mov	a,@r%5
 	anl	a,#%2
+	;	Peephole 247.h	combined clr/set/set
 	orl	a,#%3|%4
 	mov	@r%5,a
 } if notVolatile %1
@@ -3203,10 +3340,10 @@ replace {
 	orl	a,r%2
 	movx	@dptr,a
 } by {
-	;	Peephole 248.a	optimized or to xdata
 	mov	dptr,%1
 	movx	a,@dptr
 	mov	r%2,a
+	;	Peephole 248.a	optimized or to xdata
 	orl	a,%3
 	movx	@dptr,a
 }
@@ -3221,10 +3358,10 @@ replace {
 	anl	a,r%2
 	movx	@dptr,a
 } by {
-	;	Peephole 248.b	optimized and to xdata
 	mov	dptr,%1
 	movx	a,@dptr
 	mov	r%2,a
+	;	Peephole 248.b	optimized and to xdata
 	anl	a,%3
 	movx	@dptr,a
 }
@@ -3239,10 +3376,10 @@ replace {
 	xrl	a,r%2
 	movx	@dptr,a
 } by {
-	;	Peephole 248.c	optimized xor to xdata
 	mov	dptr,%1
 	movx	a,@dptr
 	mov	r%2,a
+	;	Peephole 248.c	optimized xor to xdata
 	xrl	a,%3
 	movx	@dptr,a
 }
@@ -3267,9 +3404,9 @@ replace {
 	orl	a,%5
 	movx	@dptr,a
 } by {
-	;	Peephole 248.d	optimized or/and/or to volatile xdata
 	mov	dptr,%1
 	movx	a,@dptr
+	;	Peephole 248.d	optimized or/and/or to volatile xdata
 	orl	a,%3
 	movx	@dptr,a
 	movx	a,@dptr
@@ -3301,9 +3438,9 @@ replace {
 	anl	a,%5
 	movx	@dptr,a
 } by {
-	;	Peephole 248.e	optimized and/or/and to volatile xdata
 	mov	dptr,%1
 	movx	a,@dptr
+	;	Peephole 248.e	optimized and/or/and to volatile xdata
 	anl	a,%3
 	movx	@dptr,a
 	movx	a,@dptr
@@ -3329,9 +3466,9 @@ replace {
 	anl	a,%4
 	movx	@dptr,a
 } by {
-	;	Peephole 248.f	optimized or/and to volatile xdata
 	mov	dptr,%1
 	movx	a,@dptr
+	;	Peephole 248.f	optimized or/and to volatile xdata
 	orl	a,%3
 	movx	@dptr,a
 	movx	a,@dptr
@@ -3354,9 +3491,9 @@ replace {
 	orl	a,%4
 	movx	@dptr,a
 } by {
-	;	Peephole 248.g	optimized and/or to volatile xdata
 	mov	dptr,%1
 	movx	a,@dptr
+	;	Peephole 248.g	optimized and/or to volatile xdata
 	anl	a,%3
 	movx	@dptr,a
 	movx	a,@dptr
@@ -3379,9 +3516,9 @@ replace {
 	xrl	a,%4
 	movx	@dptr,a
 } by {
-	;	Peephole 248.h	optimized xor/xor to volatile xdata
 	mov	dptr,%1
 	movx	a,@dptr
+	;	Peephole 248.h	optimized xor/xor to volatile xdata
 	xrl	a,%3
 	movx	@dptr,a
 	movx	a,@dptr
@@ -3409,11 +3546,11 @@ replace {
 	orl	a,%5
 	movx	@dptr,a
 } by {
-	;	Peephole 248.i	optimized or/and/or to xdata bitfield
 	mov	dptr,%1
 	movx	a,@dptr
 	orl	a,%3
 	movx	@dptr,a
+	;	Peephole 248.i	optimized or/and/or to xdata bitfield
 	movx	a,@dptr
 	anl	a,%4
 	movx	@dptr,a
@@ -3438,11 +3575,11 @@ replace {
 	anl	a,%5
 	movx	@dptr,a
 } by {
-	;	Peephole 248.j	optimized and/or/and to xdata bitfield
 	mov	dptr,%1
 	movx	a,@dptr
 	anl	a,%3
 	movx	@dptr,a
+	;	Peephole 248.j	optimized and/or/and to xdata bitfield
 	movx	a,@dptr
 	orl	a,%4
 	movx	@dptr,a
@@ -3462,11 +3599,11 @@ replace {
 	anl	a,%4
 	movx	@dptr,a
 } by {
-	;	Peephole 248.k	optimized or/and to xdata bitfield
 	mov	dptr,%1
 	movx	a,@dptr
 	orl	a,%3
 	movx	@dptr,a
+	;	Peephole 248.k	optimized or/and to xdata bitfield
 	movx	a,@dptr
 	anl	a,%4
 	movx	@dptr,a
@@ -3483,11 +3620,11 @@ replace {
 	orl	a,%4
 	movx	@dptr,a
 } by {
-	;	Peephole 248.l	optimized and/or to xdata bitfield
 	mov	dptr,%1
 	movx	a,@dptr
 	anl	a,%3
 	movx	@dptr,a
+	;	Peephole 248.l	optimized and/or to xdata bitfield
 	movx	a,@dptr
 	orl	a,%4
 	movx	@dptr,a
@@ -3504,11 +3641,11 @@ replace {
 	xrl	a,%4
 	movx	@dptr,a
 } by {
-	;	Peephole 248.m	optimized xor/xor to xdata bitfield
 	mov	dptr,%1
 	movx	a,@dptr
 	xrl	a,%3
 	movx	@dptr,a
+	;	Peephole 248.m	optimized xor/xor to xdata bitfield
 	movx	a,@dptr
 	xrl	a,%4
 	movx	@dptr,a
@@ -3520,14 +3657,14 @@ replace {
 %1:
 } by {
 	;	Peephole 249.a	 jump optimization
-} if labelRefCount %1 1
+} if labelRefCount(%1 1), labelRefCountChange(%1 -1)
 
 replace {
 	jz	%1
 %1:
 } by {
 	;	Peephole 249.b	 jump optimization
-} if labelRefCount %1 1
+} if labelRefCount(%1 1), labelRefCountChange(%1 -1)
 
 
 // This allows non-interrupt and interrupt code to safely compete
@@ -3546,7 +3683,7 @@ replace {
 	jbc	%1,%3
 	sjmp	%2
 %3:
-} if labelRefCount %3 0
+} if labelRefCount(%3 0), labelRefCountChange(%3 1)
 
 replace {
 	jb	%1,%2
@@ -3567,7 +3704,7 @@ replace {
 } by {
 	;	Peephole 251.a	replaced ljmp to ret with ret
 	ret
-} if labelIsReturnOnly
+} if labelIsReturnOnly(), labelRefCountChange(%5 -1)
 
 // not before peephole 250.b
 replace {
@@ -3575,7 +3712,7 @@ replace {
 } by {
 	;	Peephole 251.b	replaced sjmp to ret with ret
 	ret
-} if labelIsReturnOnly
+} if labelIsReturnOnly(), labelRefCountChange(%5 -1)
 
 // applies to shifts.c and when accessing arrays with an unsigned integer index
 // saving 1 byte, 2 cycles
@@ -3597,36 +3734,27 @@ replace {
 	mov	r%3,a
 }
 
-// applies to: void test( char c ) { if( c ) func1(); else func2(); }
-replace {
-	lcall	%1
-	ret
-} by {
-	;	Peephole 253.a	replaced lcall/ret with ljmp
-	ljmp	%1
-}
-
-// applies to: void test( char c ) { if( c ) func1(); else func2(); }
+// unsigned char i=8; do{ } while(--i != 0);
+// this applies if i is kept in a register
 replace {
-	lcall	%1
-%2:
-	ret
+	dec	%1
+	cjne	%1,#0x00,%2
 } by {
-	;	Peephole 253.b	replaced lcall/ret with ljmp
-	ljmp	%1
-} if labelRefCount %2 0
+	;	Peephole 253.a	optimized decrement with compare
+	djnz	%1,%2
+} if notVolatile(%1)
 
-// applies to f.e. scott-bool1.c
+// unsigned char i=8; do{ } while(--i != 0);
+// this applies if i is kept in data memory
+// must come before 256, see bug 1721024
 replace {
-	lcall	%1
-%2:
-	ret
+	dec	%1
+	mov	a,%1
+	jnz	%2
 } by {
-	;	Peephole 253.c	replaced lcall with ljmp
-	ljmp	%1
-%2:
-	ret
-}
+	;	Peephole 253.b	optimized decrement with compare
+	djnz	%1,%2
+} if notVolatile(%1), operandsNotRelated(%1 '@r0' '@r1')
 
 
 // applies to f.e. funptrs.c
@@ -3635,8 +3763,8 @@ replace {
 	mov	a,%1
 	add	a,acc
 } by {
-	;	Peephole 254	optimized left shift
 	mov	a,%1
+	;	Peephole 254	optimized left shift
 	add	a,%1
 } if notVolatile %1
 
@@ -3672,9 +3800,9 @@ replace {
 %2:
 	clr	c
 } by {
-	;	Peephole 256.a	removed redundant clr c
 	jc	%1
 %2:
+	;	Peephole 256.a	removed redundant clr c
 } if labelRefCount %2 0
 
 // applies to f.e. logf.c
@@ -3683,9 +3811,9 @@ replace {
 %2:
 	clr	a
 } by {
-	;	Peephole 256.b	removed redundant clr a
 	jnz	%1
 %2:
+	;	Peephole 256.b	removed redundant clr a
 } if labelRefCount %2 0
 
 // applies to f.e. bug-905492.c
@@ -3694,9 +3822,9 @@ replace {
 %2:
 	mov	%3,#0x00
 } by {
-	;	Peephole 256.c	loading %3 with zero from a
 	jnz	%1
 %2:
+	;	Peephole 256.c	loading %3 with zero from a
 	mov	%3,a
 } if labelRefCount %2 0
 
@@ -3707,10 +3835,10 @@ replace {
 	mov	%4,%5
 	mov	%3,#0x00
 } by {
-	;	Peephole 256.d	loading %3 with zero from a
 	jnz	%1
 %2:
 	mov	%4,%5
+	;	Peephole 256.d	loading %3 with zero from a
 	mov	%3,a
 } if labelRefCount(%2 0),operandsNotRelated('a' %4)
 
@@ -3721,11 +3849,11 @@ replace {
 	mov	%6,%7
 	mov	%3,#0x00
 } by {
-	;	Peephole 256.e	loading %3 with zero from a
 	jnz	%1
 %2:
 	mov	%4,%5
 	mov	%6,%7
+	;	Peephole 256.e	loading %3 with zero from a
 	mov	%3,a
 } if labelRefCount(%2 0),operandsNotRelated('a' %4 %6)
 
@@ -3737,27 +3865,16 @@ replace {
 	mov	%8,%9
 	mov	%3,#0x00
 } by {
-	;	Peephole 256.f	loading %2 with zero from a
 	jnz	%1
 %2:
 	mov	%4,%5
 	mov	%6,%7
 	mov	%8,%9
+	;	Peephole 256.f	loading %2 with zero from a
 	mov	%3,a
 } if labelRefCount(%2 0),operandsNotRelated('a' %4 %6 %8)
 
 
-// unsigned char i=8; do{ } while(--i != 0);
-// this currently only applies if i is kept in a register
-replace {
-	dec	%1
-	cjne	%1,#0x00,%2
-} by {
-	;	Peephole 257	optimized decrement with compare
-	djnz	%1,%2
-} if notVolatile %1
-
-
 // in_byte<<=1; if(in_bit) in_byte|=1;
 // helps f.e. reading data on a 3-wire (SPI) bus
 replace {
@@ -3769,14 +3886,14 @@ replace {
 	orl	%1,#0x01
 %3:
 } by {
-	;	Peephole 258.a	optimized bitbanging
 	mov	a,%1
+	;	Peephole 258.a	optimized bitbanging
 	mov	c,%2
 	addc	a,%1
 	mov	%1,a
 %4:
 %3:
-} if notVolatile %1
+} if notVolatile(%1), labelRefCountChange(%3 -1)
 
 // in_byte<<=1; if(in_bit) in_byte|=1;
 replace {
@@ -3788,14 +3905,14 @@ replace {
 	orl	ar%1,#0x01
 %3:
 } by {
-	;	Peephole 258.b	optimized bitbanging
 	mov	a,r%1
+	;	Peephole 258.b	optimized bitbanging
 	mov	c,%2
 	addc	a,r%1
 	mov	r%1,a
 %4:
 %3:
-}
+} if labelRefCountChange(%3 -1)
 
 // in_byte>>=1; if(in_bit) in_byte|=0x80;
 replace {
@@ -3808,14 +3925,14 @@ replace {
 	orl	%1,#0x80
 %3:
 } by {
-	;	Peephole 258.c	optimized bitbanging
 	mov	a,%1
+	;	Peephole 258.c	optimized bitbanging
 	mov	c,%2
 	rrc	a
 	mov	%1,a
 %4:
 %3:
-} if notVolatile %1
+} if notVolatile(%1), labelRefCountChange(%3 -1)
 
 // in_byte>>=1; if(in_bit) in_byte|=0x80;
 replace {
@@ -3828,14 +3945,14 @@ replace {
 	orl	ar%1,#0x80
 %3:
 } by {
-	;	Peephole 258.d	optimized bitbanging
 	mov	a,r%1
+	;	Peephole 258.d	optimized bitbanging
 	mov	c,%2
 	rrc	a
 	mov	r%1,a
 %4:
 %3:
-}
+} if labelRefCountChange(%3 -1)
 
 // out_bit=out_byte&0x80; out_byte<<=1;
 // helps f.e. writing data on a 3-wire (SPI) bus
@@ -3847,8 +3964,8 @@ replace {
 	add	a,%1
 	mov	%1,a
 } by {
-	;	Peephole 258.e	optimized bitbanging
 	mov	a,%1
+	;	Peephole 258.e	optimized bitbanging
 	add	a,%1
 	mov	%2,c
 	mov	%1,a
@@ -3864,43 +3981,41 @@ replace {
 	rrc	a
 	mov	%1,a
 } by {
-	;	Peephole 258.f	optimized bitbanging
 	mov	a,%1
+	;	Peephole 258.f	optimized bitbanging
 	clr	c
 	rrc	a
 	mov	%2,c
 	mov	%1,a
 } if notVolatile %1
 
-// Peepholes 259.x are not compatible with peepholex 250.x
-// Peepholes 250.x add jumps to a previously unused label. As the
+// Peepholes 259.x rely on the correct labelRefCount. Otherwise they are
+// not compatible with peepholes 250.x
+// Peepholes 250.x add jumps to a previously unused label. If the
 // labelRefCount is not increased, peepholes 259.x are (mistakenly) applied.
 // (Mail on sdcc-devel 2004-10-25)
-// Note: Peepholes 193..199, 251 remove jumps to previously used labels without
-// decreasing labelRefCount (less dangerous - this f.e. leads to 253.c being
-// applied instead of 253.b))
 //
 // applies to f.e. vprintf.c
-//replace {
-//	sjmp	%1
-//%2:
-//	ret
-//} by {
-//	sjmp	%1
-//	;	Peephole 259.a	removed redundant label %2 and ret
-//	;
-//} if labelRefCount %2 0
+replace {
+	sjmp	%1
+%2:
+	ret
+} by {
+	sjmp	%1
+	;	Peephole 259.a	removed redundant label %2 and ret
+	;
+} if labelRefCount %2 0
 
 // applies to f.e. gets.c
-//replace {
-//	ljmp	%1
-//%2:
-//	ret
-//} by {
-//	ljmp	%1
-//	;	Peephole 259.b	removed redundant label %2 and ret
-//	;
-//} if labelRefCount %2 0
+replace {
+	ljmp	%1
+%2:
+	ret
+} by {
+	ljmp	%1
+	;	Peephole 259.b	removed redundant label %2 and ret
+	;
+} if labelRefCount %2 0
 
 // optimizing jumptables
 // Please note: to enable peephole 260.x you currently have to set
@@ -4387,9 +4502,9 @@ replace {
 	mov	acc.0,c
 	mov	%1,a
 } by {
-	;	Peephole 261.a	optimized left rol
 	mov	a,%1
 	rlc	a
+	;	Peephole 261.a	optimized left rol
 	xch	a,%2
 	rlc	a
 	xch	a,%2
@@ -4409,12 +4524,226 @@ replace {
 	mov	acc.7,c
 	mov	%1,a
 } by {
-	;	Peephole 261.b	optimized right rol
 	mov	a,%1
 	rrc	a
+	;	Peephole 261.b	optimized right rol
 	xch	a,%2
 	rrc	a
 	xch	a,%2
 	mov	acc.7,c
 	mov	%1,a
 }
+
+replace {
+	cpl	c
+	cpl	c
+} by {
+	;	Peephole 262	removed redundant cpl c
+}
+
+replace {
+	mov	%1,#%2
+	inc	%1
+	inc	%1
+	inc	%1
+} by {
+	;	Peephole 263.a	optimized loading const
+	mov	%1,#(%2 + 3)
+} if notVolatile(%1)
+
+replace {
+	mov	%1,#%2
+	inc	%1
+	inc	%1
+} by {
+	;	Peephole 263.b	optimized loading const
+	mov	%1,#(%2 + 2)
+} if notVolatile(%1)
+
+replace {
+	mov	%1,#%2
+	inc	%1
+} by {
+	;	Peephole 263.c	optimized loading const
+	mov	%1,#(%2 + 1)
+} if notVolatile(%1)
+
+
+replace {
+	clr	a
+	cjne	%1,%2,%3
+	inc	a
+%3:
+	jz	%4
+} by {
+	;	Peephole 264	jump optimization (acc not set)
+	cjne	%1,%2,%4
+%3:
+} if labelRefCount(%3 1), labelRefCountChange(%3 -1)
+
+
+replace {
+	mov	%1,c
+	cpl	%1
+} by {
+	;	Peephole 265	optimized mov/cpl sequence (carry differs)
+	cpl	c
+	mov	%1,c
+} if notVolatile(%1)
+
+replace {
+	mov	%1,c
+	jb	%1,%2
+} by {
+	;	Peephole 266.a	optimized mov/jump sequence
+	mov	%1,c
+        jc	%2
+} if notVolatile(%1)
+
+replace {
+	mov	%1,c
+	jnb	%1,%2
+} by {
+	;	Peephole 266.b	optimized mov/jump sequence
+	mov	%1,c
+        jnc	%2
+} if notVolatile(%1)
+
+replace {
+	jnc	%1
+	setb	%2
+	sjmp	%3
+%1:
+	clr	%2
+%3:
+} by {
+	;	Peephole 267.a	optimized mov bit sequence
+	mov	%2,c
+%1:
+%3:
+} if labelRefCount(%1 1), labelRefCountChange(%1 -1), labelRefCountChange(%3 -1)
+
+replace {
+	jc	%1
+	clr	%2
+	sjmp	%3
+%1:
+	setb	%2
+%3:
+} by {
+	;	Peephole 267.b	optimized mov bit sequence
+	mov	%2,c
+%1:
+%3:
+} if labelRefCount(%1 1), labelRefCountChange(%1 -1), labelRefCountChange(%3 -1)
+
+replace {
+	mov	%1,c
+	mov	%1,c
+} by {
+	;	Peephole 268	removed redundant mov
+	mov	%1,c
+} if notVolatile(%1)
+
+replace {
+	mov	%1,c
+	mov	c,%1
+} by {
+	;	Peephole 269	removed redundant mov
+	mov	%1,c
+} if notVolatile(%1)
+
+//accessing struct/array on stack
+replace {
+	add	a,#%1
+	add	a,#%2
+} by {
+	;	Peephole 270	removed redundant add
+	add	a,#%1+%2
+}
+
+replace {
+	jz	%1
+	mov	%2,%4
+	sjmp	%3
+%1:
+	mov	%2,#0x00
+%3:
+} by {
+	jz	%1
+	;	Peephole 271	optimized ternary operation (acc different)
+	mov	a,%4
+%1:
+	mov	%2,a
+%3:
+} if operandsNotRelated('a' 'dptr' %2), labelRefCount(%1 1), labelRefCountChange(%3 -1)
+
+
+replace restart {
+	pop	ar%1
+} by {
+	;	Peephole 300	pop ar%1 removed
+} if deadMove(%1)
+
+replace {
+	mov	r%1,%2
+} by {
+	;	Peephole 301	mov r%1,%2 removed
+} if notVolatile(%2), deadMove(%1)
+
+
+// applies to: void test( char c ) { if( c ) func1(); else func2(); }
+replace {
+	lcall	%1
+	ret
+} by {
+	;	Peephole 400.a	replaced lcall/ret with ljmp
+	ljmp	%1
+}
+
+// applies to: void test( char c ) { if( c ) func1(); else func2(); }
+replace {
+	lcall	%1
+%2:
+	ret
+} by {
+	;	Peephole 400.b	replaced lcall/ret with ljmp
+	ljmp	%1
+	;
+} if labelRefCount %2 0
+
+// applies to f.e. scott-bool1.c
+replace {
+	lcall	%1
+%2:
+	ret
+} by {
+	;	Peephole 400.c	replaced lcall with ljmp
+	ljmp	%1
+%2:
+	ret
+}
+
+// for programs less than 2k
+replace {
+	lcall	%1
+} by {
+	;	Peephole 400.d	replaced lcall with acall
+	acall	%1
+} if useAcallAjmp
+
+// for programs less than 2k
+replace {
+	ljmp	%1
+} by {
+	;	Peephole 400.e	replaced ljmp with ajmp
+	ajmp	%1
+} if useAcallAjmp
+
+
+// should be one of the last peepholes
+replace{
+%1:
+} by {
+	;	Peephole 500	removed redundant label %1
+} if labelRefCount(%1 0)