some portability cleanups

diff --git a/cpu/drc/cmn.c b/cpu/drc/cmn.c
index 37f17ce..acff42c 100644 (file)
--- a/cpu/drc/cmn.c
+++ b/cpu/drc/cmn.c
@@ -10,7 +10,7 @@
 #include <pico/pico_int.h>
 #include "cmn.h"
 
-u8 __attribute__((aligned(4096))) tcache[DRC_TCACHE_SIZE];
+u8 ALIGNED(4096) tcache[DRC_TCACHE_SIZE];
 
 
 void drc_cmn_init(void)

diff --git a/cpu/sh2/sh2.h b/cpu/sh2/sh2.h
index 1394f94..49695b1 100644 (file)
--- a/cpu/sh2/sh2.h
+++ b/cpu/sh2/sh2.h
@@ -1,11 +1,7 @@
 #ifndef __SH2_H__\r
 #define __SH2_H__\r
 \r
-#if !defined(REGPARM) && defined(__i386__) \r
-#define REGPARM(x) __attribute__((regparm(x)))\r
-#else\r
-#define REGPARM(x)\r
-#endif\r
+#include "../../pico/pico_port.h"\r
 \r
 // registers - matches structure order\r
 typedef enum {\r

diff --git a/pico/pico_int.h b/pico/pico_int.h
index 369bb5d..d4fc835 100644 (file)
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -13,6 +13,7 @@
 #include <stdio.h>\r
 #include <stdlib.h>\r
 #include <string.h>\r
+#include "pico_port.h"\r
 #include "pico.h"\r
 #include "carthw/carthw.h"\r
 \r
@@ -1072,25 +1073,6 @@ void pevt_dump(void);
 #define pevt_dump()\r
 #endif\r
 \r
-// misc\r
-#ifdef _MSC_VER\r
-#define cdprintf\r
-#else\r
-#define cdprintf(x...)\r
-#endif\r
-\r
-#if defined(__GNUC__) && defined(__i386__)\r
-#define REGPARM(x) __attribute__((regparm(x)))\r
-#else\r
-#define REGPARM(x)\r
-#endif\r
-\r
-#ifdef __GNUC__\r
-#define NOINLINE __attribute__((noinline))\r
-#else\r
-#define NOINLINE\r
-#endif\r
-\r
 #ifdef __cplusplus\r
 } // End of extern "C"\r
 #endif\r

diff --git a/pico/pico_port.h b/pico/pico_port.h
new file mode 100644 (file)
index 0000000..f1d95a5
--- /dev/null
+++ b/pico/pico_port.h
@@ -0,0 +1,18 @@
+#ifndef PICO_PORT_INCLUDED
+#define PICO_PORT_INCLUDED
+
+#if defined(__GNUC__) && defined(__i386__)
+#define REGPARM(x) __attribute__((regparm(x)))
+#else
+#define REGPARM(x)
+#endif
+
+#ifdef __GNUC__
+#define NOINLINE    __attribute__((noinline))
+#define ALIGNED(n)  __attribute__((aligned(n)))
+#else
+#define NOINLINE
+#define ALIGNED(n)
+#endif
+
+#endif // PICO_PORT_INCLUDED