A better fix for wacky gcc weirdness.

[uccvend-snackrom.git] / ROM2 / asm.h

diff --git a/ROM2/asm.h b/ROM2/asm.h
index 0c9b7fa..0dac1b0 100644 (file)
--- a/ROM2/asm.h
+++ b/ROM2/asm.h
@@ -3,25 +3,43 @@
 
 #include "types.h"
 
-/* these would be inline functions, but gcc won't believe that mask is a constant
- * when passed as a parameter
+/* The "g" below really should be an "i", but gcc doesn't believe that it will
+ * always be an immediate value. Using "g" makes the compiler be quiet, but 
+ * the assembler should fail if the value is not an immediate.
  */
-#define bset(addr, mask) \
-       asm volatile (       \
-               "ldx %0\n"       \
-               "bset 00,x,%1"   \
-               :                          /* outputs */ \
-               : "p" (addr), "i" (mask)   /* inputs */  \
-               : "x"                      /* altered registers */ \
-               );
+extern inline void bset(const void* addr, const u8 mask) {
+       /* The assembly breaks when gcc tries to optimise consecutive calls to
+        * 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\n" 
+               : "=m" (addr)              /* outputs */
+               : "g" (mask)               /* inputs */
+               : "x"                      /* altered registers */
+       );
+}
 
-#define bclr(addr, mask) \
-       asm volatile (       \
-               "ldx %0\n"       \
-               "bclr 00,x,%1"   \
-               :                          /* outputs */ \
-               : "p" (addr), "i" (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\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_ */