core, structural cleanup, fixes and improvements for type issues #2

diff --git a/Makefile b/Makefile
index b38b301..673292b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 $(LD) ?= $(CC)
 TARGET ?= PicoDrive
 DEBUG ?= 0
-CFLAGS += -I.
+CFLAGS += -I$(PWD)
 CYCLONE_CC ?= gcc
 CYCLONE_CXX ?= g++
 

diff --git a/Makefile.libretro b/Makefile.libretro
index 6777576..444cf79 100644 (file)
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -205,7 +205,7 @@ else ifeq ($(platform), ps2)
 
        ARCH = mipsel
        asm_render = 1
-       OBJS += platform/ps2/asm.o
+       OBJS += platform/libretro/ps2/asm.o
 
 # CTR (3DS)
 else ifeq ($(platform), ctr)

diff --git a/cpu/DrZ80/drz80.S b/cpu/DrZ80/drz80.S
index 4d592b1..3fdbc9a 100644 (file)
--- a/cpu/DrZ80/drz80.S
+++ b/cpu/DrZ80/drz80.S
@@ -5,7 +5,7 @@
 \r
 ;@ For commercial use, separate licencing terms must be obtained.\r
 \r
-#include "../../pico/arm_features.h"\r
+#include <pico/arm_features.h>\r
 \r
       .data\r
       .align 4\r

diff --git a/cpu/debug.c b/cpu/debug.c
index a464413..a1d7e11 100644 (file)
--- a/cpu/debug.c
+++ b/cpu/debug.c
@@ -8,7 +8,7 @@
 #define _GNU_SOURCE
 #include <stdio.h>
 
-#include "../pico/pico_int.h"
+#include <pico/pico_int.h>
 #include "debug.h"
 
 static char pdb_pending_cmds[128];

diff --git a/cpu/fame/famec.c b/cpu/fame/famec.c
index 60a9e55..f246b55 100644 (file)
--- a/cpu/fame/famec.c
+++ b/cpu/fame/famec.c
@@ -60,6 +60,8 @@
 #define FAMEC_EXTRA_INLINE INLINE\r
 #endif\r
 \r
+#include <pico/pico_types.h>\r
+/*\r
 #ifdef u8\r
 #undef u8\r
 #endif\r
@@ -95,6 +97,7 @@
 #define u32    unsigned int\r
 #define s32    signed int\r
 #define uptr   uintptr_t\r
+*/\r
 \r
 /*\r
 typedef unsigned char  u8;\r

diff --git a/cpu/sh2/compiler.c b/cpu/sh2/compiler.c
index 38e9122..c5c9c93 100644 (file)
--- a/cpu/sh2/compiler.c
+++ b/cpu/sh2/compiler.c
@@ -32,8 +32,8 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "../../pico/pico_int.h"
-#include "../../pico/arm_features.h"
+#include <pico/pico_int.h>
+#include <pico/arm_features.h>
 #include "sh2.h"
 #include "compiler.h"
 #include "../drc/cmn.h"

diff --git a/cpu/sh2/mame/sh2pico.c b/cpu/sh2/mame/sh2pico.c
index 467b2ad..380ca24 100644 (file)
--- a/cpu/sh2/mame/sh2pico.c
+++ b/cpu/sh2/mame/sh2pico.c
@@ -9,12 +9,12 @@
 
 // MAME types
 #ifndef INT8
-typedef signed char  INT8;
-typedef signed short INT16;
-typedef signed int   INT32;
-typedef unsigned int   UINT32;
-typedef unsigned short UINT16;
-typedef unsigned char  UINT8;
+typedef s8  INT8;
+typedef s16 INT16;
+typedef s32 INT32;
+typedef u32 UINT32;
+typedef u16 UINT16;
+typedef u8  UINT8;
 #endif
 
 #ifdef DRC_SH2

diff --git a/cpu/sh2/sh2.h b/cpu/sh2/sh2.h
index 1c777f8..c3ca114 100644 (file)
--- a/cpu/sh2/sh2.h
+++ b/cpu/sh2/sh2.h
@@ -1,8 +1,8 @@
 #ifndef __SH2_H__\r
 #define __SH2_H__\r
 \r
-#include "../../pico/pico_types.h"\r
-#include "../../pico/pico_port.h"\r
+#include <pico/pico_types.h>\r
+#include <pico/pico_port.h>\r
 \r
 // registers - matches structure order\r
 typedef enum {\r

diff --git a/pico/32x/32x.c b/pico/32x/32x.c
index 3b88964..f19dbd5 100644 (file)
--- a/pico/32x/32x.c
+++ b/pico/32x/32x.c
@@ -7,7 +7,7 @@
  */
 #include "../pico_int.h"
 #include "../sound/ym2612.h"
-#include "../../cpu/sh2/compiler.h"
+#include <cpu/sh2/compiler.h>
 
 struct Pico32x Pico32x;
 SH2 sh2s[2];

diff --git a/pico/32x/draw.c b/pico/32x/draw.c
index c38f60d..6954eca 100644 (file)
--- a/pico/32x/draw.c
+++ b/pico/32x/draw.c
@@ -26,19 +26,19 @@ int DrawLineDestIncrement32x;
 
 static void convert_pal555(int invert_prio)
 {
-  unsigned int *ps = (void *)Pico32xMem->pal;
-  unsigned int *pd = (void *)Pico32xMem->pal_native;
-  unsigned int m1 = 0x001f001f;
-  unsigned int m2 = 0x03e003e0;
-  unsigned int m3 = 0xfc00fc00; // includes prio bit
-  unsigned int inv = 0;
+  u32 *ps = (void *)Pico32xMem->pal;
+  u32 *pd = (void *)Pico32xMem->pal_native;
+  u32 m1 = 0x001f001f;
+  u32 m2 = 0x03e003e0;
+  u32 m3 = 0xfc00fc00; // includes prio bit
+  u32 inv = 0;
   int i;
 
   if (invert_prio)
     inv = 0x80008000;
 
   for (i = 0x100/2; i > 0; i--, ps++, pd++) {
-    unsigned int t = *ps ^ inv;
+    u32 t = *ps ^ inv;
     *pd = PXCONV(t);
   }
 
@@ -48,9 +48,9 @@ static void convert_pal555(int invert_prio)
 // direct color mode
 #define do_line_dc(pd, p32x, pmd, inv, pmd_draw_code)             \
 {                                                                 \
-  const unsigned int m1 = 0x001f;                                 \
-  const unsigned int m2 = 0x03e0;                                 \
-  const unsigned int m3 = 0x7c00;                                 \
+  const u16 m1 = 0x001f;                                          \
+  const u16 m2 = 0x03e0;                                          \
+  const u16 m3 = 0x7c00;                                          \
   unsigned short t;                                               \
   int i = 320;                                                    \
                                                                   \

diff --git a/pico/32x/draw_arm.S b/pico/32x/draw_arm.S
index ad5d428..bf26f74 100644 (file)
--- a/pico/32x/draw_arm.S
+++ b/pico/32x/draw_arm.S
@@ -7,8 +7,8 @@
 @* See COPYING file in the top-level directory.
 @*
 
-#include "pico/arm_features.h"
-#include "pico/pico_int_offs.h"
+#include <pico/arm_features.h>
+#include <pico/pico_int_offs.h>
 
 .extern Pico32x
 .extern Pico

diff --git a/pico/32x/memory.c b/pico/32x/memory.c
index 4abc180..931e432 100644 (file)
--- a/pico/32x/memory.c
+++ b/pico/32x/memory.c
@@ -42,7 +42,7 @@
 #include "../pico_int.h"
 #include "../memory.h"
 
-#include "../../cpu/sh2/compiler.h"
+#include <cpu/sh2/compiler.h>
 DRC_DECLARE_SR;
 
 static const char str_mars[] = "MARS";

diff --git a/pico/32x/memory_arm.S b/pico/32x/memory_arm.S
index 40707fe..642e13c 100644 (file)
--- a/pico/32x/memory_arm.S
+++ b/pico/32x/memory_arm.S
@@ -6,7 +6,7 @@
  * See COPYING file in the top-level directory.\r
  */\r
 \r
-#include "../pico_int_offs.h"\r
+#include <pico/pico_int_offs.h>\r
 \r
 @ 32X bank sizes... TODO this should somehow come from an include file\r
 .equ SH2_ROM_SHIFT, 10      @ 0x003fffff\r

diff --git a/pico/32x/sh2soc.c b/pico/32x/sh2soc.c
index 9da3f29..a355f75 100644 (file)
--- a/pico/32x/sh2soc.c
+++ b/pico/32x/sh2soc.c
@@ -25,14 +25,14 @@
 #include "../pico_int.h"
 #include "../memory.h"
 
-#include "../../cpu/sh2/compiler.h"
+#include <cpu/sh2/compiler.h>
 DRC_DECLARE_SR;
 
 // DMAC handling
 struct dma_chan {
-  unsigned int sar, dar;  // src, dst addr
-  unsigned int tcr;       // transfer count
-  unsigned int chcr;      // chan ctl
+  u32 sar, dar;  // src, dst addr
+  u32 tcr;       // transfer count
+  u32 chcr;      // chan ctl
   // -- dm dm sm sm  ts ts ar am  al ds dl tb  ta ie te de
   // ts - transfer size: 1, 2, 4, 16 bytes
   // ar - auto request if 1, else dreq signal
@@ -47,11 +47,11 @@ struct dma_chan {
 
 struct dmac {
   struct dma_chan chan[2];
-  unsigned int vcrdma0;
-  unsigned int unknown0;
-  unsigned int vcrdma1;
-  unsigned int unknown1;
-  unsigned int dmaor;
+  u32 vcrdma0;
+  u32 unknown0;
+  u32 vcrdma1;
+  u32 unknown1;
+  u32 dmaor;
   // -- pr ae nmif dme
   // pr - priority: chan0 > chan1 or round-robin
   // ae - address error

diff --git a/pico/cart.c b/pico/cart.c
index 8d3a1bc..1735004 100644 (file)
--- a/pico/cart.c
+++ b/pico/cart.c
@@ -8,8 +8,8 @@
  */\r
 \r
 #include "pico_int.h"\r
-#include "../cpu/debug.h"\r
-#include "../unzip/unzip.h"\r
+#include <cpu/debug.h>\r
+#include <unzip/unzip.h>\r
 #include <zlib.h>\r
 \r
 #ifdef USE_LIBRETRO_VFS\r

diff --git a/pico/carthw/svp/compiler.c b/pico/carthw/svp/compiler.c
index 65d1a19..f83c29c 100644 (file)
--- a/pico/carthw/svp/compiler.c
+++ b/pico/carthw/svp/compiler.c
@@ -6,8 +6,8 @@
  * See COPYING file in the top-level directory.
  */
 
-#include "../../pico_int.h"
-#include "../../../cpu/drc/cmn.h"
+#include <pico/pico_int.h>
+#include <cpu/drc/cmn.h>
 #include "compiler.h"
 
 // FIXME: asm has these hardcoded
@@ -39,7 +39,7 @@ void ssp_drc_end(void){}
 #endif
 
 #define COUNT_OP
-#include "../../../cpu/drc/emit_arm.c"
+#include <cpu/drc/emit_arm.c>
 
 // -----------------------------------------------------
 

diff --git a/pico/carthw/svp/memory.c b/pico/carthw/svp/memory.c
index c721611..6fb3c3e 100644 (file)
--- a/pico/carthw/svp/memory.c
+++ b/pico/carthw/svp/memory.c
@@ -26,8 +26,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "../../pico_int.h"
-#include "../../memory.h"
+#include <pico/pico_int.h>
+#include <pico/memory.h>
 
 // for wait loop det
 static void PicoWrite16_dram(u32 a, u32 d)

diff --git a/pico/carthw/svp/ssp16.c b/pico/carthw/svp/ssp16.c
index 2fb4001..229449f 100644 (file)
--- a/pico/carthw/svp/ssp16.c
+++ b/pico/carthw/svp/ssp16.c
@@ -206,7 +206,7 @@
  *   ops not used by VR are not implemented
  */
 
-#include "../../pico_int.h"
+#include <pico/pico_int.h>
 
 #define u32 unsigned int
 

diff --git a/pico/carthw/svp/stub_arm.S b/pico/carthw/svp/stub_arm.S
index 736d459..cb1c1cd 100644 (file)
--- a/pico/carthw/svp/stub_arm.S
+++ b/pico/carthw/svp/stub_arm.S
@@ -6,7 +6,7 @@
 @* See COPYING file in the top-level directory.
 @*
 
-#include "../../arm_features.h"
+#include <pico/arm_features.h>
 
 @.syntax unified
 .text

diff --git a/pico/cd/genplus_macros.h b/pico/cd/genplus_macros.h
index 8ac5d35..85da416 100644 (file)
--- a/pico/cd/genplus_macros.h
+++ b/pico/cd/genplus_macros.h
@@ -5,12 +5,12 @@
 #undef int16\r
 #undef int32\r
 \r
-#define uint8  unsigned char\r
-#define uint16 unsigned short\r
-#define uint32 unsigned int\r
-#define int8  signed char\r
-#define int16 signed short\r
-#define int32 signed int\r
+#define uint8  u8\r
+#define uint16 u16\r
+#define uint32 u32\r
+#define int8   s8\r
+#define int16  s16\r
+#define int32  s32\r
 \r
 #define READ_BYTE(BASE, ADDR) (BASE)[(ADDR)^1]\r
 #define WRITE_BYTE(BASE, ADDR, VAL) (BASE)[(ADDR)^1] = (VAL)\r

diff --git a/pico/cd/gfx.c b/pico/cd/gfx.c
index e3434e1..b7d9cf1 100644 (file)
--- a/pico/cd/gfx.c
+++ b/pico/cd/gfx.c
@@ -311,7 +311,7 @@ static void gfx_render(uint32 bufferIndex, uint32 width)
   }
 }
 
-void gfx_start(unsigned int base)
+void gfx_start(uint32 base)
 {
   /* make sure 2M mode is enabled */
   if (!(Pico_mcd->s68k_regs[3] & 0x04))

diff --git a/pico/cd/gfx_dma.c b/pico/cd/gfx_dma.c
index 76777d2..b109610 100644 (file)
--- a/pico/cd/gfx_dma.c
+++ b/pico/cd/gfx_dma.c
@@ -14,7 +14,7 @@
 PICO_INTERNAL void DmaSlowCell(u32 source, u32 a, int len, unsigned char inc)
 {
   unsigned char *base;
-  unsigned int asrc, a2;
+  u32 asrc, a2;
   u16 *r;
 
   base = Pico_mcd->word_ram1M[Pico_mcd->s68k_regs[3]&1];

diff --git a/pico/cd/memory_arm.S b/pico/cd/memory_arm.S
index 0d1369e..d3c2bb8 100644 (file)
--- a/pico/cd/memory_arm.S
+++ b/pico/cd/memory_arm.S
@@ -6,8 +6,8 @@
 @* See COPYING file in the top-level directory.
 @*
 
-#include "../arm_features.h"
-#include "../pico_int_offs.h"
+#include <pico/arm_features.h>
+#include <pico/pico_int_offs.h>
 
 .equiv PCM_STEP_SHIFT, 11
 

diff --git a/pico/debugCPU.c b/pico/debugCPU.c
index 128f414..caf75f2 100644 (file)
--- a/pico/debugCPU.c
+++ b/pico/debugCPU.c
@@ -8,7 +8,6 @@
 \r
 #include "pico_int.h"\r
 \r
-typedef unsigned char  u8;\r
 \r
 static unsigned int pppc, ops=0;\r
 extern unsigned int lastread_a, lastread_d[16], lastwrite_cyc_d[16], lastwrite_mus_d[16];\r

diff --git a/pico/draw.c b/pico/draw.c
index 27a48a8..8aa39de 100644 (file)
--- a/pico/draw.c
+++ b/pico/draw.c
@@ -53,7 +53,7 @@ static unsigned char DefHighCol[8+320+8];
 unsigned char *HighColBase = DefHighCol;\r
 int HighColIncrement;\r
 \r
-static u16 DefOutBuff[320*2];\r
+static u16 DefOutBuff[320*2] ALIGNED(4);\r
 void *DrawLineDestBase = DefOutBuff;\r
 int DrawLineDestIncrement;\r
 \r
@@ -200,7 +200,7 @@ TileFlipMaker(TileFlipNonSH, pix_nonsh)
 // draw sprite pixels, process operator colors\r
 #define pix_sh(x) \\r
   if (likely(t)) \\r
-    pd[x]=(likely(t<0xe) ? pal|t : pd[x]|((t-1)<<6));\r
+    pd[x]=(likely(t<0xe) ? pal|t : pd[x]|((t-1)<<6))\r
 \r
 TileNormMaker(TileNormSH, pix_sh)\r
 TileFlipMaker(TileFlipSH, pix_sh)\r
@@ -208,7 +208,7 @@ TileFlipMaker(TileFlipSH, pix_sh)
 // draw sprite pixels, mark but don't process operator colors\r
 #define pix_sh_markop(x) \\r
   if (likely(t)) \\r
-    pd[x]=(likely(t<0xe) ? pal|t : pd[x]|0x40);\r
+    pd[x]=(likely(t<0xe) ? pal|t : pd[x]|0x40)\r
 \r
 TileNormMaker(TileNormSH_markop, pix_sh_markop)\r
 TileFlipMaker(TileFlipSH_markop, pix_sh_markop)\r

diff --git a/pico/pico/memory.c b/pico/pico/memory.c
index ae26207..14bf5d4 100644 (file)
--- a/pico/pico/memory.c
+++ b/pico/pico/memory.c
@@ -7,7 +7,6 @@
  */
 #include "../pico_int.h"
 #include "../memory.h"
-#include "../sound/sn76496.h"
 
 /*
 void dump(u16 w)

diff --git a/pico/pico_int.h b/pico/pico_int.h
index b4b9a85..ce20d1e 100644 (file)
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -11,6 +11,7 @@
 #define PICO_INTERNAL_INCLUDED\r
 #include <stdio.h>\r
 #include <string.h>\r
+#include "pico_types.h"\r
 #include "pico_port.h"\r
 #include "pico.h"\r
 #include "carthw/carthw.h"\r
@@ -31,11 +32,9 @@
 extern "C" {\r
 #endif\r
 \r
-#include "pico_types.h"\r
-\r
 // ----------------------- 68000 CPU -----------------------\r
 #ifdef EMU_C68K\r
-#include "../cpu/cyclone/Cyclone.h"\r
+#include <cpu/cyclone/Cyclone.h>\r
 extern struct Cyclone PicoCpuCM68k, PicoCpuCS68k;\r
 #define SekCyclesLeft     PicoCpuCM68k.cycles // cycles left for this run\r
 #define SekCyclesLeftS68k PicoCpuCS68k.cycles\r
@@ -60,7 +59,7 @@ extern struct Cyclone PicoCpuCM68k, PicoCpuCS68k;
 #endif\r
 \r
 #ifdef EMU_F68K\r
-#include "../cpu/fame/fame.h"\r
+#include <cpu/fame/fame.h>\r
 extern M68K_CONTEXT PicoCpuFM68k, PicoCpuFS68k;\r
 #define SekCyclesLeft     PicoCpuFM68k.io_cycle_counter\r
 #define SekCyclesLeftS68k PicoCpuFS68k.io_cycle_counter\r
@@ -91,7 +90,7 @@ extern M68K_CONTEXT PicoCpuFM68k, PicoCpuFS68k;
 #endif\r
 \r
 #ifdef EMU_M68K\r
-#include "../cpu/musashi/m68kcpu.h"\r
+#include <cpu/musashi/m68kcpu.h>\r
 extern m68ki_cpu_core PicoCpuMM68k, PicoCpuMS68k;\r
 #ifndef SekCyclesLeft\r
 #define SekCyclesLeft     PicoCpuMM68k.cyc_remaining_cycles\r
@@ -160,7 +159,7 @@ extern unsigned int SekCycleAimS68k;
 // ----------------------- Z80 CPU -----------------------\r
 \r
 #if defined(_USE_DRZ80)\r
-#include "../cpu/DrZ80/drz80.h"\r
+#include <cpu/DrZ80/drz80.h>\r
 \r
 extern struct DrZ80 drZ80;\r
 \r
@@ -175,7 +174,7 @@ extern struct DrZ80 drZ80;
 #define z80_pc()           (drZ80.Z80PC - drZ80.Z80PC_BASE)\r
 \r
 #elif defined(_USE_CZ80)\r
-#include "../cpu/cz80/cz80.h"\r
+#include <cpu/cz80/cz80.h>\r
 \r
 #define z80_run(cycles)    Cz80_Exec(&CZ80, cycles)\r
 #define z80_run_nr(cycles) Cz80_Exec(&CZ80, cycles)\r
@@ -209,7 +208,7 @@ extern struct DrZ80 drZ80;
 \r
 // ----------------------- SH2 CPU -----------------------\r
 \r
-#include "cpu/sh2/sh2.h"\r
+#include <cpu/sh2/sh2.h>\r
 \r
 extern SH2 sh2s[2];\r
 #define msh2 sh2s[0]\r
@@ -721,7 +720,7 @@ int load_cd_image(const char *cd_img_name, int *type);
 \r
 // cd/gfx.c\r
 void gfx_init(void);\r
-void gfx_start(unsigned int base);\r
+void gfx_start(u32 base);\r
 void gfx_update(unsigned int cycles);\r
 int gfx_context_save(unsigned char *state);\r
 int gfx_context_load(const unsigned char *state);\r

diff --git a/pico/sek.c b/pico/sek.c
index 9be7f9a..6c34067 100644 (file)
--- a/pico/sek.c
+++ b/pico/sek.c
@@ -270,7 +270,7 @@ PICO_INTERNAL void SekUnpackCpu(const unsigned char *cpu, int is_sub)
 \r
 /* idle loop detection, not to be used in CD mode */\r
 #ifdef EMU_C68K\r
-#include "cpu/cyclone/tools/idle.h"\r
+#include <cpu/cyclone/tools/idle.h>\r
 #endif\r
 \r
 static unsigned short **idledet_ptrs = NULL;\r

diff --git a/pico/sound/mix.c b/pico/sound/mix.c
index 58e9c8c..099b8c9 100644 (file)
--- a/pico/sound/mix.c
+++ b/pico/sound/mix.c
@@ -7,7 +7,7 @@
  * See COPYING file in the top-level directory.
  */
 
-#include "string.h"
+#include <string.h>
 
 #define MAXOUT         (+32767)
 #define MINOUT         (-32768)

diff --git a/pico/sound/ym2612.h b/pico/sound/ym2612.h
index 9b4fd72..7d16efb 100644 (file)
--- a/pico/sound/ym2612.h
+++ b/pico/sound/ym2612.h
@@ -6,16 +6,16 @@
 #define _H_FM_FM_\r
 \r
 /* compiler dependence */\r
-#include <stdint.h>\r
+#include "../pico_types.h"\r
 #ifndef UINT8\r
-typedef uint8_t                UINT8;   /* unsigned  8bit */\r
-typedef uint16_t       UINT16;  /* unsigned 16bit */\r
-typedef uint32_t       UINT32;  /* unsigned 32bit */\r
+typedef u8             UINT8;   /* unsigned  8bit */\r
+typedef u16            UINT16;  /* unsigned 16bit */\r
+typedef u32            UINT32;  /* unsigned 32bit */\r
 #endif\r
 #ifndef INT8\r
-typedef int8_t         INT8;    /* signed  8bit   */\r
-typedef int16_t                INT16;   /* signed 16bit   */\r
-typedef int32_t                INT32;   /* signed 32bit   */\r
+typedef s8             INT8;    /* signed  8bit   */\r
+typedef s16            INT16;   /* signed 16bit   */\r
+typedef s32            INT32;   /* signed 32bit   */\r
 #endif\r
 \r
 #if 1\r
@@ -183,7 +183,7 @@ int  YM2612PicoStateLoad2(int *tat, int *tbt);
 #define YM2612PicoStateLoad YM2612PicoStateLoad_\r
 #else\r
 /* GP2X specific */\r
-#include "../../platform/gp2x/940ctl.h"\r
+#include <platform/gp2x/940ctl.h>\r
 #define YM2612Init(baseclock,rate,ssg) do { \\r
        if (PicoIn.opt&POPT_EXT_FM) YM2612Init_940(baseclock, rate, ssg); \\r
        else               YM2612Init_(baseclock, rate, ssg); \\r

diff --git a/pico/sound/ym2612_arm.S b/pico/sound/ym2612_arm.S
index 0334d1c..bdac388 100644 (file)
--- a/pico/sound/ym2612_arm.S
+++ b/pico/sound/ym2612_arm.S
@@ -13,7 +13,7 @@
 
 @ vim:filetype=armasm
 
-#include "../arm_features.h"
+#include <pico/arm_features.h>
 
 @ very simple YM2612 output rate to sample rate adaption (~500k cycles @44100)
 #define INTERPOL

diff --git a/pico/state.c b/pico/state.c
index d56bd50..6e3596f 100644 (file)
--- a/pico/state.c
+++ b/pico/state.c
@@ -9,7 +9,7 @@
 #include "pico_int.h"\r
 #include <zlib.h>\r
 \r
-#include "../cpu/sh2/sh2.h"\r
+#include <cpu/sh2/sh2.h>\r
 #include "sound/ym2612.h"\r
 #include "sound/emu2413/emu2413.h"\r
 #include "state.h"\r

diff --git a/pico/videoport.c b/pico/videoport.c
index 8e42e30..4c3a5d0 100644 (file)
--- a/pico/videoport.c
+++ b/pico/videoport.c
@@ -22,7 +22,7 @@ static int blankline;           // display disabled for this line
 \r
 u32 SATaddr, SATmask;      // VRAM addr of sprite attribute table\r
 \r
-int (*PicoDmaHook)(unsigned int source, int len, unsigned short **base, unsigned int *mask) = NULL;\r
+int (*PicoDmaHook)(u32 source, int len, unsigned short **base, unsigned int *mask) = NULL;\r
 \r
 \r
 /* VDP FIFO implementation\r

diff --git a/platform/common/main.c b/platform/common/main.c
index a45c58d..a7a8312 100644 (file)
--- a/platform/common/main.c
+++ b/platform/common/main.c
@@ -96,10 +96,6 @@ int main(int argc, char *argv[])
 \r
        emu_init();\r
 \r
-#ifdef GPERF\r
-       ProfilerStart("gperf.out");\r
-#endif\r
-\r
        engineState = PGS_Menu;\r
 \r
        if (argc > 1)\r
@@ -142,7 +138,13 @@ int main(int argc, char *argv[])
                                /* vvv fallthrough */\r
 \r
                        case PGS_Running:\r
+#ifdef GPERF\r
+       ProfilerStart("gperf.out");\r
+#endif\r
                                emu_loop();\r
+#ifdef GPERF\r
+       ProfilerStop();\r
+#endif\r
                                break;\r
 \r
                        case PGS_Quit:\r
@@ -155,9 +157,6 @@ int main(int argc, char *argv[])
        }\r
 \r
        endloop:\r
-#ifdef GPERF\r
-       ProfilerStop();\r
-#endif\r
 \r
        emu_finish();\r
        plat_finish();\r

diff --git a/platform/common/menu_pico.c b/platform/common/menu_pico.c
index d430663..4651954 100644 (file)
--- a/platform/common/menu_pico.c
+++ b/platform/common/menu_pico.c
@@ -55,15 +55,15 @@ static unsigned short fname2color(const char *fname)
        return 0xffff;
 }
 
-#include "../libpicofe/menu.c"
+#include <platform/libpicofe/menu.c>
 
 static const char *men_dummy[] = { NULL };
 
 /* platform specific options and handlers */
 #if   defined(__GP2X__)
-#include "../gp2x/menu.c"
+#include <platform/gp2x/menu.c>
 #elif defined(PANDORA)
-#include "../pandora/menu.c"
+#include <platform/pandora/menu.c>
 #else
 #define MENU_OPTIONS_GFX
 #define MENU_OPTIONS_ADV
@@ -84,7 +84,7 @@ static void make_bg(int no_scale)
 
        if (!no_scale && g_menuscreen_w / w >= 2 && g_menuscreen_h / h >= 2)
        {
-               unsigned int t, *d = g_menubg_ptr;
+               u32 t, *d = g_menubg_ptr;
                d += (g_menuscreen_h / 2 - h * 2 / 2)
                        * g_menuscreen_w / 2;
                d += (g_menuscreen_w / 2 - w * 2 / 2) / 2;

diff --git a/platform/common/plat_sdl.c b/platform/common/plat_sdl.c
index ceab084..75dda2c 100644 (file)
--- a/platform/common/plat_sdl.c
+++ b/platform/common/plat_sdl.c
@@ -33,7 +33,7 @@ static struct in_pdata in_sdl_platform_data = {
 static int yuv_ry[32], yuv_gy[32], yuv_by[32];
 static unsigned char yuv_u[32 * 2], yuv_v[32 * 2];
 static unsigned char yuv_y[256];
-static struct uyvy {  unsigned int y:8; unsigned int vyu:24; } yuv_uyvy[65536];
+static struct uyvy { uint32_t y:8; uint32_t vyu:24; } yuv_uyvy[65536];
 
 void bgr_to_uyvy_init(void)
 {

diff --git a/platform/gizmondo/emu.c b/platform/gizmondo/emu.c
index c5478f4..83f8cee 100644 (file)
--- a/platform/gizmondo/emu.c
+++ b/platform/gizmondo/emu.c
@@ -8,9 +8,9 @@
 #include "kgsdk/Framework2D.h"
 #include "kgsdk/FrameworkAudio.h"
 #include "../common/emu.h"
-#include "../common/lprintf.h"
 #include "../common/arm_utils.h"
 #include "../common/config.h"
+#include "../libpicofe/lprintf.h"
 #include "emu.h"
 #include "menu.h"
 #include "giz.h"

diff --git a/platform/gizmondo/giz.c b/platform/gizmondo/giz.c
index 9027388..93f2c34 100644 (file)
--- a/platform/gizmondo/giz.c
+++ b/platform/gizmondo/giz.c
@@ -11,7 +11,7 @@
 #include "kgsdk/Framework.h"
 #include "kgsdk/Framework2D.h"
 #include "giz.h"
-#include "version.h"
+#include "../common/version.h"
 
 #define LOG_FILE "log.log"
 

diff --git a/platform/gizmondo/main.c b/platform/gizmondo/main.c
index 562b7ad..a53e901 100644 (file)
--- a/platform/gizmondo/main.c
+++ b/platform/gizmondo/main.c
@@ -14,7 +14,7 @@
 #include "../common/menu.h"\r
 #include "../common/emu.h"\r
 #include "../common/config.h"\r
-#include "version.h"\r
+#include "../common/version.h"\r
 \r
 \r
 int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow)\r

diff --git a/platform/gizmondo/menu.c b/platform/gizmondo/menu.c
index 47778be..07a2ce7 100644 (file)
--- a/platform/gizmondo/menu.c
+++ b/platform/gizmondo/menu.c
@@ -28,7 +28,7 @@
 #include "../common/emu.h"\r
 #include "../common/readpng.h"\r
 #include "../common/input.h"\r
-#include "version.h"\r
+#include "../common/version.h"\r
 \r
 #include <pico/pico_int.h>\r
 #include <pico/patch.h>\r
@@ -49,8 +49,6 @@ unsigned char *menu_screen = gfx_buffer; /* draw here and blit later, to avoid f
 void menu_darken_bg(void *dst, const void *src, int pixels, int darker);\r
 static void menu_prepare_bg(int use_game_bg);\r
 \r
-static unsigned int inp_prev = 0;\r
-\r
 void menu_draw_begin(int use_bgbuff)\r
 {\r
        if (use_bgbuff)\r
@@ -1457,14 +1455,14 @@ static void menu_loop_root(void)
 // warning: alignment\r
 void menu_darken_bg(void *dst, const void *src, int pixels, int darker)\r
 {\r
-       unsigned int *dest = dst;\r
-       const unsigned int *srce = src;\r
+       u32 *dest = dst;\r
+       const u32 *srce = src;\r
        pixels /= 2;\r
        if (darker)\r
        {\r
                while (pixels--)\r
                {\r
-                       unsigned int p = *srce++;\r
+                       u32 p = *srce++;\r
                        *dest++ = ((p&0xf79ef79e)>>1) - ((p&0xc618c618)>>3);\r
                }\r
        }\r
@@ -1472,7 +1470,7 @@ void menu_darken_bg(void *dst, const void *src, int pixels, int darker)
        {\r
                while (pixels--)\r
                {\r
-                       unsigned int p = *srce++;\r
+                       u32 p = *srce++;\r
                        *dest++ = (p&0xf79ef79e)>>1;\r
                }\r
        }\r

diff --git a/platform/gp2x/940ctl.c b/platform/gp2x/940ctl.c
index cd3fcdc..b173002 100644 (file)
--- a/platform/gp2x/940ctl.c
+++ b/platform/gp2x/940ctl.c
@@ -22,9 +22,9 @@
 #include "../common/arm_utils.h"\r
 #include "../common/menu_pico.h"\r
 #include "../common/emu.h"\r
-#include "../../pico/pico_int.h"\r
-#include "../../pico/sound/ym2612.h"\r
-#include "../../pico/sound/mix.h"\r
+#include <pico/pico_int.h>\r
+#include <pico/sound/ym2612.h>\r
+#include <pico/sound/mix.h>\r
 #include "code940/940shared.h"\r
 #include "plat.h"\r
 #include "940ctl.h"\r

diff --git a/platform/gp2x/code940/940.c b/platform/gp2x/code940/940.c
index db51fdc..4ab8bad 100644 (file)
--- a/platform/gp2x/code940/940.c
+++ b/platform/gp2x/code940/940.c
@@ -2,7 +2,7 @@
 // (c) Copyright 2006-2007, Grazvydas "notaz" Ignotas\r
 \r
 #include "940shared.h"\r
-#include "../../common/helix/pub/mp3dec.h"\r
+#include <platform/common/helix/pub/mp3dec.h>\r
 \r
 static _940_data_t *shared_data = (_940_data_t *)   0x00100000;\r
 static _940_ctl_t  *shared_ctl  = (_940_ctl_t *)    0x00200000;\r

diff --git a/platform/gp2x/code940/940shared.h b/platform/gp2x/code940/940shared.h
index 6f12a32..9897c1c 100644 (file)
--- a/platform/gp2x/code940/940shared.h
+++ b/platform/gp2x/code940/940shared.h
@@ -1,4 +1,4 @@
-#include "../../../pico/sound/ym2612.h"\r
+#include <pico/sound/ym2612.h>\r
 \r
 // max 16 jobs, lower num means higher prio\r
 enum _940_job_t {\r

diff --git a/platform/gp2x/code940/Makefile b/platform/gp2x/code940/Makefile
index 8561551..6968f83 100644 (file)
--- a/platform/gp2x/code940/Makefile
+++ b/platform/gp2x/code940/Makefile
@@ -14,7 +14,7 @@ CROSS ?= arm-linux-gnueabi-
 # settings\r
 #up = 1\r
 \r
-CFLAGS += -O2 -Wall -mno-thumb-interwork -fstrict-aliasing -ffast-math\r
+CFLAGS += -O3 -Wall -mno-thumb-interwork -fstrict-aliasing -fno-stack-protector -fno-common -ffast-math\r
 CFLAGS += -I../../common/helix/pub -I../../.. -I. -D__GP2X__ -DARM\r
 CFLAGS += -mcpu=arm940t -mtune=arm940t -mabi=apcs-gnu -mfloat-abi=soft -mfpu=fpa\r
 LDFLAGS = -static -e code940 -Ttext 0x0 -L$(lgcc_path) -lgcc\r
@@ -66,9 +66,6 @@ code940.elf : $(OBJS940) $(LIBHELIX)
        @echo ">>>" $@\r
        $(GCC) $(CFLAGS) -Os -DEXTERNAL_YM2612 -c $< -o $@\r
 \r
-mix.o : ../../../pico/sound/mix.s\r
-       @echo ">>>" $@\r
-       $(GCC) $(CFLAGS) -DEXTERNAL_YM2612 -c $< -o $@\r
 misc_arm.o : ../../../pico/misc_arm.s\r
        @echo ">>>" $@\r
        $(GCC) $(CFLAGS) -DEXTERNAL_YM2612 -c $< -o $@\r

diff --git a/platform/gp2x/code940/mp3test.c b/platform/gp2x/code940/mp3test.c
index cd2a665..6ffd09c 100644 (file)
--- a/platform/gp2x/code940/mp3test.c
+++ b/platform/gp2x/code940/mp3test.c
@@ -13,7 +13,7 @@
 //#include "emu.h"\r
 //#include "menu.h"\r
 #include "../asmutils.h"\r
-#include "../../helix/pub/mp3dec.h"\r
+#include <platform/common/helix/pub/mp3dec.h>\r
 \r
 /* we will need some gp2x internals here */\r
 extern volatile unsigned short *gp2x_memregs; /* from minimal library rlyeh */\r

diff --git a/platform/libretro/libretro.c b/platform/libretro/libretro.c
index dd3b90e..d889fb2 100644 (file)
--- a/platform/libretro/libretro.c
+++ b/platform/libretro/libretro.c
@@ -17,7 +17,7 @@
 #ifndef _WIN32
 #ifndef NO_MMAP
 #ifdef __SWITCH__
-#include "../switch/mman.h"
+#include "switch/mman.h"
 #else
 #include <sys/mman.h>
 #endif
@@ -37,8 +37,9 @@
 #endif
 
 #if defined(RENDER_GSKIT_PS2)
+#include <malloc.h>
 #include "libretro-common/include/libretro_gskit_ps2.h"
-#include "../ps2/asm.h"
+#include "ps2/asm.h"
 #endif
 
 #ifdef _3DS

diff --git a/platform/ps2/Draw_mips_r5900.s b/platform/libretro/ps2/Draw_mips_r5900.s
similarity index 100%
rename from platform/ps2/Draw_mips_r5900.s
rename to platform/libretro/ps2/Draw_mips_r5900.s

diff --git a/platform/ps2/Memory_mips_r5900.s b/platform/libretro/ps2/Memory_mips_r5900.s
similarity index 100%
rename from platform/ps2/Memory_mips_r5900.s
rename to platform/libretro/ps2/Memory_mips_r5900.s

diff --git a/platform/ps2/asm.h b/platform/libretro/ps2/asm.h
similarity index 100%
rename from platform/ps2/asm.h
rename to platform/libretro/ps2/asm.h

diff --git a/platform/ps2/asm.s b/platform/libretro/ps2/asm.s
similarity index 100%
rename from platform/ps2/asm.s
rename to platform/libretro/ps2/asm.s

diff --git a/platform/switch/mman.h b/platform/libretro/switch/mman.h
similarity index 100%
rename from platform/switch/mman.h
rename to platform/libretro/switch/mman.h

diff --git a/platform/linux/emu.c b/platform/linux/emu.c
index 286bff7..c99681e 100644 (file)
--- a/platform/linux/emu.c
+++ b/platform/linux/emu.c
@@ -47,9 +47,9 @@ static void draw_cd_leds(void)
 \r
 #define p(x) px[(x)*2 >> 2] = px[((x)*2 >> 2) + 1]\r
        // 16-bit modes\r
-       unsigned int *px = (unsigned int *)((short *)g_screen_ptr + scr_offs);\r
-       unsigned int col_g = (led_reg & 2) ? 0x06000600 : 0;\r
-       unsigned int col_r = (led_reg & 1) ? 0xc000c000 : 0;\r
+       uint32_t *px = (uint32_t *)((short *)g_screen_ptr + scr_offs);\r
+       uint32_t col_g = (led_reg & 2) ? 0x06000600 : 0;\r
+       uint32_t col_r = (led_reg & 1) ? 0xc000c000 : 0;\r
        p(pitch*0) = p(pitch*1) = p(pitch*2) = col_g;\r
        p(pitch*0 + led_offs) = p(pitch*1 + led_offs) = p(pitch*2 + led_offs) = col_r;\r
 #undef p\r

diff --git a/platform/linux/io.c b/platform/linux/io.c
index 74cf30f..7fdb298 100644 (file)
--- a/platform/linux/io.c
+++ b/platform/linux/io.c
@@ -13,7 +13,7 @@
 #include "../libpicofe/input.h"
 #include "../common/emu.h"
 #include "../common/input_pico.h"
-#include "version.h"
+#include "../common/version.h"
 
 #include "log_io.h"
 

diff --git a/platform/psp/emu.c b/platform/psp/emu.c
index e138ce8..93e55c9 100644 (file)
--- a/platform/psp/emu.c
+++ b/platform/psp/emu.c
@@ -23,7 +23,6 @@
 #include "asm_utils.h"
 #include "../common/emu.h"
 #include "../common/config.h"
-#include "../common/lprintf.h"
 #include <pico/pico_int.h>
 #include <pico/cd/cue.h>
 

diff --git a/platform/psp/main.c b/platform/psp/main.c
index 989ce5c..94e38a4 100644 (file)
--- a/platform/psp/main.c
+++ b/platform/psp/main.c
@@ -14,7 +14,7 @@
 #include "../common/menu.h"
 #include "../common/emu.h"
 #include "../common/config.h"
-#include "../common/lprintf.h"
+#include "../libpicofe/lprintf.h"
 
 #ifdef GPROF
 #include <pspprof.h>

diff --git a/platform/psp/menu.c b/platform/psp/menu.c
index 1b71423..12fd728 100644 (file)
--- a/platform/psp/menu.c
+++ b/platform/psp/menu.c
@@ -27,9 +27,8 @@
 #include "../common/menu.h"
 #include "../common/emu.h"
 #include "../common/readpng.h"
-#include "../common/lprintf.h"
 #include "../common/input.h"
-#include "version.h"
+#include "../common/version.h"
 
 #include <pico/pico_int.h>
 #include <pico/patch.h>
@@ -51,8 +50,6 @@ void menu_darken_bg(void *dst, const void *src, int pixels, int darker);
 static void menu_prepare_bg(int use_game_bg, int use_fg);
 
 
-static unsigned int inp_prev = 0;
-
 void menu_draw_begin(void)
 {
        // short *src = (short *)bg_buffer, *dst = (short *)menu_screen;

diff --git a/platform/psp/mp3.c b/platform/psp/mp3.c
index 1862439..eac13ff 100644 (file)
--- a/platform/psp/mp3.c
+++ b/platform/psp/mp3.c
@@ -14,9 +14,9 @@
 #include <pspaudiocodec.h>
 #include <kubridge.h>
 
-#include "../../pico/pico_int.h"
-#include "../../pico/sound/mix.h"
-#include "../common/lprintf.h"
+#include <pico/pico_int.h>
+#include <pico/sound/mix.h>
+#include "../libpicofe/lprintf.h"
 
 int mp3_last_error = 0;
 

diff --git a/platform/psp/psp.c b/platform/psp/psp.c
index 8aad4c0..a5bfe3a 100644 (file)
--- a/platform/psp/psp.c
+++ b/platform/psp/psp.c
@@ -21,8 +21,8 @@
 
 #include "psp.h"
 #include "emu.h"
-#include "../common/lprintf.h"
-#include "version.h"
+#include <pico/pico_int.h>
+#include "../common/version.h"
 
 extern int pico_main(void);
 

diff --git a/platform/win32/main.c b/platform/win32/main.c
index eb55e0e..0484b3e 100644 (file)
--- a/platform/win32/main.c
+++ b/platform/win32/main.c
@@ -2,15 +2,14 @@
 #include <commdlg.h>\r
 #include <stdio.h>\r
 \r
-#include "../../pico/pico.h"\r
+#include <pico/pico.h>\r
 #include "../common/readpng.h"\r
 #include "../common/config.h"\r
-#include "../common/lprintf.h"\r
 #include "../common/emu.h"\r
 #include "../common/menu.h"\r
 #include "../common/input.h"\r
 #include "../common/plat.h"\r
-#include "version.h"\r
+#include "../common/version.h"\r
 #include "direct.h"\r
 #include "in_vk.h"\r
 \r

diff --git a/platform/win32/plat.c b/platform/win32/plat.c
index 54af829..70d4027 100644 (file)
--- a/platform/win32/plat.c
+++ b/platform/win32/plat.c
@@ -8,11 +8,10 @@
 #include <windows.h>
 #include <stdio.h>
 
-#include "../common/lprintf.h"
 #include "../common/plat.h"
 #include "../common/emu.h"
-#include "../../pico/pico.h"
-#include "version.h"
+#include "../common/version.h"
+#include <pico/pico.h>
 #include "direct.h"
 #include "dsnd.h"
 #include "main.h"

diff --git a/tools/bin_to_cso_mp3/bin_to_cso_mp3.c b/tools/bin_to_cso_mp3/bin_to_cso_mp3.c
index 39ca7bf..f78d228 100644 (file)
--- a/tools/bin_to_cso_mp3/bin_to_cso_mp3.c
+++ b/tools/bin_to_cso_mp3/bin_to_cso_mp3.c
@@ -10,6 +10,7 @@
 #include <sys/stat.h>\r
 #include <string.h>\r
 #include <ctype.h>\r
+#include <stdint.h>\r
 \r
 #ifndef MAX_PATH\r
 #define MAX_PATH 1024\r
@@ -34,14 +35,14 @@
 \r
 #define LAME_OPTIONS "-h --cbr"\r
 \r
-typedef unsigned char u8;\r
-typedef unsigned short int u16;\r
-typedef unsigned int u32;\r
-typedef unsigned long long int u64;\r
-typedef signed char s8;\r
-typedef signed short int s16;\r
-typedef signed int s32;\r
-typedef signed long long int s64;\r
+typedef uint8_t u8;\r
+typedef uint16_t u16;\r
+typedef uint32_t u32;\r
+typedef uint64_t u64;\r
+typedef int8_t s8;\r
+typedef int16_t s16;\r
+typedef int32_t s32;\r
+typedef int64_t s64;\r
 \r
 typedef enum\r
 {\r

diff --git a/tools/drctest.c b/tools/drctest.c
index 2eca422..0d7d844 100644 (file)
--- a/tools/drctest.c
+++ b/tools/drctest.c
@@ -3,7 +3,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#include "cpu/sh2/compiler.c"
+#include <cpu/sh2/compiler.c>
 
 struct Pico Pico;
 SH2 sh2s[2];

diff --git a/tools/mkoffsets.c b/tools/mkoffsets.c
index 7e57383..609b884 100644 (file)
--- a/tools/mkoffsets.c
+++ b/tools/mkoffsets.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stddef.h>
 
-#include "../pico/pico_int.h"
+#include <pico/pico_int.h>
 
 #define DUMP(f, prefix, type, field) \
   fprintf(f, "#define %-20s 0x%02x\n", \

diff --git a/tools/mkoffsets.sh b/tools/mkoffsets.sh
index f681b06..c347587 100755 (executable)
--- a/tools/mkoffsets.sh
+++ b/tools/mkoffsets.sh
@@ -103,7 +103,7 @@ get_define () # prefix struct member member...
        field=$(echo $* | sed 's/ /./g')
        name=$(echo $* | sed 's/ /_/g')
        echo '#include <stdint.h>' > /tmp/getoffs.c
-       echo '#include "pico/pico_int.h"' >> /tmp/getoffs.c
+       echo '#include <pico/pico_int.h>' >> /tmp/getoffs.c
        echo "static struct $struct p;" >> /tmp/getoffs.c
        echo "const int32_t val = (char *)&p.$field - (char*)&p;" >>/tmp/getoffs.c
        compile_rodata