Browse code

Avoid combining literals across | or $ pads.

Andrew Alderwick authored on 28/11/2021 18:07:10
Showing 2 changed files
... ...
@@ -641,9 +641,11 @@
641 641
 	#00 JMP2r
642 642
 
643 643
 @asma-pad-absolute
644
+	;asma-flush-lit JSR2
644 645
 	#0000 ,asma-pad-helper JMP
645 646
 
646 647
 @asma-pad-relative
648
+	;asma-flush-lit JSR2
647 649
 	;asma/addr LDA2
648 650
 	( fall through )
649 651
 
... ...
@@ -254,11 +254,13 @@ tokenize(char *w, FILE *f)
254 254
 		if(!sihx(w + 1))
255 255
 			return error("Invalid padding", w);
256 256
 		p.ptr = shex(w + 1);
257
+		litlast = 0;
257 258
 		break;
258 259
 	case '$': /* pad-relative */
259 260
 		if(!sihx(w + 1))
260 261
 			return error("Invalid padding", w);
261 262
 		p.ptr += shex(w + 1);
263
+		litlast = 0;
262 264
 		break;
263 265
 	case '@': /* label */
264 266
 		if(!makelabel(w + 1))