improvements for type issues

diff --git a/pico/32x/32x.c b/pico/32x/32x.c
index e75a277..a34e807 100644 (file)
--- a/pico/32x/32x.c
+++ b/pico/32x/32x.c
@@ -142,9 +142,9 @@ void p32x_reset_sh2s(void)
       unsigned int vbr;
 
       // initial data
-      idl_src = CPU_BE2(*(unsigned int *)(Pico.rom + 0x3d4)) & ~0xf0000000;
-      idl_dst = CPU_BE2(*(unsigned int *)(Pico.rom + 0x3d8)) & ~0xf0000000;
-      idl_size= CPU_BE2(*(unsigned int *)(Pico.rom + 0x3dc));
+      idl_src = CPU_BE2(*(u32 *)(Pico.rom + 0x3d4)) & ~0xf0000000;
+      idl_dst = CPU_BE2(*(u32 *)(Pico.rom + 0x3d8)) & ~0xf0000000;
+      idl_size= CPU_BE2(*(u32 *)(Pico.rom + 0x3dc));
       if (idl_size > Pico.romsize || idl_src + idl_size > Pico.romsize ||
           idl_size > 0x40000 || idl_dst + idl_size > 0x40000 || (idl_src & 3) || (idl_dst & 3)) {
         elprintf(EL_STATUS|EL_ANOMALY, "32x: invalid initial data ptrs: %06x -> %06x, %06x",
@@ -154,11 +154,11 @@ void p32x_reset_sh2s(void)
         memcpy(Pico32xMem->sdram + idl_dst, Pico.rom + idl_src, idl_size);
 
       // VBR
-      vbr = CPU_BE2(*(unsigned int *)(Pico.rom + 0x3e8));
+      vbr = CPU_BE2(*(u32 *)(Pico.rom + 0x3e8));
       sh2_set_vbr(0, vbr);
 
       // checksum and M_OK
-      Pico32x.regs[0x28 / 2] = *(unsigned short *)(Pico.rom + 0x18e);
+      Pico32x.regs[0x28 / 2] = *(u16 *)(Pico.rom + 0x18e);
     }
     // program will set M_OK
   }
@@ -168,7 +168,7 @@ void p32x_reset_sh2s(void)
     unsigned int vbr;
 
     // GBR/VBR
-    vbr = CPU_BE2(*(unsigned int *)(Pico.rom + 0x3ec));
+    vbr = CPU_BE2(*(u32 *)(Pico.rom + 0x3ec));
     sh2_set_gbr(1, 0x20004000);
     sh2_set_vbr(1, vbr);
     // program will set S_OK

diff --git a/pico/32x/memory.c b/pico/32x/memory.c
index 0bdf2eb..8cd1c19 100644 (file)
--- a/pico/32x/memory.c
+++ b/pico/32x/memory.c
@@ -324,7 +324,7 @@ static u32 sh2_comm_faker(u32 a)
   static int f = 0;
   if (a == 0x28 && !p32x_csum_faked) {
     p32x_csum_faked = 1;
-    return *(unsigned short *)(Pico.rom + 0x18e);
+    return *(u16 *)(Pico.rom + 0x18e);
   }
   if (f >= sizeof(comm_fakevals) / sizeof(comm_fakevals[0]))
     f = 0;

diff --git a/pico/cart.c b/pico/cart.c
index 1804db2..35c449f 100644 (file)
--- a/pico/cart.c
+++ b/pico/cart.c
@@ -823,7 +823,7 @@ int PicoCartInsert(unsigned char *rom, unsigned int romsize, const char *carthw_
   // This will hang the emu, but will prevent nasty crashes.\r
   // note: 4 bytes are padded to every ROM\r
   if (rom != NULL)\r
-    *(unsigned long *)(rom+romsize) = CPU_BE2(0x4EFAFFFE);\r
+    *(u32 *)(rom+romsize) = CPU_BE2(0x4EFAFFFE);\r
 \r
   Pico.rom=rom;\r
   Pico.romsize=romsize;\r

diff --git a/pico/cd/memory.c b/pico/cd/memory.c
index a315391..255461d 100644 (file)
--- a/pico/cd/memory.c
+++ b/pico/cd/memory.c
@@ -1094,7 +1094,7 @@ void pcd_state_loaded_mem(void)
   Pico_mcd->m.dmna_ret_2m &= 3;\r
 \r
   // restore hint vector\r
-  *(unsigned short *)(Pico_mcd->bios + 0x72) = Pico_mcd->m.hint_vector;\r
+  *(u16 *)(Pico_mcd->bios + 0x72) = Pico_mcd->m.hint_vector;\r
 }\r
 \r
 #ifdef EMU_M68K\r

diff --git a/pico/cd/pcm.c b/pico/cd/pcm.c
index f1375f3..b77196a 100644 (file)
--- a/pico/cd/pcm.c
+++ b/pico/cd/pcm.c
@@ -120,7 +120,7 @@ end:
   Pico_mcd->pcm_mixpos += steps;
 }
 
-void pcd_pcm_update(int *buf32, int length, int stereo)
+void pcd_pcm_update(s32 *buf32, int length, int stereo)
 {
   int step, *pcm;
   int p = 0;

diff --git a/pico/patch.c b/pico/patch.c
index 4b6b547..b4c2d89 100644 (file)
--- a/pico/patch.c
+++ b/pico/patch.c
@@ -446,11 +446,11 @@ void PicoPatchPrepare(void)
       addr=PicoPatches[i].addr;
       addr &= ~1;
       if (addr < Pico.romsize)
-         PicoPatches[i].data_old = *(unsigned short *)(Pico.rom + addr);
+         PicoPatches[i].data_old = *(u16 *)(Pico.rom + addr);
       else
       {
          if(!(PicoIn.AHW & PAHW_SMS))
-            PicoPatches[i].data_old = (unsigned short) m68k_read16(addr);
+            PicoPatches[i].data_old = (u16) m68k_read16(addr);
          else
             ;// wrong: PicoPatches[i].data_old = (unsigned char) PicoRead8_z80(addr);
       }
@@ -473,7 +473,7 @@ void PicoPatchApply(void)
          if (PicoPatches[i].active)
          {
             if (!(PicoIn.AHW & PAHW_SMS))
-               *(unsigned short *)(Pico.rom + addr) = PicoPatches[i].data;
+               *(u16 *)(Pico.rom + addr) = PicoPatches[i].data;
             else if (!PicoPatches[i].comp || PicoPatches[i].comp == *(char *)(Pico.rom + addr))
                *(char *)(Pico.rom + addr) = (char) PicoPatches[i].data;
          }
@@ -485,13 +485,13 @@ void PicoPatchApply(void)
             if (u == i)
             {
                if (!(PicoIn.AHW & PAHW_SMS))
-                  *(unsigned short *)(Pico.rom + addr) = PicoPatches[i].data_old;
+                  *(u16 *)(Pico.rom + addr) = PicoPatches[i].data_old;
                else
                   *(char *)(Pico.rom + addr) = (char) PicoPatches[i].data_old;
             }
          }
       // fprintf(stderr, "patched %i: %06x:%04x\n", PicoPatches[i].active, addr,
-      // *(unsigned short *)(Pico.rom + addr));
+      // *(u16 *)(Pico.rom + addr));
       }
       else
       {

diff --git a/pico/pico_int.h b/pico/pico_int.h
index cc3d2f4..84bd201 100644 (file)
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -780,7 +780,7 @@ void pcd_state_loaded(void);
 \r
 // cd/pcm.c\r
 void pcd_pcm_sync(unsigned int to);\r
-void pcd_pcm_update(int *buffer, int length, int stereo);\r
+void pcd_pcm_update(s32 *buffer, int length, int stereo);\r
 void pcd_pcm_write(unsigned int a, unsigned int d);\r
 unsigned int pcd_pcm_read(unsigned int a);\r
 \r

diff --git a/pico/sek.c b/pico/sek.c
index 6c34067..bd8f70f 100644 (file)
--- a/pico/sek.c
+++ b/pico/sek.c
@@ -192,14 +192,14 @@ PICO_INTERNAL void SekSetRealTAS(int use_real)
 // XXX: rename\r
 PICO_INTERNAL void SekPackCpu(unsigned char *cpu, int is_sub)\r
 {\r
-  unsigned int pc=0;\r
+  u32 pc=0;\r
 \r
 #if defined(EMU_C68K)\r
   struct Cyclone *context = is_sub ? &PicoCpuCS68k : &PicoCpuCM68k;\r
   memcpy(cpu,context->d,0x40);\r
   pc=context->pc-context->membase;\r
-  *(unsigned int *)(cpu+0x44)=CycloneGetSr(context);\r
-  *(unsigned int *)(cpu+0x48)=context->osp;\r
+  *(u32 *)(cpu+0x44)=CycloneGetSr(context);\r
+  *(u32 *)(cpu+0x48)=context->osp;\r
   cpu[0x4c] = context->irq;\r
   cpu[0x4d] = context->state_flags & 1;\r
 #elif defined(EMU_M68K)\r
@@ -207,8 +207,8 @@ PICO_INTERNAL void SekPackCpu(unsigned char *cpu, int is_sub)
   m68k_set_context(is_sub ? &PicoCpuMS68k : &PicoCpuMM68k);\r
   memcpy(cpu,m68ki_cpu_p->dar,0x40);\r
   pc=m68ki_cpu_p->pc;\r
-  *(unsigned int  *)(cpu+0x44)=m68k_get_reg(NULL, M68K_REG_SR);\r
-  *(unsigned int  *)(cpu+0x48)=m68ki_cpu_p->sp[m68ki_cpu_p->s_flag^SFLAG_SET];\r
+  *(u32  *)(cpu+0x44)=m68k_get_reg(NULL, M68K_REG_SR);\r
+  *(u32  *)(cpu+0x48)=m68ki_cpu_p->sp[m68ki_cpu_p->s_flag^SFLAG_SET];\r
   cpu[0x4c] = CPU_INT_LEVEL>>8;\r
   cpu[0x4d] = CPU_STOPPED;\r
   m68k_set_context(oldcontext);\r
@@ -216,14 +216,14 @@ PICO_INTERNAL void SekPackCpu(unsigned char *cpu, int is_sub)
   M68K_CONTEXT *context = is_sub ? &PicoCpuFS68k : &PicoCpuFM68k;\r
   memcpy(cpu,context->dreg,0x40);\r
   pc=context->pc;\r
-  *(unsigned int  *)(cpu+0x44)=context->sr;\r
-  *(unsigned int  *)(cpu+0x48)=context->asp;\r
+  *(u32  *)(cpu+0x44)=context->sr;\r
+  *(u32  *)(cpu+0x48)=context->asp;\r
   cpu[0x4c] = context->interrupts[0];\r
   cpu[0x4d] = (context->execinfo & FM68K_HALTED) ? 1 : 0;\r
 #endif\r
 \r
-  *(unsigned int *)(cpu+0x40) = pc;\r
-  *(unsigned int *)(cpu+0x50) =\r
+  *(u32 *)(cpu+0x40) = pc;\r
+  *(u32 *)(cpu+0x50) =\r
     is_sub ? SekCycleCntS68k : Pico.t.m68c_cnt;\r
 }\r
 \r
@@ -231,11 +231,11 @@ PICO_INTERNAL void SekUnpackCpu(const unsigned char *cpu, int is_sub)
 {\r
 #if defined(EMU_C68K)\r
   struct Cyclone *context = is_sub ? &PicoCpuCS68k : &PicoCpuCM68k;\r
-  CycloneSetSr(context, *(unsigned int *)(cpu+0x44));\r
-  context->osp=*(unsigned int *)(cpu+0x48);\r
+  CycloneSetSr(context, *(u32 *)(cpu+0x44));\r
+  context->osp=*(u32 *)(cpu+0x48);\r
   memcpy(context->d,cpu,0x40);\r
   context->membase = 0;\r
-  context->pc = *(unsigned int *)(cpu+0x40);\r
+  context->pc = *(u32 *)(cpu+0x40);\r
   CycloneUnpack(context, NULL); // rebase PC\r
   context->irq = cpu[0x4c];\r
   context->state_flags = 0;\r
@@ -244,27 +244,27 @@ PICO_INTERNAL void SekUnpackCpu(const unsigned char *cpu, int is_sub)
 #elif defined(EMU_M68K)\r
   void *oldcontext = m68ki_cpu_p;\r
   m68k_set_context(is_sub ? &PicoCpuMS68k : &PicoCpuMM68k);\r
-  m68k_set_reg(M68K_REG_SR, *(unsigned int *)(cpu+0x44));\r
+  m68k_set_reg(M68K_REG_SR, *(u32 *)(cpu+0x44));\r
   memcpy(m68ki_cpu_p->dar,cpu,0x40);\r
-  m68ki_cpu_p->pc=*(unsigned int *)(cpu+0x40);\r
-  m68ki_cpu_p->sp[m68ki_cpu_p->s_flag^SFLAG_SET]=*(unsigned int *)(cpu+0x48);\r
+  m68ki_cpu_p->pc=*(u32 *)(cpu+0x40);\r
+  m68ki_cpu_p->sp[m68ki_cpu_p->s_flag^SFLAG_SET]=*(u32 *)(cpu+0x48);\r
   CPU_INT_LEVEL = cpu[0x4c] << 8;\r
   CPU_STOPPED = cpu[0x4d];\r
   m68k_set_context(oldcontext);\r
 #elif defined(EMU_F68K)\r
   M68K_CONTEXT *context = is_sub ? &PicoCpuFS68k : &PicoCpuFM68k;\r
   memcpy(context->dreg,cpu,0x40);\r
-  context->pc =*(unsigned int *)(cpu+0x40);\r
-  context->sr =*(unsigned int *)(cpu+0x44);\r
-  context->asp=*(unsigned int *)(cpu+0x48);\r
+  context->pc =*(u32 *)(cpu+0x40);\r
+  context->sr =*(u32 *)(cpu+0x44);\r
+  context->asp=*(u32 *)(cpu+0x48);\r
   context->interrupts[0] = cpu[0x4c];\r
   context->execinfo &= ~FM68K_HALTED;\r
   if (cpu[0x4d]&1) context->execinfo |= FM68K_HALTED;\r
 #endif\r
   if (is_sub)\r
-    SekCycleCntS68k = *(unsigned int *)(cpu+0x50);\r
+    SekCycleCntS68k = *(u32 *)(cpu+0x50);\r
   else\r
-    Pico.t.m68c_cnt = *(unsigned int *)(cpu+0x50);\r
+    Pico.t.m68c_cnt = *(u32 *)(cpu+0x50);\r
 }\r
 \r
 \r

diff --git a/pico/sound/sound.c b/pico/sound/sound.c
index 806a597..76a9be8 100644 (file)
--- a/pico/sound/sound.c
+++ b/pico/sound/sound.c
@@ -17,10 +17,10 @@
 void (*PsndMix_32_to_16l)(short *dest, int *src, int count) = mix_32_to_16l_stereo;\r
 \r
 // master int buffer to mix to\r
-static int PsndBuffer[2*(44100+100)/50];\r
+static s32 PsndBuffer[2*(44100+100)/50];\r
 \r
 // cdda output buffer\r
-short cdda_out_buffer[2*1152];\r
+s16 cdda_out_buffer[2*1152];\r
 \r
 // sn76496\r
 extern int *sn76496_regs;\r
@@ -236,7 +236,7 @@ PICO_INTERNAL void PsndDoFM(int cyc_to)
   // Q16, number of samples since last call\r
   len = (cyc_to * Pico.snd.clkl_mult) - Pico.snd.fm_pos;\r
 \r
-  // don't do this too often (about once every canline)\r
+  // don't do this too often (about once every scanline)\r
   if (len >> 16 <= PicoIn.sndRate >> 10)\r
     return;\r
 \r