Browse code

Reverted patch to sft16

neauoire authored on 12/05/2021 19:13:28
Showing 3 changed files
... ...
@@ -42,7 +42,7 @@ then
42 42
 fi
43 43
 
44 44
 echo "Assembling.."
45
-./bin/uxnasm projects/examples/devices/screen.usm bin/boot.rom
45
+./bin/uxnasm projects/demos/bifurcan.usm bin/boot.rom
46 46
 
47 47
 echo "Running.."
48 48
 if [ "${2}" = '--cli' ]; 
... ...
@@ -63,7 +63,7 @@ BRK
63 63
 	;draw-cursor JSR2
64 64
 
65 65
 	.Mouse/state DEI #00 EQU ,&no-touch JCN
66
-		( incr ) .style LDZ #01 ADD #04 MOD .style STZ
66
+		( incr ) .style LDZ #01 ADD #03 MOD .style STZ
67 67
 		( bg ) ;tiles .style LDZ #10 MUL TOS ADD2 ;cover-pattern JSR2
68 68
 		( fg ) ;redraw JSR2
69 69
 		( release ) #00 .Mouse/state DEO
... ...
@@ -114,7 +114,7 @@ RTN
114 114
 		.Screen/addr DEO2
115 115
 		( draw ) #21 .Screen/color DEO
116 116
 		( incr ) SWP #01 ADD SWP 
117
-		DUP2 LTH ,&loop JCN
117
+		LTHk ,&loop JCN
118 118
 	POP2
119 119
 	POPr
120 120
 
... ...
@@ -171,6 +171,4 @@ RTN
171 171
 	0718 2040 4080 8080
172 172
 	0101 0102 0204 18e0
173 173
 	0808 0810 e304 0808
174
-	0808 0804 e310 0808
175
-	0000 0000 0000 0001
176
-	ffff ffff ffff ffff ]
174
+	0808 0804 e310 0808 ]
... ...
@@ -99,7 +99,7 @@ void op_div16(Uxn *u) { Uint16 a = pop16(u->src, 0), b = pop16(u->src, 1); push1
99 99
 void op_and16(Uxn *u) { Uint16 a = pop16(u->src, 0), b = pop16(u->src, 1); push16(u->src, b & a); }
100 100
 void op_ora16(Uxn *u) { Uint16 a = pop16(u->src, 0), b = pop16(u->src, 1); push16(u->src, b | a); }
101 101
 void op_eor16(Uxn *u) { Uint16 a = pop16(u->src, 0), b = pop16(u->src, 1); push16(u->src, b ^ a); }
102
-void op_sft16(Uxn *u) { Uint16 a = pop16(u->src, 0), b = pop16(u->src, 1); push16(u->src, b >> (a & 0x0007) << ((a & 0x0070) >> 4)); }
102
+void op_sft16(Uxn *u) { Uint16 a = pop16(u->src, 0), b = pop16(u->src, 1); push16(u->src, b >> (a & 0x000f) << ((a & 0x00f0) >> 4)); }
103 103
 
104 104
 void (*ops[])(Uxn *u) = {
105 105
 	op_brk, op_lit, op_nop, op_pop, op_dup, op_swp, op_ovr, op_rot,