@@ -132,14 +132,11 @@ lituxn(Uxn *u, Uint8 instr)

 void

 opcuxn(Uxn *u, Uint8 instr)

 {

-	Uint8 op = instr & 0x1f, freturn;

-	setflag(&u->status, FLAG_SHORT, (instr >> 5) & 1);

+	Uint8 op = instr & 0x3f, freturn;

 	setflag(&u->status, FLAG_RETURN, (instr >> 6) & 1);

 	freturn = getflag(&u->status, FLAG_RETURN);

 	u->src = freturn ? &u->rst : &u->wst;

 	u->dst = freturn ? &u->wst : &u->rst;

-	if(getflag(&u->status, FLAG_SHORT))

-		op += 32;

 	(*ops[op])(u);

 }

@@ -17,7 +17,6 @@ typedef unsigned short Uint16;

 typedef signed short Sint16;

 #define FLAG_HALT 0x01

-#define FLAG_SHORT 0x02

 #define FLAG_RETURN 0x04

 #define PAGE_DEVICE 0x0100