Fixed getregs and setregs

Author: totalspectrum

Changelog.txt

@@ -1,5 +1,7 @@
 Version 7.6.3
 - Added implementations of getregs and setregs
+- Added `%reg` as an alias for `__reg__` in Spin1
+- Fixed a bug in `reg[imm]` expressions
 
 Version 7.6.2
 - Added check for `NO_COLOR` environment variable (thanks to Ada)

sys/nucode_util.spin

@@ -250,6 +250,20 @@ pri wordmove(dst, src, count) : origdst
 pri bytemove(dst, src, count)
   return __builtin_memmove(dst, src, count)
 
+pri getregs(hubptr, cogptr, count)
+  repeat while count > 0
+    long[hubptr] := %reg[cogptr]
+    hubptr += 4
+    cogptr++
+    --count
+
+pri setregs(hubptr, cogptr, count)
+  repeat while count > 0
+    %reg[cogptr] := long[hubptr]
+    hubptr += 4
+    cogptr++
+    --count
+
 pri __builtin_memcpy(dst, src, count)
   return __builtin_memmove(dst, src, count)
 

sys/nucode_util.spin.h

@@ -362,28 +362,19 @@ pri wordfill(ptr, val, count)
 pri bytefill(ptr, val, count)
   __builtin_memset(ptr, val, count)
 
-'' copy count longs from cogptr to hubptr
 pri getregs(hubptr, cogptr, count)
-  if count==0
-    return
-  repeat count
-    asm
-        wrlong cogptr, hubptr
-	add cogptr, #1
-	add hubptr, #4
-    endasm
+  repeat while count > 0
+    long[hubptr] := %reg[cogptr]
+    hubptr += 4
+    cogptr++
+    --count
 
-'' copy count longs to cogptr from hubptr
 pri setregs(hubptr, cogptr, count)
-  if count==0
-    return
-  repeat count
-    asm
-        rdlong cogptr, hubptr
-	add cogptr, #1
-	add hubptr, #4
-    endasm
-
+  repeat while count > 0
+    %reg[cogptr] := long[hubptr]
+    hubptr += 4
+    cogptr++
+    --count
 
 '' create a method pointer
 '' for P1, addresses fit in 16 bits,

sys/p1_code.spin

@@ -671,7 +671,8 @@ pri getregs(hubptr, cogptr, count)
   count--
   asm
     setq count
-    wrlong cogptr, hubptr
+    altd cogptr
+    wrlong 0-0, hubptr
   endasm
 
 '' copy count longs to cogptr from hubptr
@@ -681,7 +682,8 @@ pri setregs(hubptr, cogptr, count)
   count--
   asm
     setq count
-    rdlong cogptr, hubptr
+    altd cogptr
+    rdlong 0-0, hubptr
   endasm
 
 '' create a method pointer