enable stdio on rp6502 target (#395)

* rp6502 xstack bump to 512

* xstack bump to 512

* xstack bump to 512

* connect stdio

* upgrade api to use ria.s

* remove header

* style

* style

* nits

Author: rumbledethumps

mos-platform/rp6502/CMakeLists.txt

@@ -36,11 +36,13 @@ add_platform_library(rp6502-c
   lrand.c
   lseek.c
   open.c
+  oserror.s
   phi2.c
   putchar.c
   read_xram.c
   read_xstack.c
   read.c
+  ria.s
   stdin_opt.c
   sysremove.c
   sysrename.c

mos-platform/rp6502/clock.c

@@ -1,9 +1,4 @@
-#include <rp6502.h>
+#include "rp6502.h"
 #include <time.h>
 
-long clock(void) {
-  RIA.op = RIA_OP_CLOCK;
-  while (RIA.busy & RIA_BUSY_BIT)
-    ;
-  return (long)RIA.a | ((long)RIA.x << 8) | ((long)RIA.sreg << 16);
-}
+long clock(void) { return ria_call_long(RIA_OP_CLOCK); }

mos-platform/rp6502/clock_getres.c

@@ -1,18 +1,9 @@
-#include <rp6502.h>
+#include "rp6502.h"
 #include <time.h>
 
+int __clock_gettimespec(struct timespec *ts, unsigned char op);
+
 int clock_getres(clockid_t clock_id, struct timespec *res) {
-  RIA.a = clock_id;
-  RIA.x = clock_id >> 8;
-  RIA.op = RIA_OP_CLOCK_GETRES;
-  while (RIA.busy & RIA_BUSY_BIT)
-    ;
-  int ax = RIA.a | (RIA.x << 8);
-  if (ax >= 0) {
-    res->tv_sec = (long)RIA.xstack | ((long)RIA.xstack << 8) |
-                  ((long)RIA.xstack << 16) | ((long)RIA.xstack << 24);
-    res->tv_nsec = (long)RIA.xstack | ((long)RIA.xstack << 8) |
-                   ((long)RIA.xstack << 16) | ((long)RIA.xstack << 24);
-  }
-  return ax;
+  ria_set_ax(clock_id);
+  return __clock_gettimespec(res, RIA_OP_CLOCK_GETRES);
 }

mos-platform/rp6502/clock_gettime.c

@@ -1,18 +1,9 @@
-#include <rp6502.h>
+#include "rp6502.h"
 #include <time.h>
 
-int clock_gettime(clockid_t clock_id, struct timespec *res) {
-  RIA.a = clock_id;
-  RIA.x = clock_id >> 8;
-  RIA.op = RIA_OP_CLOCK_GETTIME;
-  while (RIA.busy & RIA_BUSY_BIT)
-    ;
-  int ax = RIA.a | (RIA.x << 8);
-  if (ax >= 0) {
-    res->tv_sec = RIA.xstack | (RIA.xstack << 8) | ((long)RIA.xstack << 16) |
-                  ((long)RIA.xstack << 24);
-    res->tv_nsec = RIA.xstack | (RIA.xstack << 8) | ((long)RIA.xstack << 16) |
-                   ((long)RIA.xstack << 24);
-  }
-  return ax;
+int __clock_gettimespec(struct timespec *ts, unsigned char op);
+
+int clock_gettime(clockid_t clock_id, struct timespec *tp) {
+  ria_set_ax(clock_id);
+  return __clock_gettimespec(tp, RIA_OP_CLOCK_GETTIME);
 }

mos-platform/rp6502/clock_gettimespec.c

@@ -0,0 +1,12 @@
+#include "rp6502.h"
+#include <time.h>
+
+/* Internal method shared by clock_getres and clock_gettime. */
+int __clock_gettimespec(struct timespec *ts, unsigned char op) {
+  int ax = ria_call_int_errno(op);
+  if (ax >= 0) {
+    ts->tv_sec = ria_pop_long();
+    ts->tv_nsec = ria_pop_long();
+  }
+  return ax;
+}

mos-platform/rp6502/clock_settime.c

@@ -1,19 +1,9 @@
-#include <rp6502.h>
+#include "rp6502.h"
 #include <time.h>
 
 int clock_settime(clockid_t clock_id, const struct timespec *tp) {
-  RIA.a = clock_id;
-  RIA.x = clock_id >> 8;
-  RIA.xstack = tp->tv_nsec >> 24;
-  RIA.xstack = tp->tv_nsec >> 16;
-  RIA.xstack = tp->tv_nsec >> 8;
-  RIA.xstack = tp->tv_nsec;
-  RIA.xstack = tp->tv_sec >> 24;
-  RIA.xstack = tp->tv_sec >> 16;
-  RIA.xstack = tp->tv_sec >> 8;
-  RIA.xstack = tp->tv_sec;
-  RIA.op = RIA_OP_CLOCK_SETTIME;
-  while (RIA.busy & RIA_BUSY_BIT)
-    ;
-  return RIA.a | (RIA.x << 8);
+  ria_set_ax(clock_id);
+  ria_push_long(tp->tv_nsec);
+  ria_push_long(tp->tv_sec);
+  return ria_call_int_errno(RIA_OP_CLOCK_SETTIME);
 }

mos-platform/rp6502/close.c

@@ -1,10 +1,7 @@
-#include <rp6502.h>
+#include <fcntl.h>
+#include "rp6502.h"
 
 int close(int fd) {
-  RIA.a = fd;
-  RIA.x = fd >> 8;
-  RIA.op = RIA_OP_CLOSE;
-  while (RIA.busy & RIA_BUSY_BIT)
-    ;
-  return RIA.a | (RIA.x << 8);
+  ria_set_ax(fd);
+  return ria_call_int_errno(RIA_OP_CLOSE);
 }

mos-platform/rp6502/codepage.c

@@ -1,8 +1,3 @@
 #include "rp6502.h"
 
-int codepage(void) {
-  RIA.op = RIA_OP_CODEPAGE;
-  while (RIA.busy & RIA_BUSY_BIT)
-    ;
-  return RIA.a | (RIA.x << 8);
-}
+int codepage(void) { return ria_call_int(RIA_OP_CODEPAGE); }

mos-platform/rp6502/exit.c

@@ -1,7 +1,6 @@
 #include "rp6502.h"
 
 void _Exit(int status) {
-  RIA.a = status;
-  RIA.x = status >> 8;
+  ria_set_ax(status);
   RIA.op = RIA_OP_EXIT;
 }

mos-platform/rp6502/getchar.c

@@ -1,13 +1,11 @@
 #include "rp6502.h"
 #include <stdio.h>
+#include <unistd.h>
 
 int __getchar(void) {
-  RIA.xstack = 1;
-  RIA.a = 0;
-  RIA.op = RIA_OP_READ_XSTACK;
-  while (RIA.busy & RIA_BUSY_BIT)
-    ;
-  if (RIA.a)
+  ria_push_char(1);
+  ria_set_a(STDIN_FILENO);
+  if (ria_call_int_errno(RIA_OP_READ_XSTACK) == 1)
     return RIA.xstack;
   return EOF;
 }