X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=ROM2%2Fasm.h;h=0dac1b0b15b070dc10b7ab32a2fe393c9e105b24;hb=ffaed3398a8ed1c381f0f3f316b4720caf025d22;hp=2c07ac86f34bcdf547241831de8c8fcebd33937e;hpb=a39bdaf6dca8ef640a2928a863993a11691fdf57;p=uccvend-snackrom.git

diff --git a/ROM2/asm.h b/ROM2/asm.h
index 2c07ac8..0dac1b0 100644
--- a/ROM2/asm.h
+++ b/ROM2/asm.h
@@ -12,26 +12,34 @@ extern inline void bset(const void* addr, const u8 mask) {
 	 * bset/bclr on the same memory address. Sigh. Either turn off optimisation
 	 * (-O1 without -Os works), or we do it the dumb way.
 	 */
-	*(u8*)addr |= mask;
-	// asm volatile (
-	// 	"ldx %0\n"
-	// 	"bset 00,x,%1" 
-	// 	:                          /* outputs */
-	// 	: "p" (addr), "g" (mask)   /* inputs */
-	// 	: "x"                      /* altered registers */
-	// 	);
+	//*(u8*)addr |= mask;
+	asm volatile (
+		"ldx %0\n"
+		"bset 00,x,%1\n" 
+		: "=m" (addr)              /* outputs */
+		: "g" (mask)               /* inputs */
+		: "x"                      /* altered registers */
+	);
 }
 
 extern inline void bclr(const void* addr, const u8 mask) {
 	/* same issue as above */
-	*(u8*)addr &= ~mask;
-	// asm volatile (
-	// 	"ldx %0\n"
-	// 	"bclr 00,x,%1"
-	// 	:                          /* outputs */
-	// 	: "p" (addr), "g" (mask)   /* inputs */
-	// 	: "x"                      /* altered registers */
-	// 	);
+	//*(u8*)addr &= ~mask;
+	asm volatile (
+		"ldx %0\n"
+		"bclr 00,x,%1\n"
+		: "=m" (addr)              /* outputs */
+		: "g" (mask)               /* inputs */
+		: "x"                      /* altered registers */
+	);
+}
+
+extern inline void lock() {
+	asm volatile ("sei");
+}
+
+extern inline void unlock() {
+	asm volatile ("cli");
 }
 
 #endif /* _ASM_H_ */