Make Spin2 RDPIN and RQPIN return C in bit 31; C and BASIC versions are left alone

totalspectrum · totalspectrum · commit 4e4cf45d6c42 · 2026-07-11T15:42:16.000-03:00
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,5 +1,6 @@
-Version 7.6.12
+Version 7.7.0
 - Added some ioctls for diskio
+- Made Spin2 rdpin and rqpin functions put C in bit 31
 - Accept '[]' for array declarations in BASIC
 - Fixed a peephole optimization bug
 - Fixed passing an interface pointer to an interface pointer in Spin2
diff --git a/backends/nucode/nuir.h b/backends/nucode/nuir.h
@@ -116,6 +116,7 @@
     X(WXPIN)     /* smart pin write */ \
     X(WYPIN)     /* smart pin write */ \
     X(RDPINX)    /* smart pin read: returns value and c */ \
+    X(RDPINC)    /* smart pin read: returns value with c in bit 31 */ \
     X(RQPIN)     /* smart pin read (quiet) */ \
     X(AKPIN)     /* smart pin acknowledge */ \
     \
diff --git a/frontends/common.c b/frontends/common.c
@@ -197,7 +197,7 @@ Aliases spin2alias[] = {
     { "wypin", "_wypin" },
 
     { "akpin", "_akpin" },
-    { "rdpin", "_rdpin" },
+    { "rdpin", "_rdpin_spin" },
     { "rqpin", "_rqpin" },
 
     { "polxy", "_polxy" },
diff --git a/sys/nucode_util.spin b/sys/nucode_util.spin
@@ -60,6 +60,8 @@ pri _wypin(pin = long, val = long)
   %bytecode("WYPIN")
 pri _rdpinx(pin = long) : r, c
   %bytecode("RDPINX")
+pri _rdpin_spin(pin = long) : r, c
+  %bytecode("RDPINC")
 pri _rqpin(pin = long) : r
   %bytecode("RQPIN")
 pri _akpin(pin = long)
diff --git a/sys/nucode_util.spin.h b/sys/nucode_util.spin.h
diff --git a/sys/nuinterp.spin b/sys/nuinterp.spin
@@ -1028,7 +1028,8 @@ impl_WYPIN
 	jmp	#\impl_DROP2
 
 impl_RQPIN
-  _ret_	rqpin	tos, tos
+	rqpin	tos, tos wc
+  _ret_ bitc	tos, #31
 
 impl_AKPIN
 	akpin	tos
@@ -1047,6 +1048,10 @@ impl_XYPOL
 	getqx	nos
   _ret_	getqy	tos
 
+impl_RDPIN_SPIN
+	rdpin	tos, tos wc
+  _ret_	bitc	tos, #31
+
 impl_RDPINX
 	call	#\impl_DUP
 	rdpin	nos, nos wc
diff --git a/sys/nuinterp.spin.h b/sys/nuinterp.spin.h
diff --git a/sys/p2_code.spin b/sys/p2_code.spin
@@ -335,16 +335,23 @@ pri _rdpin(pin = long) : r
   asm
     rdpin r, pin
   endasm
+
 pri _rdpinx(pin = long) : r, c
   c := 0
   asm
     rdpin r, pin wc
 if_c neg c, #1
   endasm
   
+pri _rdpin_spin(pin = long) : r
+  asm
+    rdpin r, pin wc
+    bitc r, #31
+  endasm
 pri _rqpin(pin = long) : r
   asm
-    rqpin r, pin
+    rqpin r, pin wc
+    bitc r, #31
   endasm
 pri _akpin(pin = long)
   asm
diff --git a/sys/p2_code.spin.h b/sys/p2_code.spin.h

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,7 @@`
`116`	`116`	`X(WXPIN) /* smart pin write */ \`
`117`	`117`	`X(WYPIN) /* smart pin write */ \`
`118`	`118`	`X(RDPINX) /* smart pin read: returns value and c */ \`
	`119`	`+ X(RDPINC) /* smart pin read: returns value with c in bit 31 */ \`
`119`	`120`	`X(RQPIN) /* smart pin read (quiet) */ \`
`120`	`121`	`X(AKPIN) /* smart pin acknowledge */ \`
`121`	`122`	`\`