1 files changed, 11 insertions(+), 12 deletions(-)

M src/dexe.tal

@@ 797,12 797,18 @@ JMP2
 
 @draw-opcode ( byte color -- )
 
-	OVR #20 EQU ;&jmi JCN2
-	OVR #40 EQU ;&jci JCN2
-	OVR #60 EQU ;&jsi JCN2
 	STH
+	DUP #20 NEQ ,&no-jci JCN
+		POP ;opcodes/jci STHr ;draw-string JSR2 ;&fill JMP2
+		&no-jci
+	DUP #40 NEQ ,&no-jmi JCN
+		POP ;opcodes/jmi STHr ;draw-string JSR2 ;&fill JMP2
+		&no-jmi
+	DUP #60 NEQ ,&no-jsi JCN
+		POP ;opcodes/jsi STHr ;draw-string JSR2 ;&fill JMP2
+		&no-jsi
 	DUP ,&no-brk JCN
-		POP ;opcodes/brk STHr ;draw-string JSR2 ,&fill JMP
+		POP ;opcodes/brk STHr ;draw-string JSR2 ;&fill JMP2
 		&no-brk
 	#00 OVR #1f AND #20 SFT2 ;opcodes ADD2 STHkr ;draw-string JSR2
 	DUP #05 SFT #01 AND #00 EQU ,&no-2 JCN


@@ 821,13 827,6 @@ JMP2
 		#03 ;draw-string ( .. )
 
 JMP2
-	( TODO: Make pretty )
-	&jmi NIP ;&jmi-txt ROT ;draw-string JMP2
-	&jci NIP ;&jci-txt ROT ;draw-string JMP2
-	&jsi NIP ;&jsi-txt ROT ;draw-string JMP2
-	&jmi-txt "JMI $1
-	&jci-txt "JCI $1
-	&jsi-txt "JSI $1
 	"..... &fill-end $2
 
 ( primitives )


@@ 1053,7 1052,7 @@ JMP2r
 	"EQU $1 "NEQ $1 "GTH $1 "LTH $1 "JMP $1 "JCN $1 "JSR $1 "STH $1
 	"LDZ $1 "STZ $1 "LDR $1 "STR $1 "LDA $1 "STA $1 "DEI $1 "DEO $1
 	"ADD $1 "SUB $1 "MUL $1 "DIV $1 "AND $1 "ORA $1 "EOR $1 "SFT $1
-	&brk "BRK $1
+	&brk "BRK $1 &jci "JCI $1 &jmi "JMI $1 &jsi "JSI $1
 
 ~src/manifest.tal